deduplicate

Author: alexander-alderman-webb

sentry_sdk/integrations/openai_agents/patches/error_tracing.py

@@ -3,6 +3,7 @@
 import sentry_sdk
 from sentry_sdk.consts import SPANSTATUS
 from sentry_sdk.tracing_utils import set_span_errored
+from ..utils import _record_exception_on_span
 
 from typing import TYPE_CHECKING
 
@@ -58,16 +59,7 @@ def sentry_attach_error_to_current_span(error, *args, **kwargs):
         # Set the current Sentry span to errored
         current_span = sentry_sdk.get_current_span()
         if current_span is not None:
-            set_span_errored(current_span)
-            current_span.set_data("span.status", "error")
-
-            # Optionally capture the error details if we have them
-            if hasattr(error, "__class__"):
-                current_span.set_data("error.type", error.__class__.__name__)
-            if hasattr(error, "__str__"):
-                error_message = str(error)
-                if error_message:
-                    current_span.set_data("error.message", error_message)
+            _record_exception_on_span(current_span, error)
 
         # Call the original function
         return original_attach_error(error, *args, **kwargs)

sentry_sdk/integrations/openai_agents/utils.py

@@ -14,7 +14,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Any, Optional
+    from typing import Any
     from agents import Usage
 
     from sentry_sdk.tracing import Span
@@ -39,18 +39,17 @@ def _capture_exception(exc):
 
 
 def _record_exception_on_span(span, error):
-    # type: (Optional[Span], Exception) -> Any
-    if span is not None:
-        set_span_errored(span)
-        span.set_data("span.status", "error")
-
-        # Optionally capture the error details if we have them
-        if hasattr(error, "__class__"):
-            span.set_data("error.type", error.__class__.__name__)
-        if hasattr(error, "__str__"):
-            error_message = str(error)
-            if error_message:
-                span.set_data("error.message", error_message)
+    # type: (Span, Exception) -> Any
+    set_span_errored(span)
+    span.set_data("span.status", "error")
+
+    # Optionally capture the error details if we have them
+    if hasattr(error, "__class__"):
+        span.set_data("error.type", error.__class__.__name__)
+    if hasattr(error, "__str__"):
+        error_message = str(error)
+        if error_message:
+            span.set_data("error.message", error_message)
 
 
 def _set_agent_data(span, agent):