fix: use actual job name in OTLP span names (#fix-span-names)

actions/setup/action.yml

@@ -11,7 +11,7 @@ inputs:
     required: false
     default: 'false'
   job-name:
-    description: 'Name of the job being set up. When OTEL_EXPORTER_OTLP_ENDPOINT is configured, a gh-aw.job.setup span is pushed to the OTLP endpoint.'
+    description: 'Name of the job being set up. When OTEL_EXPORTER_OTLP_ENDPOINT is configured, a gh-aw.<job-name>.setup span is pushed to the OTLP endpoint.'
     required: false
     default: ''
   trace-id:
@@ -23,7 +23,7 @@ outputs:
   files_copied:
     description: 'Number of files copied'
   trace-id:
-    description: 'The OTLP trace ID used for the gh-aw.job.setup span. Pass this to subsequent job setup steps via the trace-id input to correlate all job spans under a single trace.'
+    description: 'The OTLP trace ID used for the gh-aw.<job-name>.setup span. Pass this to subsequent job setup steps via the trace-id input to correlate all job spans under a single trace.'
 
 runs:
   using: 'node24'

actions/setup/js/action_conclusion_otlp.cjs

@@ -4,8 +4,8 @@
 /**
  * action_conclusion_otlp.cjs
  *
- * Sends a gh-aw.job.conclusion OTLP span (or a span named after the current
- * job).  Used by both:
+ * Sends a `gh-aw.<jobName>.conclusion` OTLP span (or `gh-aw.job.conclusion`
+ * when no job name is configured).  Used by both:
  *
  *   - actions/setup/post.js   (dev/release/action mode)
  *   - actions/setup/clean.sh  (script mode)
@@ -14,7 +14,7 @@
  *
  * Environment variables read:
  *   INPUT_JOB_NAME – job name from the `job-name` action input; when set the
- *                    span is named "gh-aw.job.<name>", otherwise
+ *                    span is named "gh-aw.<name>.conclusion", otherwise
  *                    "gh-aw.job.conclusion".
  *   GITHUB_AW_OTEL_TRACE_ID       – parent trace ID (set by action_setup_otlp.cjs)
  *   GITHUB_AW_OTEL_PARENT_SPAN_ID – parent span ID (set by action_setup_otlp.cjs)
@@ -35,7 +35,7 @@ async function run() {
     return;
   }
 
-  const spanName = process.env.INPUT_JOB_NAME ? `gh-aw.job.${process.env.INPUT_JOB_NAME}` : "gh-aw.job.conclusion";
+  const spanName = process.env.INPUT_JOB_NAME ? `gh-aw.${process.env.INPUT_JOB_NAME}.conclusion` : "gh-aw.job.conclusion";
   console.log(`[otlp] sending conclusion span "${spanName}" to ${endpoint}`);
 
   const { sendJobConclusionSpan } = require(path.join(__dirname, "send_otlp_span.cjs"));

actions/setup/js/action_otlp.test.cjs

@@ -173,7 +173,7 @@ describe("action_conclusion_otlp run()", () => {
 
     const payload = JSON.parse(capturedBody);
     const spanName = payload?.resourceSpans?.[0]?.scopeSpans?.[0]?.spans?.[0]?.name;
-    expect(spanName).toBe("gh-aw.job.agent");
+    expect(spanName).toBe("gh-aw.agent.conclusion");
     fetchSpy.mockRestore();
   });
 

actions/setup/js/action_setup_otlp.cjs

@@ -4,7 +4,7 @@
 /**
  * action_setup_otlp.cjs
  *
- * Sends a gh-aw.job.setup OTLP span and writes the trace/span IDs to
+ * Sends a `gh-aw.<jobName>.setup` OTLP span and writes the trace/span IDs to
  * GITHUB_OUTPUT and GITHUB_ENV.  Used by both:
  *
  *   - actions/setup/index.js  (dev/release/action mode)

actions/setup/js/send_otlp_span.cjs

@@ -281,7 +281,8 @@ function isValidSpanId(id) {
  */
 
 /**
- * Send a `gh-aw.job.setup` span to the configured OTLP endpoint.
+ * Send a `gh-aw.<jobName>.setup` span (or `gh-aw.job.setup` when no job name
+ * is configured) to the configured OTLP endpoint.
  *
  * This is designed to be called from `actions/setup/index.js` immediately after
  * the setup script completes.  It always returns `{ traceId, spanId }` so callers
@@ -363,7 +364,7 @@ async function sendJobSetupSpan(options = {}) {
   const payload = buildOTLPPayload({
     traceId,
     spanId,
-    spanName: "gh-aw.job.setup",
+    spanName: jobName ? `gh-aw.${jobName}.setup` : "gh-aw.job.setup",
     startMs,
     endMs,
     serviceName,

actions/setup/js/send_otlp_span.test.cjs

@@ -615,8 +615,7 @@ describe("sendJobSetupSpan", () => {
 
     const body = JSON.parse(init.body);
     const span = body.resourceSpans[0].scopeSpans[0].spans[0];
-    expect(span.name).toBe("gh-aw.job.setup");
-    // Span traceId and spanId must match the returned values
+    expect(span.name).toBe("gh-aw.agent.setup");
     expect(span.traceId).toBe(traceId);
     expect(span.spanId).toBe(spanId);
 

actions/setup/post.js

@@ -16,7 +16,7 @@ const fs = require("fs");
 // Wrap everything in an async IIFE so that the OTLP span is fully sent before
 // the cleanup deletes /tmp/gh-aw/ (which contains aw_info.json and otel.jsonl).
 (async () => {
-  // Send a gh-aw.job.conclusion span to the configured OTLP endpoint, if any.
+  // Send a gh-aw.<jobName>.conclusion span to the configured OTLP endpoint, if any.
   // Delegates to action_conclusion_otlp.cjs so that script mode (clean.sh) and
   // dev/release mode share the same implementation.  Non-fatal: errors are
   // handled inside sendJobConclusionSpan via console.warn.