capture all exceptions again

Author: alexander-alderman-webb

sentry_sdk/integrations/openai_agents/patches/agent_run.py

@@ -8,7 +8,7 @@
     end_invoke_agent_span,
     handoff_span,
 )
-from ..utils import _capture_exception, _record_exception_on_span
+from ..utils import _capture_exception, _record_exception_on_span, _SingleTurnException
 
 from typing import TYPE_CHECKING
 
@@ -103,7 +103,7 @@ async def patched_run_single_turn(cls, *args, **kwargs):
                 _record_exception_on_span(span, exc)
                 end_invoke_agent_span(context_wrapper, agent)
 
-            raise exc from None
+            raise _SingleTurnException(exc)
 
         return result
 

sentry_sdk/integrations/openai_agents/patches/runner.py

@@ -4,7 +4,7 @@
 from sentry_sdk.integrations import DidNotEnable
 
 from ..spans import agent_workflow_span, end_invoke_agent_span
-from ..utils import _capture_exception, _record_exception_on_span
+from ..utils import _capture_exception, _record_exception_on_span, _SingleTurnException
 
 try:
     from agents.exceptions import AgentsException
@@ -53,6 +53,15 @@ async def wrapper(*args, **kwargs):
                             end_invoke_agent_span(context_wrapper, agent)
 
                     raise exc from None
+                except _SingleTurnException as exc:
+                    # Handled in _run_single_turn() patch.
+                    raise exc.original from None
+                except Exception as exc:
+                    # Invoke agent span is not finished in this case.
+                    # This is much less likely to occur than other cases because
+                    # AgentRunner.run() is "just" a while loop around _run_single_turn.
+                    _capture_exception(exc)
+                    raise exc from None
 
                 end_invoke_agent_span(run_result.context_wrapper, agent)
                 return run_result

sentry_sdk/integrations/openai_agents/utils.py

@@ -26,6 +26,11 @@
     raise DidNotEnable("OpenAI Agents not installed")
 
 
+class _SingleTurnException(Exception):
+    def __init__(self, original):
+        self.original = original
+
+
 def _capture_exception(exc):
     # type: (Any) -> None
     set_span_errored()