getsentry · alexander-alderman-webb · Apr 9, 2026 · Mar 20, 2026 · Mar 20, 2026 · Mar 20, 2026
@@ -14,7 +14,7 @@
     get_start_span_function,
     transform_anthropic_content_part,
 )
-from sentry_sdk.consts import OP, SPANDATA, SPANSTATUS
+from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import _check_minimum_version, DidNotEnable, Integration
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.tracing_utils import set_span_errored
@@ -602,7 +602,7 @@ def _set_output_data(
 
 def _sentry_patched_create_sync(f: "Any", *args: "Any", **kwargs: "Any") -> "Any":
     """
-    Creates an AI Client Span for both non-streaming and streaming calls.
+    Creates and manages an AI Client Span for both non-streaming and streaming calls.
     """
     integration = kwargs.pop("integration")
     if integration is None:
@@ -633,6 +633,7 @@ def _sentry_patched_create_sync(f: "Any", *args: "Any", **kwargs: "Any") -> "Any
         exc_info = sys.exc_info()
         with capture_internal_exceptions():
             _capture_exception(exc)
+            span.__exit__(None, None, None)
         reraise(*exc_info)
 
     if isinstance(result, Stream):
@@ -689,7 +690,7 @@ async def _sentry_patched_create_async(
     f: "Any", *args: "Any", **kwargs: "Any"
 ) -> "Any":
     """
-    Creates an AI Client Span for both non-streaming and streaming calls.
+    Creates and manages an AI Client Span for both non-streaming and streaming calls.
     """
     integration = kwargs.pop("integration")
     if integration is None:
@@ -720,6 +721,7 @@ async def _sentry_patched_create_async(
         exc_info = sys.exc_info()
         with capture_internal_exceptions():
             _capture_exception(exc)
+            span.__exit__(None, None, None)
         reraise(*exc_info)
 
     if isinstance(result, AsyncStream):
@@ -778,13 +780,7 @@ def _sentry_wrapped_create_sync(*args: "Any", **kwargs: "Any") -> "Any":
         integration = sentry_sdk.get_client().get_integration(AnthropicIntegration)
         kwargs["integration"] = integration
 
-        try:
-            return _sentry_patched_create_sync(f, *args, **kwargs)
-        finally:
-            span = sentry_sdk.get_current_span()
-            if span is not None and span.status == SPANSTATUS.INTERNAL_ERROR:
-                with capture_internal_exceptions():
-                    span.__exit__(None, None, None)
+        return _sentry_patched_create_sync(f, *args, **kwargs)
 
     return _sentry_wrapped_create_sync
 
@@ -878,13 +874,7 @@ async def _sentry_wrapped_create_async(*args: "Any", **kwargs: "Any") -> "Any":
         integration = sentry_sdk.get_client().get_integration(AnthropicIntegration)
         kwargs["integration"] = integration
 
-        try:
-            return await _sentry_patched_create_async(f, *args, **kwargs)
-        finally:
-            span = sentry_sdk.get_current_span()
-            if span is not None and span.status == SPANSTATUS.INTERNAL_ERROR:
-                with capture_internal_exceptions():
-                    span.__exit__(None, None, None)
+        return await _sentry_patched_create_async(f, *args, **kwargs)
 
     return _sentry_wrapped_create_async