simplify exception cases

Author: alexander-alderman-webb

sentry_sdk/integrations/openai_agents/patches/agent_run.py

@@ -92,11 +92,6 @@ async def patched_run_single_turn(cls, *args, **kwargs):
         # Call original method with all the correct parameters
         try:
             result = await original_run_single_turn(*args, **kwargs)
-        except AgentsException:
-            # AgentsException is caught on AgentRunner.run().
-            # Exceptions are captured and agent invocation spans are explicitly finished
-            # as long as only AgentRunner.run() invokes AgentRunner._run_single_turn().
-            raise
         except Exception as exc:
             _capture_exception(exc)
 

sentry_sdk/integrations/openai_agents/patches/runner.py

@@ -38,6 +38,9 @@ async def wrapper(*args, **kwargs):
                 args = (agent, *args[1:])
                 try:
                     run_result = await original_func(*args, **kwargs)
+                except _SingleTurnException as exc:
+                    # Handled in _run_single_turn() patch.
+                    raise exc.original from None
                 except AgentsException as exc:
                     _capture_exception(exc)
 
@@ -55,9 +58,6 @@ 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