fix: address review comments

Author: constantinius

sentry_sdk/integrations/openai_agents/patches/agent_run.py

@@ -3,7 +3,7 @@
 
 from sentry_sdk.consts import SPANDATA
 from sentry_sdk.integrations import DidNotEnable
-from sentry_sdk.utils import reraise
+from sentry_sdk.utils import capture_internal_exceptions, reraise
 from ..spans import (
     invoke_agent_span,
     end_invoke_agent_span,
@@ -218,11 +218,13 @@ async def patched_run_single_turn_streamed(
         try:
             result = await original_run_single_turn_streamed(*args, **kwargs)
         except Exception as exc:
-            if span is not None and span.timestamp is None:
-                _record_exception_on_span(span, exc)
-                end_invoke_agent_span(context_wrapper, agent)
-            _close_streaming_workflow_span(agent)
-            reraise(*sys.exc_info())
+            exc_info = sys.exc_info()
+            with capture_internal_exceptions():
+                if span is not None and span.timestamp is None:
+                    _record_exception_on_span(span, exc)
+                    end_invoke_agent_span(context_wrapper, agent)
+                _close_streaming_workflow_span(agent)
+            reraise(*exc_info)
 
         return result
 

sentry_sdk/integrations/openai_agents/patches/models.py

@@ -145,12 +145,11 @@ async def wrapped_stream_response(*args: "Any", **kwargs: "Any") -> "Any":
                 if len(args) > 1:
                     span_kwargs["input"] = args[1]
 
-                span = ai_client_span(agent, span_kwargs)
-                span.__enter__()
-                span.set_data(SPANDATA.GEN_AI_RESPONSE_STREAMING, True)
+                with ai_client_span(agent, span_kwargs) as span:
+                    span.set_data(SPANDATA.GEN_AI_RESPONSE_STREAMING, True)
+
+                    streaming_response = None
 
-                streaming_response = None
-                try:
                     async for event in original_stream_response(*args, **kwargs):
                         # Capture the full response from ResponseCompletedEvent
                         if hasattr(event, "response"):
@@ -167,8 +166,6 @@ async def wrapped_stream_response(*args: "Any", **kwargs: "Any") -> "Any":
                         )
                         _set_response_model_on_agent_span(agent, response_model)
                         update_ai_client_span(span, streaming_response)
-                finally:
-                    span.__exit__(*sys.exc_info())
 
             model.stream_response = wrapped_stream_response