ci(all-green): stop datadog-ci's own CI detection from overwriting per-test pipeline tags

getCISpanTags() derives ci.pipeline.name/id/number and ci.job.name straight
from GITHUB_WORKFLOW/GITHUB_JOB/GITHUB_RUN_ID/GITHUB_RUN_NUMBER, applying the
same value to every file in the batched junit upload -- overwriting the
per-test values the --xpath-tag mappings lift from each testsuite's own
stamped properties. Blanking just those four env vars for the datadog-ci
child process leaves every other GITHUB_*-derived tag (repository URL, PR
association, commit SHA) untouched, since none of those collide with what
the xpath mappings set.

Generated by Claude Code.

Author: rochdev

scripts/run-upload.mjs

@@ -17,12 +17,16 @@ import { setTimeout as sleep } from 'node:timers/promises'
  *
  * @param {string} command
  * @param {string[]} args
+ * @param {NodeJS.ProcessEnv} [env]
  * @returns {Promise<UploadResult>}
  */
-function spawnUpload (command, args) {
+function spawnUpload (command, args, env) {
   return new Promise(resolve => {
     const start = Date.now()
-    const child = spawn(command, args, { stdio: ['ignore', 'pipe', 'pipe'] })
+    const child = spawn(command, args, {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      ...(env && { env: { ...process.env, ...env } }),
+    })
     let output = ''
     child.stdout.on('data', chunk => { output += chunk })
     child.stderr.on('data', chunk => { output += chunk })
@@ -40,10 +44,12 @@ function spawnUpload (command, args) {
  *
  * @param {string} command
  * @param {string[]} args
+ * @param {NodeJS.ProcessEnv} [env] Extra environment variables to overlay onto the child's
+ *   environment, on top of (not instead of) this process's own.
  * @returns {Promise<UploadResult>}
  */
-export async function runUpload (command, args) {
-  const result = await spawnUpload(command, args)
+export async function runUpload (command, args, env) {
+  const result = await spawnUpload(command, args, env)
   if (result.code !== 0) process.exitCode = 1
   return result
 }

scripts/upload-junit.mjs

@@ -4,7 +4,7 @@ import { runUpload } from './run-upload.mjs'
 const INPUT_DIR = 'junit-results'
 
 // Every sibling workflow's upload is merged into one call, so datadog-ci's own GITHUB_*-derived
-// Pipeline/Job facets would attribute every test to the All Green workflow instead of the one that
+// Pipeline/Job tags would attribute every test to the All Green workflow instead of the one that
 // produced it. `.mochamultireporterrc.js` stamps each testsuite with its own job's CI metadata (plus
 // `node_version`) as XML properties at mocha-run time, while that job's own GITHUB_* env vars are
 // still correct; these xpath-tag mappings lift those properties into real per-test tags at upload
@@ -18,6 +18,18 @@ const XPATH_TAGS = [
   "ci.job.name=/testcase/..//property[@name='ci.job.name']/@value",
 ]
 
+// datadog-ci derives its own ci.pipeline.name/id/number/url and ci.job.name tags directly from
+// these GITHUB_* variables (the All Green job's own), applying the same values to every file in
+// the batched upload — which would overwrite the per-test XPATH_TAGS values above. Blanking just
+// these four leaves every other GITHUB_*-derived tag (repository URL, PR association, commit SHA)
+// untouched, since those don't collide with anything XPATH_TAGS sets.
+const NO_PIPELINE_ATTRIBUTION_ENV = {
+  GITHUB_WORKFLOW: '',
+  GITHUB_JOB: '',
+  GITHUB_RUN_ID: '',
+  GITHUB_RUN_NUMBER: '',
+}
+
 /**
  * Upload every sibling workflow's downloaded junit reports to Datadog in a single call.
  * `--auto-discovery` already walks `junit-results/<run-id>/<artifact-name>/*.xml` recursively and
@@ -34,6 +46,6 @@ export async function uploadAllJunit () {
   const result = await runUpload('datadog-ci', [
     'junit', 'upload', '--service', 'dd-trace-js-tests', '--auto-discovery', INPUT_DIR,
     ...XPATH_TAGS.flatMap(tag => ['--xpath-tag', tag]),
-  ])
+  ], NO_PIPELINE_ATTRIBUTION_ENV)
   return [result]
 }