Merge branch 'ivana/move-http-client-breadcrumbs-1' into ivana/move-http-client-breadcrumbs-2

sentrivana · sentrivana · commit c0d7e10c9f51 · 2026-08-07T10:52:51.000+02:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -73,6 +73,7 @@ typing = [
     "pydantic>=2.13.4",
     "pydantic-ai-slim>=2.23.0",
     "langchain-core>=1.5.3",
+    "huggingface-hub>=1.26.1",
 ]
 test = [
     "dataclasses ; python_full_version < '3.7'",
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -1257,6 +1257,7 @@ class OP:
     SUBPROCESS_WAIT = "subprocess.wait"
     SUBPROCESS_COMMUNICATE = "subprocess.communicate"
     TEMPLATE_RENDER = "template.render"
+    VIEW_AUTHENTICATE = "view.authenticate"
     VIEW_RENDER = "view.render"
     VIEW_RESPONSE_RENDER = "view.response.render"
     WEBSOCKET_SERVER = "websocket.server"
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -298,6 +298,10 @@ def _patch_drf() -> None:
     DRF request object, such that we can later use either in
     `DjangoRequestExtractor`.
 
+    We also patch DRF's authentication to create a span, so that the work done
+    by the configured authentication classes (which often involves database
+    queries) doesn't show up as part of the view itself.
+
     This function is not called directly on SDK setup, because importing almost
     any part of Django Rest Framework will try to access Django settings (where
     `sentry_sdk.init()` might be called from in the first place). Instead we
@@ -339,6 +343,43 @@ def sentry_patched_drf_initial(
 
                 APIView.initial = sentry_patched_drf_initial
 
+        with capture_internal_exceptions():
+            try:
+                from rest_framework.request import Request  # type: ignore
+            except ImportError:
+                pass
+            else:
+                old_drf_authenticate = Request._authenticate
+
+                def sentry_patched_drf_authenticate(self: "Request") -> "Any":
+                    client = sentry_sdk.get_client()
+                    integration = client.get_integration(DjangoIntegration)
+                    # Nothing to time if there are no authenticators configured
+                    # for this view.
+                    if integration is None or not getattr(self, "authenticators", None):
+                        return old_drf_authenticate(self)
+
+                    if has_span_streaming_enabled(client.options):
+                        if sentry_sdk.traces.get_current_span() is None:
+                            return old_drf_authenticate(self)
+                        with sentry_sdk.traces.start_span(
+                            name="authenticate",
+                            attributes={
+                                "sentry.op": OP.VIEW_AUTHENTICATE,
+                                "sentry.origin": DjangoIntegration.origin,
+                            },
+                        ):
+                            return old_drf_authenticate(self)
+                    else:
+                        with sentry_sdk.start_span(
+                            op=OP.VIEW_AUTHENTICATE,
+                            name="authenticate",
+                            origin=DjangoIntegration.origin,
+                        ):
+                            return old_drf_authenticate(self)
+
+                Request._authenticate = sentry_patched_drf_authenticate
+
 
 def _patch_channels() -> None:
     try:
diff --git a/sentry_sdk/integrations/huggingface_hub.py b/sentry_sdk/integrations/huggingface_hub.py
@@ -1,7 +1,7 @@
 import inspect
 import sys
 from functools import wraps
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 
 import sentry_sdk
 from sentry_sdk.ai.monitoring import record_token_usage
@@ -24,6 +24,10 @@
 if TYPE_CHECKING:
     from typing import Any, Callable, Iterable, Union
 
+    from huggingface_hub import (
+        ChatCompletionStreamOutput,
+    )
+
     from sentry_sdk.tracing import Span
 
 try:
@@ -44,13 +48,13 @@ def __init__(
     @staticmethod
     def setup_once() -> None:
         # Other tasks that can be called: https://huggingface.co/docs/huggingface_hub/guides/inference#supported-providers-and-tasks
-        huggingface_hub.inference._client.InferenceClient.text_generation = (
+        huggingface_hub.inference._client.InferenceClient.text_generation = (  # type: ignore[method-assign]
             _wrap_huggingface_task(
                 huggingface_hub.inference._client.InferenceClient.text_generation,
                 OP.GEN_AI_TEXT_COMPLETION,
             )
         )
-        huggingface_hub.inference._client.InferenceClient.chat_completion = (
+        huggingface_hub.inference._client.InferenceClient.chat_completion = (  # type: ignore[method-assign]
             _wrap_huggingface_task(
                 huggingface_hub.inference._client.InferenceClient.chat_completion,
                 OP.GEN_AI_CHAT,
@@ -302,15 +306,15 @@ def new_details_iterator() -> "Iterable[Any]":
 
             else:
                 # chat-completion stream output
-                def new_iterator() -> "Iterable[str]":
+                def new_iterator() -> "Iterable[ChatCompletionStreamOutput]":
                     finish_reason = None
                     response_model = None
                     response_text_buffer: "list[str]" = []
                     tool_calls = None
                     usage = None
 
                     with capture_internal_exceptions():
-                        for chunk in res:
+                        for chunk in cast("Iterable[ChatCompletionStreamOutput]", res):
                             if hasattr(chunk, "model") and chunk.model is not None:
                                 response_model = chunk.model
 
diff --git a/sentry_sdk/integrations/mcp.py b/sentry_sdk/integrations/mcp.py
@@ -22,14 +22,14 @@
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from sentry_sdk.utils import nullcontext, package_version, safe_serialize
 
-MCP_PACKAGE_VERSION = package_version("mcp")
-
 try:
     from mcp.server.lowlevel import Server
     from mcp.server.streamable_http import (
         StreamableHTTPServerTransport,
     )
 
+    MCP_PACKAGE_VERSION = package_version("mcp")
+
     if MCP_PACKAGE_VERSION and MCP_PACKAGE_VERSION < (2, 0, 0):
         from mcp.server.lowlevel.server import (  # type: ignore[attr-defined]
             request_ctx,
diff --git a/sentry_sdk/integrations/redis/_async_common.py b/sentry_sdk/integrations/redis/_async_common.py
@@ -45,6 +45,16 @@ async def _sentry_execute(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
         if client.get_integration(RedisIntegration) is None:
             return await old_execute(self, *args, **kwargs)
 
+        sentry_sdk.add_breadcrumb(
+            message="redis.pipeline.execute",
+            type="redis",
+            category="redis",
+            data={
+                "redis.is_cluster": is_cluster,
+                "redis.transaction": False if is_cluster else self.is_transaction,
+            },
+        )
+
         span_streaming = has_span_streaming_enabled(client.options)
 
         span: "Union[Span, StreamedSpan]"
@@ -84,20 +94,7 @@ async def _sentry_execute(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
                     command_seq,
                 )
 
-            rv = await old_execute(self, *args, **kwargs)
-
-        with capture_internal_exceptions():
-            sentry_sdk.add_breadcrumb(
-                message="redis.pipeline.execute",
-                type="redis",
-                category="redis",
-                data={
-                    "redis.is_cluster": is_cluster,
-                    "redis.transaction": False if is_cluster else self.is_transaction,
-                },
-            )
-
-        return rv
+            return await old_execute(self, *args, **kwargs)
 
     pipeline_cls.execute = _sentry_execute  # type: ignore
 
@@ -119,6 +116,24 @@ async def _sentry_execute_command(
         if integration is None:
             return await old_execute_command(self, name, *args, **kwargs)
 
+        db_properties = _compile_db_span_properties(integration, name, args)
+
+        breadcrumb_data = {
+            "redis.is_cluster": is_cluster,
+            "redis.command": name,
+            "db.operation": name,
+        }
+        key = _extract_key(name, args)
+        if key is not None:
+            breadcrumb_data["redis.key"] = key
+
+        sentry_sdk.add_breadcrumb(
+            message=db_properties["description"],
+            type="redis",
+            category="redis",
+            data=breadcrumb_data,
+        )
+
         span_streaming = has_span_streaming_enabled(client.options)
 
         if span_streaming and sentry_sdk.traces.get_current_span() is None:
@@ -156,8 +171,6 @@ async def _sentry_execute_command(
                 )
             cache_span.__enter__()
 
-        db_properties = _compile_db_span_properties(integration, name, args)
-
         additional_db_span_attributes = {}
         with capture_internal_exceptions():
             additional_db_span_attributes[SPANDATA.DB_QUERY_TEXT] = _get_safe_command(
@@ -193,23 +206,6 @@ async def _sentry_execute_command(
             _set_cache_data(cache_span, self, cache_properties, value)
             cache_span.__exit__(None, None, None)
 
-        with capture_internal_exceptions():
-            data = {
-                "redis.is_cluster": is_cluster,
-                "redis.command": name,
-                "db.operation": name,
-            }
-            key = _extract_key(name, args)
-            if key is not None:
-                data["redis.key"] = key
-
-            sentry_sdk.add_breadcrumb(
-                message=db_properties["description"],
-                type="redis",
-                category="redis",
-                data=data,
-            )
-
         return value
 
     cls.execute_command = _sentry_execute_command  # type: ignore
diff --git a/sentry_sdk/integrations/redis/_sync_common.py b/sentry_sdk/integrations/redis/_sync_common.py
@@ -42,8 +42,17 @@ def sentry_patched_execute(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
         if client.get_integration(RedisIntegration) is None:
             return old_execute(self, *args, **kwargs)
 
-        span_streaming = has_span_streaming_enabled(client.options)
+        sentry_sdk.add_breadcrumb(
+            message="redis.pipeline.execute",
+            type="redis",
+            category="redis",
+            data={
+                "redis.is_cluster": is_cluster,
+                "redis.transaction": False if is_cluster else self.transaction,
+            },
+        )
 
+        span_streaming = has_span_streaming_enabled(client.options)
         span: "Union[Span, StreamedSpan]"
         if span_streaming:
             if sentry_sdk.traces.get_current_span() is None:
@@ -79,20 +88,7 @@ def sentry_patched_execute(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
                     command_seq,
                 )
 
-            rv = old_execute(self, *args, **kwargs)
-
-        with capture_internal_exceptions():
-            sentry_sdk.add_breadcrumb(
-                message="redis.pipeline.execute",
-                type="redis",
-                category="redis",
-                data={
-                    "redis.is_cluster": is_cluster,
-                    "redis.transaction": False if is_cluster else self.transaction,
-                },
-            )
-
-        return rv
+            return old_execute(self, *args, **kwargs)
 
     pipeline_cls.execute = sentry_patched_execute
 
@@ -118,6 +114,24 @@ def sentry_patched_execute_command(
         if integration is None:
             return old_execute_command(self, name, *args, **kwargs)
 
+        db_properties = _compile_db_span_properties(integration, name, args)
+
+        breadcrumb_data = {
+            "redis.is_cluster": is_cluster,
+            "redis.command": name,
+            "db.operation": name,
+        }
+        key = _extract_key(name, args)
+        if key is not None:
+            breadcrumb_data["redis.key"] = key
+
+        sentry_sdk.add_breadcrumb(
+            message=db_properties["description"],
+            type="redis",
+            category="redis",
+            data=breadcrumb_data,
+        )
+
         span_streaming = has_span_streaming_enabled(client.options)
 
         if span_streaming and sentry_sdk.traces.get_current_span() is None:
@@ -155,8 +169,6 @@ def sentry_patched_execute_command(
                 )
             cache_span.__enter__()
 
-        db_properties = _compile_db_span_properties(integration, name, args)
-
         additional_db_span_attributes = {}
         with capture_internal_exceptions():
             additional_db_span_attributes[SPANDATA.DB_QUERY_TEXT] = _get_safe_command(
@@ -192,23 +204,6 @@ def sentry_patched_execute_command(
             _set_cache_data(cache_span, self, cache_properties, value)
             cache_span.__exit__(None, None, None)
 
-        with capture_internal_exceptions():
-            data = {
-                "redis.is_cluster": is_cluster,
-                "redis.command": name,
-                "db.operation": name,
-            }
-            key = _extract_key(name, args)
-            if key is not None:
-                data["redis.key"] = key
-
-            sentry_sdk.add_breadcrumb(
-                message=db_properties["description"],
-                type="redis",
-                category="redis",
-                data=data,
-            )
-
         return value
 
     cls.execute_command = sentry_patched_execute_command
diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py
@@ -323,6 +323,13 @@ def sentry_patched_popen_init(
 
         env = None
 
+        sentry_sdk.add_breadcrumb(
+            type="subprocess",
+            category="subprocess",
+            message=description,
+            data={"subprocess.cwd": cwd} if cwd else {},
+        )
+
         span_streaming = has_span_streaming_enabled(sentry_sdk.get_client().options)
         span: "Union[Span, StreamedSpan]"
         if span_streaming:
@@ -367,15 +374,6 @@ def sentry_patched_popen_init(
             else:
                 span.set_tag("subprocess.pid", self.pid)
 
-            with capture_internal_exceptions():
-                breadcrumb_data = {"subprocess.cwd": cwd} if cwd else {}
-                sentry_sdk.add_breadcrumb(
-                    type="subprocess",
-                    category="subprocess",
-                    message=description,
-                    data=breadcrumb_data,
-                )
-
             return rv
 
     subprocess.Popen.__init__ = sentry_patched_popen_init  # type: ignore
diff --git a/tests/integrations/django/myapp/urls.py b/tests/integrations/django/myapp/urls.py
@@ -150,6 +150,20 @@ def path(path, *args, **kwargs):
         )
     )
     urlpatterns.append(path("rest-hello", views.rest_hello, name="rest_hello"))
+    urlpatterns.append(
+        path(
+            "rest-authenticated-hello",
+            views.rest_authenticated_hello,
+            name="rest_authenticated_hello",
+        )
+    )
+    urlpatterns.append(
+        path(
+            "rest-unauthenticated-hello",
+            views.rest_unauthenticated_hello,
+            name="rest_unauthenticated_hello",
+        )
+    )
     urlpatterns.append(
         path("rest-json-response", views.rest_json_response, name="rest_json_response")
     )
diff --git a/tests/integrations/django/myapp/views.py b/tests/integrations/django/myapp/views.py
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ typing = [`
`73`	`73`	`"pydantic>=2.13.4",`
`74`	`74`	`"pydantic-ai-slim>=2.23.0",`
`75`	`75`	`"langchain-core>=1.5.3",`
	`76`	`+ "huggingface-hub>=1.26.1",`
`76`	`77`	`]`
`77`	`78`	`test = [`
`78`	`79`	`"dataclasses ; python_full_version < '3.7'",`