Make sure the span an error occures in is captured

Author: antonpirker

sentry_sdk/integrations/openai.py

@@ -74,6 +74,12 @@ def count_tokens(self, s):
 
 def _capture_exception(exc):
     # type: (Any) -> None
+    # Close an eventually open span
+    # We need to do this by hand because we are not using the start_span context manager
+    current_span = sentry_sdk.get_current_span()
+    if current_span is not None:
+        current_span.__exit__(None, None, None)
+
     event, hint = event_from_exception(
         exc,
         client_options=sentry_sdk.get_client().options,

tests/integrations/openai/test_openai.py

@@ -1062,9 +1062,14 @@ def test_error_in_responses_api(sentry_init, capture_events):
             )
 
     (error_event, transaction_event) = events
+
+    assert transaction_event["type"] == "transaction"
+    # make sure the span where the error occurred is captured
+    assert transaction_event["spans"][0]["op"] == "gen_ai.responses"
+
     assert error_event["level"] == "error"
     assert error_event["exception"]["values"][0]["type"] == "OpenAIError"
-    assert transaction_event["type"] == "transaction"
+
     assert (
         error_event["contexts"]["trace"]["trace_id"]
         == transaction_event["contexts"]["trace"]["trace_id"]