fix(openai-agents): Store invoke_agent span on agents.RunContextWrapper (#5165)

Store the agent invocation span on the `openai-agents` run context, and finish the span by accessing the span on the run context instead of calling `sentry_sdk.get_current_span()`.

Prevents an unhandled exception when using both `OpenAIAgentsIntegration` and `AsyncioIntegration`. The exception is caused by double exit when a span already managed by a with block is unexpectedly returned by `sentry_sdk.get_current_span()`.

Closes #5067

Author: alexander-alderman-webb

sentry_sdk/integrations/openai_agents/patches/agent_run.py

@@ -31,7 +31,8 @@ def _start_invoke_agent_span(context_wrapper, agent, kwargs):
         """Start an agent invocation span"""
         # Store the agent on the context wrapper so we can access it later
         context_wrapper._sentry_current_agent = agent
-        invoke_agent_span(context_wrapper, agent, kwargs)
+        span = invoke_agent_span(context_wrapper, agent, kwargs)
+        context_wrapper._sentry_agent_span = span
 
     def _end_invoke_agent_span(context_wrapper, agent, output=None):
         # type: (agents.RunContextWrapper, agents.Agent, Optional[Any]) -> None

sentry_sdk/integrations/openai_agents/spans/invoke_agent.py

@@ -75,7 +75,7 @@ def invoke_agent_span(context, agent, kwargs):
 
 def update_invoke_agent_span(context, agent, output):
     # type: (agents.RunContextWrapper, agents.Agent, Any) -> None
-    span = sentry_sdk.get_current_span()
+    span = getattr(context, "_sentry_agent_span", None)
 
     if span:
         if should_send_default_pii():
@@ -84,3 +84,4 @@ def update_invoke_agent_span(context, agent, output):
             )
 
         span.__exit__(None, None, None)
+        delattr(context, "_sentry_agent_span")