Merge branch 'webb/litellm/close-spans' into webb/litellm/remove-mocks

Author: alexander-alderman-webb

sentry_sdk/integrations/litellm.py

@@ -178,7 +178,8 @@ def _success_callback(
 ) -> None:
     """Handle successful completion."""
 
-    span = _get_metadata_dict(kwargs).get("_sentry_span")
+    metadata = _get_metadata_dict(kwargs)
+    span = metadata.get("_sentry_span")
     if span is None:
         return
 
@@ -234,7 +235,9 @@ def _success_callback(
         # Callback is fired multiple times when streaming a response.
         # Streaming flag checked at https://github.com/BerriAI/litellm/blob/33c3f13443eaf990ac8c6e3da78bddbc2b7d0e7a/litellm/litellm_core_utils/litellm_logging.py#L1603
         if is_streaming is not True or "complete_streaming_response" in kwargs:
-            span.__exit__(None, None, None)
+            span = metadata.pop("_sentry_span", None)
+            if span is not None:
+                span.__exit__(None, None, None)
 
 
 def _failure_callback(