Fix span streaming guard behavior

cursoragent · claude · cursoragent · commit 597152d23e88 · 2026-03-09T10:14:21.000Z
- return early in streaming trace decorators when streaming mode is disabled

- resolve streaming option checks through Scope.get_client()

Co-Authored-By: gpt-5.3-codex-high &lt;noreply@anthropic.com&gt;
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
@@ -1182,7 +1182,7 @@ def start_streamed_span(
         active: bool,
     ) -> "StreamedSpan":
         # TODO: rename to start_span once we drop the old API
-        if not has_span_streaming_enabled(self.client.options):
+        if not has_span_streaming_enabled(self.get_client().options):
             warnings.warn(
                 "Using span streaming API in non-span-streaming mode. Use "
                 "sentry_sdk.start_transaction() and sentry_sdk.start_span() "
diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py
@@ -966,6 +966,7 @@ async def async_wrapper(*args: "Any", **kwargs: "Any") -> "Any":
                     "@sentry_sdk.trace instead.",
                     stacklevel=2,
                 )
+                return await f(*args, **kwargs)
 
             span_name = name or qualname_from_function(f) or ""
 
@@ -989,6 +990,7 @@ def sync_wrapper(*args: "Any", **kwargs: "Any") -> "Any":
                     "@sentry_sdk.trace instead.",
                     stacklevel=2,
                 )
+                return f(*args, **kwargs)
 
             span_name = name or qualname_from_function(f) or ""
 

Original file line number	Diff line number	Diff line change
`@@ -966,6 +966,7 @@ async def async_wrapper(args: "Any", *kwargs: "Any") -> "Any":`
`966`	`966`	`"@sentry_sdk.trace instead.",`
`967`	`967`	`stacklevel=2,`
`968`	`968`	`)`
	`969`	`+ return await f(args, *kwargs)`
`969`	`970`
`970`	`971`	`span_name = name or qualname_from_function(f) or ""`
`971`	`972`
`@@ -989,6 +990,7 @@ def sync_wrapper(args: "Any", *kwargs: "Any") -> "Any":`
`989`	`990`	`"@sentry_sdk.trace instead.",`
`990`	`991`	`stacklevel=2,`
`991`	`992`	`)`
	`993`	`+ return f(args, *kwargs)`
`992`	`994`
`993`	`995`	`span_name = name or qualname_from_function(f) or ""`
`994`	`996`