feat!: move tracing to rely on ctx by giortzisg · Pull Request #1379 · getsentry/sentry-go

giortzisg · 2026-07-30T19:04:32Z

Description

Modify existing tracing and propagation behavior to rely on context.Context. Tracing now resolves state from context rather than hubs. This includes a breaking change on ContinueTrace removing the need for a hub to be passed.

#skip-changelog

Issues

resolves: Refactor scope propagation to rely on context.Context #1367
resolves: GO-154

Changelog Entry Instructions

To add a custom changelog entry, uncomment the section above. Supports:

Single entry: just write text
Multiple entries: use bullet points
Nested bullets: indent 4+ spaces

For more details: custom changelog entries

Reminders

Add GH Issue ID & Linear ID
PR title should use conventional commit style (feat:, fix:, ref:, meta:)
For external contributors: CONTRIBUTING.md, Sentry SDK development docs, Discord community

linear-code · 2026-08-03T09:11:24Z

GO-154

cursor

Stale Bugbot comment from a previous run.

cursor

Stale Bugbot comment from a previous run.

cursor

Stale Bugbot comment from a previous run.

szokeasaurusrex

I think this mostly looks good! I left some questions about some items I was unclear on

szokeasaurusrex · 2026-09-08T09:48:00Z


-func (client *Client) prepareEvent(event *Event, scope *Scope, opts captureOptions) *Event {
-	scopeProcessors := scope.applyToEvent(event, client, opts.hint, client.options.MaxBreadcrumbs)
+func (client *Client) prepareEvent(ctx context.Context, event *Event, scope *Scope, opts captureOptions) *Event {


[question] why do we still take an explicitly passed scope here? Can't we take it from the ctx?

szokeasaurusrex · 2026-09-08T09:51:41Z

+	ctx := ContextWithClient(ContextWithScope(context.Background(), scope), client)
+	transaction := StartTransaction(ctx, "request", WithOpName("http.server"))
+
+	require.NotNil(t, client.CaptureMessage(transaction.Context(), "message"))


I notice here we pass transaction.Context(), not ctx. I am assuming that is because of the copy-on-write behavior we were discussing earlier (i.e. ctx remains unchanged and the new context goes on the transaction)?

If that is the case, this new API does seem somewhat unergonomic because it requires an SDK user to remember to capture the message on the specific transaction context in order to get the message to show correctly within said transaction. Is this something you have considered? Is there an alternative API planned which will make this easier for users, or is it a tradeoff we need to accept?

szokeasaurusrex · 2026-09-08T09:52:40Z

 // hubFromContext returns either a hub stored in the context or the current hub.
 // The return value is guaranteed to be non-nil, unlike GetHubFromContext.
-func hubFromContext(ctx context.Context) *Hub {
+func hubFromContext(ctx context.Context) *Hub { // nolint: unused


[question] why are we keeping this around if it is unused?

removing on the remove hub branch.

szokeasaurusrex · 2026-09-08T09:56:11Z

 	maxSpans := defaultMaxSpans
-	if client := CurrentHub().Client(); client.IsEnabled() {
+	if client != nil && client.IsEnabled() {
 		maxSpans = client.options.MaxSpans


I guess technically out of scope for this PR, but I believe max spans is not meant to be user-configurable? It is not listed as one of the options on this page

Yeah, agreed, but this probably needs to be a separate change.

szokeasaurusrex · 2026-09-08T11:00:42Z

-func TestContinueSpanFromRequest(t *testing.T) {
-	traceID := TraceIDFromHex("bc6d53f15eb88f4320054569b8c553d4")
-	spanID := SpanIDFromHex("b72fa28504b07285")
-
-	for _, sampled := range []Sampled{SampledTrue, SampledFalse, SampledUndefined} {
-		sampled := sampled
-		t.Run(sampled.String(), func(t *testing.T) {
-			var s Span
-			s.ctx = context.Background()
-			hkey := http.CanonicalHeaderKey("sentry-trace")
-			hval := (&Span{
-				TraceID: traceID,
-				SpanID:  spanID,
-				Sampled: sampled,
-			}).ToSentryTrace()
-			header := http.Header{hkey: []string{hval}}
-			ContinueFromRequest(&http.Request{Header: header})(&s)
-			if s.TraceID != traceID {
-				t.Errorf("got %q, want %q", s.TraceID, traceID)
-			}
-			if s.ParentSpanID != spanID {
-				t.Errorf("got %q, want %q", s.ParentSpanID, spanID)
-			}
-			if s.Sampled != sampled {
-				t.Errorf("got %q, want %q", s.Sampled, sampled)
-			}
-		})
-	}
-}


Have this test (and the other removed tests in this file) been fully removed, or is the same logic moving elsewhere?

removed them.

cursor

Stale Bugbot comment from a previous run.

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 645b45e. Configure here.}

Use context.Context for active span lookup and parenting while retaining the request transaction on its scope as a stable correlation fallback. Child spans never replace or restore that fallback, and finishing a transaction preserves request correlation. Freeze dynamic sampling context once for baggage, error capture, and transaction delivery. Explicit client bindings remain authoritative; unbound contexts follow Init. Keep incoming sampling decisions when recording is disabled, inherit local parent sampling before client overrides, and reject inconsistent continuation metadata without retaining a previous request's trace. ContinueTrace accepts incoming header values as a span option without changing scope state before a transaction starts. StartTransaction returns the existing root without changing its context; callers reusing a transaction must retain their caller context and leave finishing to its owner.

giortzisg force-pushed the scopes/context-tracing branch from 5562df0 to 0e6bf84 Compare July 30, 2026 20:45

giortzisg force-pushed the scopes/context-tracing branch from 0e6bf84 to 09cf02b Compare August 4, 2026 15:25

giortzisg closed this Aug 4, 2026

giortzisg reopened this Aug 4, 2026

giortzisg changed the base branch from scopes/context-capture to scopes/context-propagation-api August 4, 2026 15:37

giortzisg force-pushed the scopes/context-tracing branch from 09cf02b to 388298c Compare August 4, 2026 15:42

giortzisg force-pushed the scopes/context-tracing branch from 388298c to 569c73b Compare August 5, 2026 09:59

giortzisg force-pushed the scopes/context-tracing branch from 569c73b to 580aec3 Compare August 10, 2026 11:36

giortzisg changed the base branch from scopes/context-propagation-api to scopes/context-capture August 13, 2026 08:34

giortzisg force-pushed the scopes/context-tracing branch from 580aec3 to 75a6927 Compare August 24, 2026 07:53

giortzisg marked this pull request as ready for review August 24, 2026 07:54

cursor Bot reviewed Aug 24, 2026

View reviewed changes

Comment thread hub.go Outdated

giortzisg force-pushed the scopes/context-tracing branch from 75a6927 to bee39bc Compare August 24, 2026 10:17

cursor Bot reviewed Aug 24, 2026

View reviewed changes

Comment thread hub.go

giortzisg requested review from Litarnus, sl0thentr0py and szokeasaurusrex August 31, 2026 07:47

giortzisg force-pushed the scopes/context-tracing branch from bee39bc to ba9db9a Compare August 31, 2026 10:50

cursor Bot reviewed Aug 31, 2026

View reviewed changes

Comment thread tracing.go Outdated

giortzisg changed the title ~~feat: move tracing to rely on ctx~~ feat!: move tracing to rely on ctx Sep 1, 2026

giortzisg force-pushed the scopes/context-tracing branch from 5a7b7e9 to ec45c0b Compare September 1, 2026 12:57

giortzisg force-pushed the scopes/context-tracing branch 2 times, most recently from fa24cc9 to 12311a2 Compare September 4, 2026 13:11

giortzisg changed the base branch from scopes/context-capture to scopes/scope-merge September 4, 2026 13:11

giortzisg force-pushed the scopes/context-tracing branch from 12311a2 to e0c450d Compare September 4, 2026 13:26

sentry Bot reviewed Sep 4, 2026

View reviewed changes

Comment thread scope.go Outdated

cursor Bot reviewed Sep 4, 2026

View reviewed changes

Comment thread http/sentryhttp.go

giortzisg force-pushed the scopes/context-tracing branch from e0c450d to 8a4508e Compare September 7, 2026 11:40

cursor Bot reviewed Sep 7, 2026

View reviewed changes

Comment thread scope.go

giortzisg force-pushed the scopes/context-tracing branch from 8a4508e to 80793c9 Compare September 7, 2026 11:49

cursor Bot reviewed Sep 7, 2026

View reviewed changes

Comment thread tracing.go Outdated

szokeasaurusrex approved these changes Sep 8, 2026

View reviewed changes

giortzisg force-pushed the scopes/context-tracing branch from 80793c9 to 37acc6f Compare September 16, 2026 09:14

sentry Bot reviewed Sep 16, 2026

View reviewed changes

Comment thread hub.go

cursor Bot reviewed Sep 16, 2026

View reviewed changes

Comment thread hub.go

giortzisg force-pushed the scopes/context-tracing branch from 37acc6f to 645b45e Compare September 17, 2026 08:38

cursor Bot reviewed Sep 17, 2026

View reviewed changes

Comment thread tracing.go

giortzisg removed this pull request from stack #1420 September 18, 2026 11:17

giortzisg force-pushed the scopes/context-tracing branch from 645b45e to 65227ad Compare September 18, 2026 11:18

giortzisg added this pull request to stack #1433 September 18, 2026 11:22

Conversation

giortzisg commented Jul 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issues

Uh oh!

linear-code Bot commented Aug 3, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cursor Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cursor Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

szokeasaurusrex left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cursor Bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

giortzisg commented Jul 30, 2026 •

edited

Loading

cursor Bot left a comment •

edited

Loading

cursor Bot left a comment •

edited

Loading

cursor Bot left a comment •

edited

Loading

cursor Bot left a comment •

edited

Loading