sentry-sdk 2.63.0__tar.gz → 2.64.0__tar.gz

{sentry_sdk-2.63.0/sentry_sdk.egg-info → sentry_sdk-2.64.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry-sdk
-Version: 2.63.0
+Version: 2.64.0
 Summary: Python client for Sentry (https://sentry.io)
 Home-page: https://github.com/getsentry/sentry-python
 Author: Sentry Team and Contributors

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/client.py

@@ -1,7 +1,9 @@
 import json
 import os
+import platform
 import random
 import socket
+import sys
 import uuid
 import warnings
 from collections.abc import Iterable, Mapping
@@ -241,6 +243,11 @@ def _serialized_v1_span_to_serialized_v2_span(
         if "version" in sdk_info:
             attributes["sentry.sdk.version"] = sdk_info["version"]
 
+    attributes["process.runtime.name"] = platform.python_implementation()
+    attributes["process.runtime.version"] = (
+        f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
+    )
+
     if not attributes:
         return res
 

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/consts.py

@@ -518,6 +518,12 @@ class SPANDATA:
     Example: postgresql
     """
 
+    DB_QUERY_TEXT = "db.query.text"
+    """
+    The database query being executed.
+    Example: "SELECT * FROM users WHERE id = $1"
+    """
+
     DB_SYSTEM_NAME = "db.system.name"
     """
     An identifier for the database management system (DBMS) product being used. See OpenTelemetry's list of well-known DBMS identifiers.
@@ -1014,6 +1020,12 @@ class SPANDATA:
     Example: "details"
     """
 
+    URL_PATH = "url.path"
+    """
+    The URI path component.
+    Example: "/foo"
+    """
+
     URL_QUERY = "url.query"
     """
     The query string present in the URL. Note that this does not contain the leading ? character, while the `http.query` attribute does.
@@ -1180,6 +1192,8 @@ class OP:
     COHERE_CHAT_COMPLETIONS_CREATE = "ai.chat_completions.create.cohere"
     COHERE_EMBEDDINGS_CREATE = "ai.embeddings.create.cohere"
     DB = "db"
+    DB_CURSOR_ITERATOR = "db.cursor.iter"
+    DB_CURSOR_FETCH = "db.cursor.fetch"
     DB_REDIS = "db.redis"
     EVENT_DJANGO = "event.django"
     FUNCTION = "function"
@@ -1320,7 +1334,7 @@ class ClientConstructor:
         before_send_metric: "Optional[Callable[[Metric, Hint], Optional[Metric]]]" = None,
         org_id: "Optional[str]" = None,
         strict_trace_continuation: bool = False,
-        stream_gen_ai_spans: bool = False,
+        stream_gen_ai_spans: bool = True,
     ) -> None:
         """Initialize the Sentry SDK with the given parameters. All parameters described here can be used in a call to `sentry_sdk.init()`.
 
@@ -1765,4 +1779,4 @@ DEFAULT_OPTIONS = _get_default_options()
 del _get_default_options
 
 
-VERSION = "2.63.0"
+VERSION = "2.64.0"

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/_asgi_common.py

@@ -1,4 +1,5 @@
 import urllib
+from enum import Enum
 from typing import TYPE_CHECKING
 
 from sentry_sdk.integrations._wsgi_common import _filter_headers
@@ -12,6 +13,11 @@ if TYPE_CHECKING:
     from sentry_sdk.utils import AnnotatedValue
 
 
+class _RootPathInPath(Enum):
+    EXCLUDED = "excluded"
+    EITHER = "either"
+
+
 def _get_headers(asgi_scope: "Any") -> "Dict[str, str]":
     """
     Extract headers from the ASGI scope, in the format that the Sentry protocol expects.
@@ -28,10 +34,27 @@ def _get_headers(asgi_scope: "Any") -> "Dict[str, str]":
     return headers
 
 
+def _get_path(
+    asgi_scope: "Dict[str, Any]", root_path_in_path: "_RootPathInPath"
+) -> "str":
+    if root_path_in_path is _RootPathInPath.EXCLUDED:
+        return asgi_scope.get("root_path", "") + asgi_scope.get("path", "")
+
+    # Inverse of https://github.com/Kludex/starlette/blob/de970d7b3facb853eb7ad077decbf3d94f2aab6c/starlette/_utils.py#L96
+    path = asgi_scope["path"]
+    root_path = asgi_scope.get("root_path", "")
+
+    if not root_path or path == root_path or path.startswith(root_path + "/"):
+        return path
+
+    return root_path + path
+
+
 def _get_url(
     asgi_scope: "Dict[str, Any]",
     default_scheme: "Literal['ws', 'http']",
     host: "Optional[Union[AnnotatedValue, str]]",
+    path: str,
 ) -> str:
     """
     Extract URL from the ASGI scope, without also including the querystring.
@@ -39,7 +62,6 @@ def _get_url(
     scheme = asgi_scope.get("scheme", default_scheme)
 
     server = asgi_scope.get("server", None)
-    path = asgi_scope.get("root_path", "") + asgi_scope.get("path", "")
 
     if host:
         return "%s://%s%s" % (scheme, host, path)
@@ -81,7 +103,10 @@ def _get_ip(asgi_scope: "Any") -> str:
     return asgi_scope.get("client")[0]
 
 
-def _get_request_data(asgi_scope: "Any") -> "Dict[str, Any]":
+def _get_request_data(
+    asgi_scope: "Any",
+    root_path_in_path: "_RootPathInPath",
+) -> "Dict[str, Any]":
     """
     Returns data related to the HTTP request from the ASGI scope.
     """
@@ -96,7 +121,10 @@ def _get_request_data(asgi_scope: "Any") -> "Dict[str, Any]":
         request_data["query_string"] = _get_query(asgi_scope)
 
         request_data["url"] = _get_url(
-            asgi_scope, "http" if ty == "http" else "ws", headers.get("host")
+            asgi_scope,
+            "http" if ty == "http" else "ws",
+            headers.get("host"),
+            path=_get_path(asgi_scope=asgi_scope, root_path_in_path=root_path_in_path),
         )
 
     client = asgi_scope.get("client")
@@ -106,7 +134,10 @@ def _get_request_data(asgi_scope: "Any") -> "Dict[str, Any]":
     return request_data
 
 
-def _get_request_attributes(asgi_scope: "Any") -> "dict[str, Any]":
+def _get_request_attributes(
+    asgi_scope: "Any",
+    root_path_in_path: "_RootPathInPath",
+) -> "dict[str, Any]":
     """
     Return attributes related to the HTTP request from the ASGI scope.
     """
@@ -126,8 +157,14 @@ def _get_request_attributes(asgi_scope: "Any") -> "dict[str, Any]":
             if query:
                 attributes["http.query"] = query
 
+            path = _get_path(asgi_scope=asgi_scope, root_path_in_path=root_path_in_path)
+            attributes["url.path"] = path
+
             url_without_query_string = _get_url(
-                asgi_scope, "http" if ty == "http" else "ws", headers.get("host")
+                asgi_scope,
+                "http" if ty == "http" else "ws",
+                headers.get("host"),
+                path=path,
             )
             query_string = _get_query(asgi_scope)
             attributes["url.full"] = (

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/aiohttp.py

@@ -159,11 +159,17 @@ class AioHttpIntegration(Integration):
                                 header_value
                             )
 
-                        url_query_attribute = (
-                            {"url.query": request.query_string}
-                            if request.query_string
-                            else {}
-                        )
+                        url_attributes = {}
+                        if should_send_default_pii():
+                            url_attributes["url.full"] = "%s://%s%s" % (
+                                request.scheme,
+                                request.host,
+                                request.path,
+                            )
+                            url_attributes["url.path"] = request.path
+
+                            if request.query_string:
+                                url_attributes["url.query"] = request.query_string
 
                         client_address_attributes = {}
                         if should_send_default_pii() and request.remote:
@@ -180,10 +186,8 @@ class AioHttpIntegration(Integration):
                                 "sentry.op": OP.HTTP_SERVER,
                                 "sentry.origin": AioHttpIntegration.origin,
                                 "sentry.span.source": SegmentSource.ROUTE.value,
-                                "url.full": "%s://%s%s"
-                                % (request.scheme, request.host, request.path),
                                 "http.request.method": request.method,
-                                **url_query_attribute,
+                                **url_attributes,
                                 **client_address_attributes,
                                 **header_attributes,
                             },
@@ -354,8 +358,10 @@ def create_trace_config() -> "TraceConfig":
                 "sentry.origin": AioHttpIntegration.origin,
                 "http.request.method": method,
             }
-            if parsed_url is not None:
+            if parsed_url is not None and should_send_default_pii():
                 attributes["url.full"] = parsed_url.url
+                attributes["url.path"] = params.url.path
+
                 if parsed_url.query:
                     attributes["url.query"] = parsed_url.query
                 if parsed_url.fragment:

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/asgi.py

@@ -16,9 +16,11 @@ from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations._asgi_common import (
     _get_headers,
     _get_ip,
+    _get_path,
     _get_request_attributes,
     _get_request_data,
     _get_url,
+    _RootPathInPath,
 )
 from sentry_sdk.integrations._wsgi_common import (
     DEFAULT_HTTP_METHODS_TO_CAPTURE,
@@ -105,6 +107,7 @@ class SentryAsgiMiddleware:
         "mechanism_type",
         "span_origin",
         "http_methods_to_capture",
+        "root_path_in_path",
     )
 
     def __init__(
@@ -116,6 +119,7 @@ class SentryAsgiMiddleware:
         span_origin: str = "manual",
         http_methods_to_capture: "Tuple[str, ...]" = DEFAULT_HTTP_METHODS_TO_CAPTURE,
         asgi_version: "Optional[int]" = None,
+        root_path_in_path: "_RootPathInPath" = _RootPathInPath.EXCLUDED,
     ) -> None:
         """
         Instrument an ASGI application with Sentry. Provides HTTP/websocket
@@ -152,6 +156,7 @@ class SentryAsgiMiddleware:
         self.span_origin = span_origin
         self.app = app
         self.http_methods_to_capture = http_methods_to_capture
+        self.root_path_in_path = root_path_in_path
 
         if asgi_version is None:
             if _looks_like_asgi3(app):
@@ -319,7 +324,8 @@ class SentryAsgiMiddleware:
                     with span_ctx as span:
                         if isinstance(span, StreamedSpan):
                             for attribute, value in _get_request_attributes(
-                                scope
+                                scope,
+                                root_path_in_path=self.root_path_in_path,
                             ).items():
                                 span.set_attribute(attribute, value)
 
@@ -401,7 +407,9 @@ class SentryAsgiMiddleware:
         self, event: "Event", hint: "Hint", asgi_scope: "Any"
     ) -> "Optional[Event]":
         request_data = event.get("request", {})
-        request_data.update(_get_request_data(asgi_scope))
+        request_data.update(
+            _get_request_data(asgi_scope, root_path_in_path=self.root_path_in_path)
+        )
         event["request"] = deepcopy(request_data)
 
         # Only set transaction name if not already set by Starlette or FastAPI (or other frameworks)
@@ -447,7 +455,14 @@ class SentryAsgiMiddleware:
             if endpoint:
                 name = transaction_from_function(endpoint) or ""
             else:
-                name = _get_url(asgi_scope, "http" if ty == "http" else "ws", host=None)
+                name = _get_url(
+                    asgi_scope,
+                    "http" if ty == "http" else "ws",
+                    host=None,
+                    path=_get_path(
+                        asgi_scope=asgi_scope, root_path_in_path=self.root_path_in_path
+                    ),
+                )
                 source = TransactionSource.URL
 
         elif transaction_style == "url":
@@ -459,7 +474,14 @@ class SentryAsgiMiddleware:
                 if path is not None:
                     name = path
             else:
-                name = _get_url(asgi_scope, "http" if ty == "http" else "ws", host=None)
+                name = _get_url(
+                    asgi_scope,
+                    "http" if ty == "http" else "ws",
+                    host=None,
+                    path=_get_path(
+                        asgi_scope=asgi_scope, root_path_in_path=self.root_path_in_path
+                    ),
+                )
                 source = TransactionSource.URL
 
         if name is None:
@@ -484,7 +506,14 @@ class SentryAsgiMiddleware:
             if endpoint:
                 name = qualname_from_function(endpoint) or ""
             else:
-                name = _get_url(asgi_scope, "http" if ty == "http" else "ws", host=None)
+                name = _get_url(
+                    asgi_scope,
+                    "http" if ty == "http" else "ws",
+                    host=None,
+                    path=_get_path(
+                        asgi_scope=asgi_scope, root_path_in_path=self.root_path_in_path
+                    ),
+                )
                 source = SegmentSource.URL.value
 
         elif segment_style == "url":
@@ -496,7 +525,14 @@ class SentryAsgiMiddleware:
                 if path is not None:
                     name = path
             else:
-                name = _get_url(asgi_scope, "http" if ty == "http" else "ws", host=None)
+                name = _get_url(
+                    asgi_scope,
+                    "http" if ty == "http" else "ws",
+                    host=None,
+                    path=_get_path(
+                        asgi_scope=asgi_scope, root_path_in_path=self.root_path_in_path
+                    ),
+                )
                 source = SegmentSource.URL.value
 
         if name is None:

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/asyncpg.py

@@ -20,8 +20,12 @@ from sentry_sdk.utils import (
 )
 
 try:
-    import asyncpg  # type: ignore[import-not-found]
-    from asyncpg.cursor import BaseCursor  # type: ignore
+    import asyncpg  # type: ignore
+    from asyncpg.cursor import (  # type: ignore
+        BaseCursor,
+        Cursor,
+        CursorIterator,
+    )
 
 except ImportError:
     raise DidNotEnable("asyncpg not installed.")
@@ -169,6 +173,13 @@ def _wrap_cursor_method(
             return await f(*args, **kwargs)
 
         cursor = args[0]
+        if type(cursor) is CursorIterator:
+            span_op_override_value = OP.DB_CURSOR_ITERATOR
+        elif type(cursor) is Cursor:
+            span_op_override_value = OP.DB_CURSOR_FETCH
+        else:
+            span_op_override_value = None
+
         query = _normalize_query(cursor._query)
         with record_sql_queries(
             cursor=cursor,
@@ -178,6 +189,7 @@ def _wrap_cursor_method(
             executemany=False,
             record_cursor_repr=True,
             span_origin=AsyncPGIntegration.origin,
+            span_op_override_value=span_op_override_value,
         ) as span:
             _set_db_data(span, cursor._connection)
             res = await f(*args, **kwargs)

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/boto3.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version
+from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.traces import StreamedSpan
 from sentry_sdk.tracing import Span
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
@@ -74,7 +75,7 @@ def _sentry_request_created(
                 SPANDATA.RPC_METHOD: f"{service_id}/{operation_name}",
             },
         )
-        if request.url is not None:
+        if request.url is not None and should_send_default_pii():
             with capture_internal_exceptions():
                 parsed_url = parse_url(request.url, sanitize=False)
                 span.set_attribute(SPANDATA.URL_FULL, parsed_url.url)

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/clickhouse_driver.py

@@ -90,6 +90,7 @@ def _wrap_start(f: "Callable[P, T]") -> "Callable[P, T]":
                 attributes={
                     "sentry.op": OP.DB,
                     "sentry.origin": ClickhouseDriverIntegration.origin,
+                    SPANDATA.DB_QUERY_TEXT: str(query),
                 },
             )
         else:

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/executing.py

@@ -11,7 +11,7 @@ if TYPE_CHECKING:
     from sentry_sdk._types import Event, Hint
 
 try:
-    import executing
+    from executing import Source
 except ImportError:
     raise DidNotEnable("executing is not installed")
 
@@ -60,7 +60,7 @@ class ExecutingIntegration(Integration):
 
                 for sentry_frame, tb in zip(sentry_frames, tbs):
                     frame = tb.tb_frame
-                    source = executing.Source.for_frame(frame)
+                    source = Source.for_frame(frame)
                     sentry_frame["function"] = source.code_qualname(frame.f_code)
 
             return event

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/httpx.py

@@ -3,6 +3,7 @@ from typing import TYPE_CHECKING
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.tracing import BAGGAGE_HEADER_NAME
 from sentry_sdk.tracing_utils import (
     add_http_request_source,
@@ -73,7 +74,7 @@ def _install_httpx_client() -> None:
             ) as streamed_span:
                 attributes: "Attributes" = {}
 
-                if parsed_url is not None:
+                if parsed_url is not None and should_send_default_pii():
                     attributes["url.full"] = parsed_url.url
                     if parsed_url.query:
                         attributes["url.query"] = parsed_url.query
@@ -183,7 +184,7 @@ def _install_httpx_async_client() -> None:
             ) as streamed_span:
                 attributes: "Attributes" = {}
 
