Skip to content

fix(anthropic): Capture exceptions for stream() calls #5950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexander-alderman-webb wants to merge 2 commits into
base: webb/anthropic/remove-set-span-errored
Choose a base branch
from
+26 −10
Open

fix(anthropic): Capture exceptions for stream() calls #5950

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db10c72
fix(anthropic): Set exceptions on spans for stream() calls
alexander-alderman-webb Apr 7, 2026
a6aa6c8
Merge branch 'webb/anthropic/remove-set-span-errored' into webb/anthr…
alexander-alderman-webb Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions sentry_sdk/integrations/anthropic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,22 +921,21 @@ def _wrap_message_stream_manager_enter(f: "Any") -> "Any":

@wraps(f)
def _sentry_patched_enter(self: "MessageStreamManager") -> "MessageStream":
stream = f(self)
if not hasattr(self, "_max_tokens"):
return stream
return f(self)

integration = sentry_sdk.get_client().get_integration(AnthropicIntegration)

if integration is None:
return stream
return f(self)

if self._messages is None:
return stream
return f(self)

try:
iter(self._messages)
except TypeError:
return stream
return f(self)

span = get_start_span_function()(
op=OP.GEN_AI_CHAT,
Expand All @@ -959,6 +958,15 @@ def _sentry_patched_enter(self: "MessageStreamManager") -> "MessageStream":
tools=self._tools,
)

try:
stream = f(self)
except Exception as exc:
exc_info = sys.exc_info()
with capture_internal_exceptions():
_capture_exception(exc)
span.__exit__(*exc_info)
reraise(*exc_info)

stream._span = span
stream._integration = integration

Expand Down Expand Up @@ -1008,22 +1016,21 @@ def _wrap_async_message_stream_manager_aenter(f: "Any") -> "Any":
async def _sentry_patched_aenter(
self: "AsyncMessageStreamManager",
) -> "AsyncMessageStream":
stream = await f(self)
if not hasattr(self, "_max_tokens"):
return stream
return await f(self)

integration = sentry_sdk.get_client().get_integration(AnthropicIntegration)

if integration is None:
return stream
return await f(self)

if self._messages is None:
return stream
return await f(self)

try:
iter(self._messages)
except TypeError:
return stream
return await f(self)

span = get_start_span_function()(
op=OP.GEN_AI_CHAT,
Expand All @@ -1046,6 +1053,15 @@ async def _sentry_patched_aenter(
tools=self._tools,
)

try:
stream = await f(self)
except Exception as exc:
exc_info = sys.exc_info()
with capture_internal_exceptions():
_capture_exception(exc)
span.__exit__(*exc_info)
reraise(*exc_info)

stream._span = span
stream._integration = integration

Expand Down
Loading