fix(starlette): Stop duplicating scope["root_path"] in URLs

sentry_sdk/integrations/_asgi_common.py

@@ -32,14 +32,19 @@ def _get_url(
     asgi_scope: "Dict[str, Any]",
     default_scheme: "Literal['ws', 'http']",
     host: "Optional[Union[AnnotatedValue, str]]",
+    path_includes_root_path: "bool" = True,
 ) -> str:
     """
     Extract URL from the ASGI scope, without also including the querystring.
     """
     scheme = asgi_scope.get("scheme", default_scheme)
 
     server = asgi_scope.get("server", None)
-    path = asgi_scope.get("root_path", "") + asgi_scope.get("path", "")
+    path = (
+        asgi_scope.get("path", "")
+        if path_includes_root_path
+        else asgi_scope.get("root_path", "") + asgi_scope.get("path", "")
+    )
 
     if host:
         return "%s://%s%s" % (scheme, host, path)
@@ -81,7 +86,9 @@ 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", path_includes_root_path: "bool" = True
+) -> "Dict[str, Any]":
     """
     Returns data related to the HTTP request from the ASGI scope.
     """
@@ -96,7 +103,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_includes_root_path=path_includes_root_path,
         )
 
     client = asgi_scope.get("client")
@@ -106,7 +116,9 @@ 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", path_includes_root_path: "bool" = True
+) -> "dict[str, Any]":
     """
     Return attributes related to the HTTP request from the ASGI scope.
     """
