Merge pull request #20 from DavidS/unique-trace-id

Make the TRACE_ID unique across repos and re-runs
honeycombio · Dec 15, 2020 · 2041175 · 2041175
2 parents 5be4636 + 3db32e1
commit 2041175
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -2175,10 +2175,13 @@ function run() {
             }
             const buildStart = util.getTimestamp();
             const traceComponents = [
+                util.getEnv('GITHUB_REPOSITORY'),
                 util.getEnv('GITHUB_WORKFLOW'),
                 util.getEnv('GITHUB_JOB'),
                 util.getEnv('GITHUB_RUN_NUMBER'),
-                core.getInput('matrix-key')
+                core.getInput('matrix-key'),
+                // append a random number to ensure traceId is unique when the workflow is re-run
+                util.randomInt(Math.pow(2, 32)).toString()
             ];
             const traceId = util.replaceSpaces(traceComponents.filter(value => value).join('-'));
             // save buildStart to be used in the post section

diff --git a/src/index.ts b/src/index.ts
@@ -11,10 +11,13 @@ async function run(): Promise<void> {
 
     const buildStart = util.getTimestamp()
     const traceComponents = [
+      util.getEnv('GITHUB_REPOSITORY'),
       util.getEnv('GITHUB_WORKFLOW'),
       util.getEnv('GITHUB_JOB'),
       util.getEnv('GITHUB_RUN_NUMBER'),
-      core.getInput('matrix-key')
+      core.getInput('matrix-key'),
+      // append a random number to ensure traceId is unique when the workflow is re-run
+      util.randomInt(2 ** 32).toString()
     ]
     const traceId = util.replaceSpaces(traceComponents.filter(value => value).join('-'))