update url.path

Author: alexander-alderman-webb

sentry_sdk/consts.py

@@ -1020,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.

sentry_sdk/integrations/_asgi_common.py

@@ -150,8 +150,10 @@ def _get_request_attributes(
                 if query_string is not None
                 else url_without_query_string
             )
-            attributes["url.path"] = asgi_scope.get("root_path", "") + asgi_scope.get(
-                "path", ""
+            attributes["url.path"] = (
+                asgi_scope.get("path", "")
+                if path_includes_root_path
+                else asgi_scope.get("root_path", "") + asgi_scope.get("path", "")
             )
 
     client = asgi_scope.get("client")

tests/integrations/fastapi/test_fastapi.py

@@ -1076,9 +1076,10 @@ def test_request_url(sentry_init, capture_events, capture_items, span_streaming)
             for span in spans
             if span["attributes"].get("sentry.op") == "http.server"
         )
-        assert server_span["attributes"]["url.full"] == (
+        assert server_span["attributes"][SPANDATA.URL_FULL] == (
             "http://testserver/root/nomessage"
         )
+        assert server_span["attributes"][SPANDATA.URL_PATH] == "/root/nomessage"
     else:
         events = capture_events()
 

tests/integrations/starlette/test_starlette.py

@@ -1513,9 +1513,10 @@ def test_request_url(sentry_init, capture_events, capture_items, span_streaming)
             for span in spans
             if span["attributes"].get("sentry.op") == "http.server"
         )
-        assert server_span["attributes"]["url.full"] == (
+        assert server_span["attributes"][SPANDATA.URL_FULL] == (
             "http://testserver/root/nomessage"
         )
+        assert server_span["attributes"][SPANDATA.URL_PATH] == "/root/nomessage"
     else:
         events = capture_events()