fix(orchestrion): move nil-ctx test spans to children of test.root

darccio · claude · darccio · commit a58ca9ae7b85 · 2026-03-20T09:02:38.000Z
GLS propagates the active span through goroutine-local storage even
when context.TODO() is used, so spanWithNilNamedCtx and
spanWithNilOtherCtx end up as children of test.root rather than
separate root traces.

Co-Authored-By: Claude Sonnet 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/internal/orchestrion/_integration/dd-span/no-tag.go b/internal/orchestrion/_integration/dd-span/no-tag.go
@@ -39,26 +39,26 @@ func (*TestCase) ExpectedTraces() trace.Traces {
 						},
 					},
 				},
-			},
-		},
-		// Nil *customCtx arguments fall back to context.TODO(), so these spans
-		// have no parent and appear as separate root traces.
-		{
-			Tags: map[string]any{
-				"name": "spanWithNilNamedCtx",
-			},
-			Meta: map[string]string{
-				"function-name": "spanWithNilNamedCtx",
-				"nil.ctx":       "named",
-			},
-		},
-		{
-			Tags: map[string]any{
-				"name": "spanWithNilOtherCtx",
-			},
-			Meta: map[string]string{
-				"function-name": "spanWithNilOtherCtx",
-				"nil.ctx":       "other",
+				// Nil *customCtx arguments fall back to context.TODO(), but GLS
+				// propagates the parent span, so these appear as children of test.root.
+				{
+					Tags: map[string]any{
+						"name": "spanWithNilNamedCtx",
+					},
+					Meta: map[string]string{
+						"function-name": "spanWithNilNamedCtx",
+						"nil.ctx":       "named",
+					},
+				},
+				{
+					Tags: map[string]any{
+						"name": "spanWithNilOtherCtx",
+					},
+					Meta: map[string]string{
+						"function-name": "spanWithNilOtherCtx",
+						"nil.ctx":       "other",
+					},
+				},
 			},
 		},
 	}
diff --git a/internal/orchestrion/_integration/dd-span/tag.go b/internal/orchestrion/_integration/dd-span/tag.go
@@ -42,26 +42,26 @@ func (tc *TestCase) ExpectedTraces() trace.Traces {
 						},
 					},
 				},
-			},
-		},
-		// Nil *customCtx arguments fall back to context.TODO(), so these spans
-		// have no parent and appear as separate root traces.
-		{
-			Tags: map[string]any{
-				"name": "spanWithNilNamedCtx",
-			},
-			Meta: map[string]string{
-				"function-name": "spanWithNilNamedCtx",
-				"nil.ctx":       "named",
-			},
-		},
-		{
-			Tags: map[string]any{
-				"name": "spanWithNilOtherCtx",
-			},
-			Meta: map[string]string{
-				"function-name": "spanWithNilOtherCtx",
-				"nil.ctx":       "other",
+				// Nil *customCtx arguments fall back to context.TODO(), but GLS
+				// propagates the parent span, so these appear as children of test.root.
+				{
+					Tags: map[string]any{
+						"name": "spanWithNilNamedCtx",
+					},
+					Meta: map[string]string{
+						"function-name": "spanWithNilNamedCtx",
+						"nil.ctx":       "named",
+					},
+				},
+				{
+					Tags: map[string]any{
+						"name": "spanWithNilOtherCtx",
+					},
+					Meta: map[string]string{
+						"function-name": "spanWithNilOtherCtx",
+						"nil.ctx":       "other",
+					},
+				},
 			},
 		},
 	}
