Skip to content

fix(tracer): use background context instead of panicking on nil ctx in ContextWithSpan #4313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 4 commits into from
Mar 30, 2026
Merged

fix(tracer): use background context instead of panicking on nil ctx in ContextWithSpan #4313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
778d730
chore(doc): add documentation clearly stating that tracer.ContextWith…
genesor Dec 24, 2025
2a044fc
feat(tracer): add explicit nil-check panic in ContextWithSpan
genesor Mar 26, 2026
c1b5473
fix(tracer): use background context instead of panicking on nil ctx i…
genesor Mar 27, 2026
59b7717
fix(tracer): add warn log on nil context in ContextWithSpan
genesor Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ddtrace/tracer/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,17 @@ import (
"github.com/DataDog/dd-trace-go/v2/instrumentation/options"
"github.com/DataDog/dd-trace-go/v2/internal"
illmobs "github.com/DataDog/dd-trace-go/v2/internal/llmobs"
"github.com/DataDog/dd-trace-go/v2/internal/log"
"github.com/DataDog/dd-trace-go/v2/internal/orchestrion"
)

// ContextWithSpan returns a copy of the given context which includes the span s.
// If ctx is nil, a new background context is created to avoid panicking.
func ContextWithSpan(ctx context.Context, s *Span) context.Context {
if ctx == nil {
log.Warn("ContextWithSpan: received nil context, falling back to context.Background()")
ctx = context.Background()
}
Comment thread
genesor marked this conversation as resolved.
newCtx := orchestrion.CtxWithValue(ctx, internal.ActiveSpanKey, s)
Comment thread
genesor marked this conversation as resolved.
return contextWithPropagatedLLMSpan(newCtx, s)
}
Expand Down
22 changes: 17 additions & 5 deletions ddtrace/tracer/context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,23 @@ import (
)

func TestContextWithSpan(t *testing.T) {
want := &Span{spanID: 123}
ctx := ContextWithSpan(context.Background(), want)
got := ctx.Value(internal.ActiveSpanKey)
assert := assert.New(t)
assert.Equal(got, want)
t.Run("OK", func(t *testing.T) {
want := &Span{spanID: 123}
ctx := ContextWithSpan(context.Background(), want)
got := ctx.Value(internal.ActiveSpanKey)
assert := assert.New(t)
assert.Equal(got, want)
})

t.Run("nil context", func(t *testing.T) {
assert.NotPanics(t, func() {
want := &Span{spanID: 123}
ctx := ContextWithSpan(nil, want)
got := ctx.Value(internal.ActiveSpanKey)
assert := assert.New(t)
assert.Equal(got, want)
})
})
}

func TestSpanFromContext(t *testing.T) {
Expand Down
Loading