@@ -127,7 +139,10 @@ def _get_request_attributes(asgi_scope: "Any") -> "dict[str, Any]":
                 attributes["http.query"] = query
 
             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_includes_root_path=path_includes_root_path,
             )
             query_string = _get_query(asgi_scope)
             attributes["url.full"] = (

sentry_sdk/integrations/asgi.py

@@ -105,6 +105,7 @@
         "mechanism_type",
         "span_origin",
         "http_methods_to_capture",
+        "path_includes_root_path",
     )
 
     def __init__(
@@ -113,9 +114,10 @@
         unsafe_context_data: bool = False,
         transaction_style: str = "endpoint",
         mechanism_type: str = "asgi",
         span_origin: str = "manual",
         http_methods_to_capture: "Tuple[str, ...]" = DEFAULT_HTTP_METHODS_TO_CAPTURE,
         asgi_version: "Optional[int]" = None,
+        path_includes_root_path: bool = True,
     ) -> None:
         """
         Instrument an ASGI application with Sentry. Provides HTTP/websocket
@@ -152,6 +154,7 @@
         self.span_origin = span_origin
         self.app = app
         self.http_methods_to_capture = http_methods_to_capture
+        self.path_includes_root_path = path_includes_root_path
 
         if asgi_version is None:
             if _looks_like_asgi3(app):
@@ -319,7 +322,8 @@
                     with span_ctx as span:
                         if isinstance(span, StreamedSpan):
                             for attribute, value in _get_request_attributes(
-                                scope
+                                scope,
+                                path_includes_root_path=self.path_includes_root_path,
                             ).items():
                                 span.set_attribute(attribute, value)
 
@@ -401,7 +405,11 @@
         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, path_includes_root_path=self.path_includes_root_path
+            )
+        )
         event["request"] = deepcopy(request_data)
 
         # Only set transaction name if not already set by Starlette or FastAPI (or other frameworks)
@@ -447,7 +455,12 @@
             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_includes_root_path=self.path_includes_root_path,
+                )
                 source = TransactionSource.URL
 
         elif transaction_style == "url":
@@ -459,7 +472,12 @@
                 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_includes_root_path=self.path_includes_root_path,
+                )
                 source = TransactionSource.URL
 
         if name is None:
@@ -484,7 +502,12 @@
             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_includes_root_path=self.path_includes_root_path,
+                )
                 source = SegmentSource.URL.value
 
         elif segment_style == "url":
@@ -496,7 +519,12 @@
                 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_includes_root_path=self.path_includes_root_path,
+                )
                 source = SegmentSource.URL.value
 
         if name is None:

sentry_sdk/integrations/starlette.py

@@ -143,7 +143,9 @@ def setup_once() -> None:
             )
 
         patch_middlewares()
-        patch_asgi_app()
+        # See https://github.com/Kludex/starlette/commit/e8f0dcd54e4ceec47e02c45f5275374e292339ad
+        path_includes_root_path = version >= (0, 33)
+        patch_asgi_app(path_includes_root_path=path_includes_root_path)
         patch_request_response()
 
         if version >= (0, 24):
@@ -427,7 +429,7 @@ def _sentry_middleware_init(
         Middleware.__init__ = _sentry_middleware_init
 
 
-def patch_asgi_app() -> None:
+def patch_asgi_app(path_includes_root_path: "bool") -> None:
     """
     Instrument Starlette ASGI app using the SentryAsgiMiddleware.
     """
@@ -451,6 +453,7 @@ async def _sentry_patched_asgi_app(
                 else DEFAULT_HTTP_METHODS_TO_CAPTURE
             ),
             asgi_version=3,
+            path_includes_root_path=path_includes_root_path,
         )
 
         return await middleware(scope, receive, send)

tests/integrations/django/asgi/test_asgi.py

@@ -1049,3 +1049,54 @@ async def test_transaction_http_method_custom(
         (event1, event2) = events
         assert event1["request"]["method"] == "OPTIONS"
         assert event2["request"]["method"] == "HEAD"
+
+
+@pytest.mark.parametrize("application", APPS)
+@pytest.mark.asyncio
+@pytest.mark.skipif(
+    django.VERSION < (3, 0), reason="Django ASGI support shipped in 3.0"
+)
+@pytest.mark.parametrize("span_streaming", [True, False])
+async def test_request_url(
+    sentry_init,
+    capture_events,
+    capture_items,
+    application,
+    span_streaming,
+):
+    sentry_init(
+        integrations=[DjangoIntegration()],
+        traces_sample_rate=1.0,
+        send_default_pii=True,
+        _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
+    )
+    comm = HttpCommunicator(
+        application,
+        "GET",
+        "/root/nomessage",
+    )
+
+    if span_streaming:
+        items = capture_items("span")
+        await comm.get_response()
+        await comm.wait()
+
+        sentry_sdk.flush()
+        spans = [item.payload for item in items]
+
+        (server_span,) = (
+            span
+            for span in spans
+            if span["attributes"].get("sentry.op") == "http.server"
+        )
+        assert server_span["attributes"]["url.full"] == (
+            "http://testserver/root/nomessage"
+        )
+    else:
+        events = capture_events()
+
+        await comm.get_response()
+        await comm.wait()
+
+        (event,) = events
+        assert event["request"]["url"] == "http://testserver/root/nomessage"

tests/integrations/fastapi/test_fastapi.py

@@ -62,6 +62,7 @@
 
 def fastapi_app_factory():
     app = FastAPI()
+    mounted_app = FastAPI()
 
     @app.get("/error")
     async def _error():
@@ -74,6 +75,7 @@ async def _message():
         capture_message("Hi")
         return {"message": "Hi"}
 
+    @mounted_app.get("/nomessage")
     @app.delete("/nomessage")
     @app.get("/nomessage")
     @app.head("/nomessage")
@@ -118,6 +120,8 @@ async def body_form(
         capture_message("hi")
         return {"status": "ok"}
 
+    app.mount("/root", mounted_app)
+
     return app
 
 
@@ -1043,6 +1047,47 @@ def test_transaction_http_method_custom(sentry_init, capture_events):
     assert event2["request"]["method"] == "HEAD"
 
 
+@pytest.mark.parametrize("span_streaming", [True, False])
+def test_request_url(sentry_init, capture_events, capture_items, span_streaming):
+    sentry_init(
+        traces_sample_rate=1.0,
+        send_default_pii=True,
+        integrations=[
+            StarletteIntegration(),
+        ],
+        _experiments={
+            "trace_lifecycle": "stream" if span_streaming else "static",
+        },
+    )
+
+    starlette_app = fastapi_app_factory()
+
+    client = TestClient(starlette_app)
+
+    if span_streaming:
+        items = capture_items("span")
+
+        client.get("/root/nomessage")
+        sentry_sdk.flush()
+        spans = [item.payload for item in items]
+
+        (server_span,) = (
+            span
+            for span in spans
+            if span["attributes"].get("sentry.op") == "http.server"
+        )
+        assert server_span["attributes"]["url.full"] == (
+            "http://testserver/root/nomessage"
+        )
+    else:
+        events = capture_events()
+
+        client.get("/root/nomessage")
+
+        (event,) = events
+        assert event["request"]["url"] == "http://testserver/root/nomessage"
+
+
 @parametrize_test_configurable_status_codes
 def test_configurable_status_codes(
     sentry_init,

tests/integrations/litestar/test_litestar.py

@@ -47,6 +47,10 @@
         capture_message("hi")
         return {"status": "ok"}
 
+    @get("/nomessage")
+    async def nomessage() -> "dict[str, Any]":
+        return {"status": "ok"}
+
     logging_config = LoggingConfig()
 
     app = Litestar(
@@ -55,6 +59,7 @@
             custom_error,
             message,
             message_with_id,
+            nomessage,
             MyController,
         ],
         debug=debug,
@@ -818,3 +823,41 @@
     event_exception = events[0]["exception"]["values"][0]
     assert event_exception["type"] == "RuntimeError"
     assert event_exception["value"] == "Too Hot"
+
+
+@pytest.mark.parametrize("span_streaming", [True, False])
+def test_request_url(sentry_init, capture_events, capture_items, span_streaming):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[LitestarIntegration()],
+        _experiments={
+            "trace_lifecycle": "stream" if span_streaming else "static",
+        },
+    )
+
+    litestar_app = litestar_app_factory()
+    client = TestClient(litestar_app, root_path="/root")
+
+    if span_streaming:
+        items = capture_items("span")
+
+        client.get("/root/nomessage")
+
+        sentry_sdk.flush()
+        spans = [item.payload for item in items]
+
+        (server_span,) = (
+            span
+            for span in spans
+            if span["attributes"].get("sentry.op") == "http.server"
+        )
+        assert server_span["attributes"]["url.full"] == (
+            "http://testserver/root/nomessage"
+        )
+    else:
+        events = capture_events()
+
+        client.get("/root/nomessage")
+
+        (event,) = events
+        assert event["request"]["url"] == "http://testserver/root/nomessage"