-                if parsed_url is not None:
+                if parsed_url is not None and should_send_default_pii():
                     attributes["url.full"] = parsed_url.url
                     if parsed_url.query:
                         attributes["url.query"] = parsed_url.query

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/httpx2.py

@@ -3,6 +3,7 @@ from typing import TYPE_CHECKING
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration
+from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.tracing import BAGGAGE_HEADER_NAME
 from sentry_sdk.tracing_utils import (
     add_http_request_source,
@@ -73,7 +74,7 @@ def _install_httpx2_client() -> None:
             ) as streamed_span:
                 attributes: "Attributes" = {}
 
-                if parsed_url is not None:
+                if parsed_url is not None and should_send_default_pii():
                     attributes["url.full"] = parsed_url.url
                     if parsed_url.query:
                         attributes["url.query"] = parsed_url.query
@@ -183,7 +184,7 @@ def _install_httpx2_async_client() -> None:
             ) as streamed_span:
                 attributes: "Attributes" = {}
 
-                if parsed_url is not None:
+                if parsed_url is not None and should_send_default_pii():
                     attributes["url.full"] = parsed_url.url
                     if parsed_url.query:
                         attributes["url.query"] = parsed_url.query

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/langchain.py

@@ -210,6 +210,8 @@ class LangchainIntegration(Integration):
     identifier = "langchain"
     origin = f"auto.ai.{identifier}"
 
