Merge branch 'master' into feat/span-first

sentrivana · sentrivana · commit ab080c608e08 · 2026-03-09T09:44:13.000+01:00
diff --git a/sentry_sdk/traces.py b/sentry_sdk/traces.py
@@ -173,7 +173,7 @@ def continue_trace(incoming: "dict[str, Any]") -> None:
     sentry_sdk.get_isolation_scope().generate_propagation_context(
         incoming,
     )
-    return sentry_sdk.get_current_scope().generate_propagation_context(
+    sentry_sdk.get_current_scope().generate_propagation_context(
         incoming,
     )
 

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ def continue_trace(incoming: "dict[str, Any]") -> None:`
`173`	`173`	`sentry_sdk.get_isolation_scope().generate_propagation_context(`
`174`	`174`	`incoming,`
`175`	`175`	`)`
`176`		`- return sentry_sdk.get_current_scope().generate_propagation_context(`
	`176`	`+ sentry_sdk.get_current_scope().generate_propagation_context(`
`177`	`177`	`incoming,`
`178`	`178`	`)`
`179`	`179`