Merge branch 'ivana/span-first-6-add-continue-and-new-trace' into ivana/span-first-7-add-trace-decorator

sentrivana · sentrivana · commit e20d4fd40818 · 2026-03-05T14:56:30.000+01:00
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
@@ -1190,7 +1190,7 @@ def start_streamed_span(
             )
 
         if parent_span is None or isinstance(parent_span, NoOpStreamedSpan):
-            parent_span = self.span or self.get_current_scope().span  # type: ignore
+            parent_span = self.span  # type: ignore
 
         # If no eligible parent_span was provided and there is no currently
         # active span, this is a segment
diff --git a/sentry_sdk/traces.py b/sentry_sdk/traces.py
@@ -144,7 +144,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
`@@ -1190,7 +1190,7 @@ def start_streamed_span(`
`1190`	`1190`	`)`
`1191`	`1191`
`1192`	`1192`	`if parent_span is None or isinstance(parent_span, NoOpStreamedSpan):`
`1193`		`- parent_span = self.span or self.get_current_scope().span # type: ignore`
	`1193`	`+ parent_span = self.span # type: ignore`
`1194`	`1194`
`1195`	`1195`	`# If no eligible parent_span was provided and there is no currently`
`1196`	`1196`	`# active span, this is a segment`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ def continue_trace(incoming: "dict[str, Any]") -> None:`
`144`	`144`	`sentry_sdk.get_isolation_scope().generate_propagation_context(`
`145`	`145`	`incoming,`
`146`	`146`	`)`
`147`		`- return sentry_sdk.get_current_scope().generate_propagation_context(`
	`147`	`+ sentry_sdk.get_current_scope().generate_propagation_context(`
`148`	`148`	`incoming,`
`149`	`149`	`)`
`150`	`150`