+    _ignored_exceptions: "set[type[Exception]]" = set()
+
     def __init__(
         self: "LangchainIntegration",
         include_prompts: bool = True,
@@ -262,17 +264,22 @@ class SentryLangchainCallback(BaseCallbackHandler):  # type: ignore[misc]
                 self._exit_span(span, run_id)
 
     def _handle_error(self, run_id: "UUID", error: "Any") -> None:
+        is_ignored = isinstance(error, tuple(LangchainIntegration._ignored_exceptions))
+
         with capture_internal_exceptions():
             if not run_id or run_id not in self.span_map:
                 return
 
             span = self.span_map[run_id]
 
-            sentry_sdk.capture_exception(
-                error, span._scope if isinstance(span, StreamedSpan) else span.scope
-            )
+            if is_ignored:
+                span.__exit__(None, None, None)
+            else:
+                sentry_sdk.capture_exception(
+                    error, span._scope if isinstance(span, StreamedSpan) else span.scope
+                )
+                span.__exit__(type(error), error, error.__traceback__)
 
-            span.__exit__(type(error), error, error.__traceback__)
             del self.span_map[run_id]
 
     def _normalize_langchain_message(self, message: "BaseMessage") -> "Any":

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/langgraph.py

@@ -10,6 +10,9 @@ from sentry_sdk.ai.utils import (
 )
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable, Integration
+
+# This is fine because langgraph depends on langchain-base, and LangchainIntegration only imports from langchain-base.
+from sentry_sdk.integrations.langchain import LangchainIntegration
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.traces import StreamedSpan
 from sentry_sdk.tracing_utils import (
@@ -19,6 +22,7 @@ from sentry_sdk.tracing_utils import (
 from sentry_sdk.utils import safe_serialize
 
 try:
+    from langgraph.errors import GraphBubbleUp
     from langgraph.graph import StateGraph
     from langgraph.pregel import Pregel
 except ImportError:
@@ -34,6 +38,7 @@ class LanggraphIntegration(Integration):
 
     @staticmethod
     def setup_once() -> None:
+        LangchainIntegration._ignored_exceptions.add(GraphBubbleUp)
         # LangGraph lets users create agents using a StateGraph or the Functional API.
         # StateGraphs are then compiled to a CompiledStateGraph. Both CompiledStateGraph and
         # the functional API execute on a Pregel instance. Pregel is the runtime for the graph

{sentry_sdk-2.63.0 → sentry_sdk-2.64.0}/sentry_sdk/integrations/litellm.py

@@ -31,16 +31,21 @@ except ImportError:
     raise DidNotEnable("LiteLLM not installed")
 
 
-def _get_metadata_dict(kwargs: "Dict[str, Any]") -> "Dict[str, Any]":
-    """Get the metadata dictionary from the kwargs."""
-    litellm_params = kwargs.setdefault("litellm_params", {})
+# Stash the span on a top-level key of the per-request kwargs dict litellm passes
+# to every callback, so it lives and dies with the request.
+_SPAN_KEY = "_sentry_span"
 
-    # we need this weird little dance, as metadata might be set but may be None initially
-    metadata = litellm_params.get("metadata")
-    if metadata is None:
-        metadata = {}
-        litellm_params["metadata"] = metadata
-    return metadata
+
+def _store_span(kwargs: "Dict[str, Any]", span: "Any") -> None:
+    kwargs[_SPAN_KEY] = span
+
+
+def _peek_span(kwargs: "Dict[str, Any]") -> "Any":
+    return kwargs.get(_SPAN_KEY)
+
+
+def _pop_span(kwargs: "Dict[str, Any]") -> "Any":
+    return kwargs.pop(_SPAN_KEY, None)
 
 
 def _convert_message_parts(messages: "List[Dict[str, Any]]") -> "List[Dict[str, Any]]":
@@ -117,8 +122,7 @@ def _input_callback(kwargs: "Dict[str, Any]") -> None:
         )
         span.__enter__()
 
-    # Store span for later
-    _get_metadata_dict(kwargs)["_sentry_span"] = span
+    _store_span(kwargs, span)
 
     # Set basic data
     set_data_normalized(span, SPANDATA.GEN_AI_SYSTEM, provider)
@@ -198,8 +202,7 @@ def _success_callback(
 ) -> None:
     """Handle successful completion."""
 
-    metadata = _get_metadata_dict(kwargs)
-    span = metadata.get("_sentry_span")
+    span = _peek_span(kwargs)
     if span is None:
         return
 
@@ -259,7 +262,7 @@ def _success_callback(
             or "complete_streaming_response" in kwargs
             or "async_complete_streaming_response" in kwargs
         ):
-            span = metadata.pop("_sentry_span", None)
+            span = _pop_span(kwargs)
             if span is not None:
                 span.__exit__(None, None, None)
 
@@ -285,7 +288,7 @@ def _failure_callback(
     end_time: "datetime",
 ) -> None:
     """Handle request failure."""
-    span = _get_metadata_dict(kwargs).get("_sentry_span")
+    span = _pop_span(kwargs)
     if span is None:
         return