feat!: move active tracing to context

Use context.Context as the active span stack, resolve sampling and transaction delivery through the contextual client, retain scope propagation only as the no-active-span fallback, and preserve frozen root baggage through child spans.

BREAKING CHANGE: ContinueTrace no longer accepts a Hub. Pass the sentry-trace and baggage header values directly and carry the returned span through context.

Author: giortzisg

client.go

@@ -933,7 +933,7 @@ func (client *Client) capture(ctx context.Context, event *Event, opts captureOpt
 	}
 
 	scope := scopeFromContextOrGlobal(ctx)
-	if event = client.prepareEvent(event, scope, opts); event == nil {
+	if event = client.prepareEvent(ctx, event, scope, opts); event == nil {
 		return nil
 	}
 
@@ -981,8 +981,8 @@ func (client *Client) capture(ctx context.Context, event *Event, opts captureOpt
 	return &event.EventID
 }
 
-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 {
+	scopeProcessors := scope.applyToEvent(ctx, event, client, client.options.MaxBreadcrumbs)
 	if event.Level == "" {
 		event.Level = opts.defaultLevel
 	}

client_test.go

@@ -196,12 +196,39 @@ func TestCaptureMessageCopiesHintAndUsesContext(t *testing.T) {
 	assert.Same(t, providedCtx, provided.Context)
 }
 
+func TestClientCaptureUsesContext(t *testing.T) {
+	client, transport := newCaptureTestClient(t, ClientOptions{})
+	scope := NewScope()
+	ctx := ContextWithClient(ContextWithScope(context.Background(), scope), client)
+	transaction := StartTransaction(ctx, "request", WithOpName("http.server"))
+
+	require.NotNil(t, client.CaptureMessage(transaction.Context(), "message"))
+
+	trace := requireSingleEvent(t, transport).Contexts[traceContextKey]
+	assert.Equal(t, transaction.TraceID, trace[traceIDContextKey])
+	assert.Equal(t, transaction.SpanID, trace[spanIDContextKey])
+}
+
 func TestCaptureMessageShouldSendEventWithProvidedMessage(t *testing.T) {
 	client, scope, transport := setupClientTest()
 	client.CaptureMessage(ContextWithScope(context.Background(), scope), "foo")
 	assertEqual(t, transport.lastEvent.Message, "foo")
 }
 
+func TestCaptureMessagePreservesActiveSpanTraceContextWithoutScope(t *testing.T) {
+	client, _, transport := setupClientTest()
+	transaction := StartTransaction(context.Background(), "request", WithOpName("http.server"))
+	transaction.SetData("http.request.method", http.MethodGet)
+
+	CaptureMessage(ContextWithClient(transaction.Context(), client), "foo")
+
+	trace := transport.lastEvent.Contexts["trace"]
+	assertEqual(t, trace["trace_id"], transaction.TraceID)
+	assertEqual(t, trace["span_id"], transaction.SpanID)
+	assertEqual(t, trace["op"], "http.server")
+	assertEqual(t, trace["data"], map[string]any{"http.request.method": http.MethodGet})
+}
+
 func TestCaptureMessageShouldSucceedWithoutNilScope(t *testing.T) {
 	client, _, transport := setupClientTest()
 	client.CaptureMessage(context.Background(), "foo")

dynamic_sampling_context.go

@@ -39,11 +39,11 @@ func DynamicSamplingContextFromHeader(header []byte) (DynamicSamplingContext, er
 }
 
 func DynamicSamplingContextFromTransaction(span *Span) DynamicSamplingContext {
-	hub := hubFromContext(span.Context())
-	scope := hub.Scope()
-	client := hub.Client()
+	return dynamicSamplingContextFromTransaction(span, ClientFromContext(span.Context()))
+}
 
-	if !client.IsEnabled() || scope == nil {
+func dynamicSamplingContextFromTransaction(span *Span, client *Client) DynamicSamplingContext {
+	if !client.IsEnabled() {
 		return DynamicSamplingContext{
 			Entries: map[string]string{},
 			Frozen:  false,

echo/sentryecho.go

@@ -79,7 +79,7 @@ func (h *handler) handle(next echo.HandlerFunc) echo.HandlerFunc {
 		}
 
 		options := []sentry.SpanOption{
-			sentry.ContinueTrace(hub, r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
+			sentry.ContinueTrace(r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
 			sentry.WithOpName("http.server"),
 			sentry.WithTransactionSource(transactionSource),
 			sentry.WithSpanOrigin(sentry.SpanOriginEcho),

fasthttp/sentryfasthttp.go

@@ -71,7 +71,7 @@ func (h *Handler) Handle(handler fasthttp.RequestHandler) fasthttp.RequestHandle
 		r := convert(ctx)
 
 		options := []sentry.SpanOption{
-			sentry.ContinueTrace(hub, r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
+			sentry.ContinueTrace(r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
 			sentry.WithOpName("http.server"),
 			sentry.WithTransactionSource(sentry.SourceURL),
 			sentry.WithSpanOrigin(sentry.SpanOriginFastHTTP),

fiber/sentryfiber.go

@@ -73,7 +73,7 @@ func (h *handler) handle(ctx *fiber.Ctx) error {
 	transactionSource := sentry.SourceURL
 
 	options := []sentry.SpanOption{
-		sentry.ContinueTrace(hub, r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
+		sentry.ContinueTrace(r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
 		sentry.WithOpName("http.server"),
 		sentry.WithTransactionSource(transactionSource),
 		sentry.WithSpanOrigin(sentry.SpanOriginFiber),

fiberv3/sentryfiber.go

@@ -73,7 +73,7 @@ func (h *handler) handle(ctx fiber.Ctx) error {
 	transactionSource := sentry.SourceURL
 
 	options := []sentry.SpanOption{
-		sentry.ContinueTrace(hub, r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
+		sentry.ContinueTrace(r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
 		sentry.WithOpName("http.server"),
 		sentry.WithTransactionSource(transactionSource),
 		sentry.WithSpanOrigin(sentry.SpanOriginFiber),

gin/sentrygin.go

@@ -76,7 +76,7 @@ func (h *handler) handle(c *gin.Context) {
 	}
 
 	options := []sentry.SpanOption{
-		sentry.ContinueTrace(hub, c.GetHeader(sentry.SentryTraceHeader), c.GetHeader(sentry.SentryBaggageHeader)),
+		sentry.ContinueTrace(c.GetHeader(sentry.SentryTraceHeader), c.GetHeader(sentry.SentryBaggageHeader)),
 		sentry.WithOpName("http.server"),
 		sentry.WithTransactionSource(transactionSource),
 		sentry.WithSpanOrigin(sentry.SpanOriginGin),

grpc/server.go

@@ -84,7 +84,7 @@ func startServerTransaction(ctx context.Context, fullMethod string) (context.Con
 	transaction := sentry.StartTransaction(
 		sentry.SetHubOnContext(ctx, hub),
 		name,
-		sentry.ContinueTrace(hub, sentryTraceHeader, sentryBaggageHeader),
+		sentry.ContinueTrace(sentryTraceHeader, sentryBaggageHeader),
 		sentry.WithOpName(defaultServerOperationName),
 		sentry.WithDescription(name),
 		sentry.WithTransactionSource(sentry.SourceRoute),

http/sentryhttp.go

@@ -96,7 +96,7 @@ func (h *Handler) handle(handler http.Handler) http.HandlerFunc {
 		}
 
 		options := []sentry.SpanOption{
-			sentry.ContinueTrace(hub, r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
+			sentry.ContinueTrace(r.Header.Get(sentry.SentryTraceHeader), r.Header.Get(sentry.SentryBaggageHeader)),
 			sentry.WithOpName("http.server"),
 			sentry.WithTransactionSource(sentry.SourceURL),
 			sentry.WithSpanOrigin(sentry.SpanOriginStdLib),