Merge branch 'py-2514-gate-asgi-values-behind-pii' into py-2352-migrate-quart

Author: ericapisani

sentry_sdk/integrations/_asgi_common.py

@@ -126,9 +126,15 @@ def _get_request_attributes(asgi_scope: "Any") -> "dict[str, Any]":
             if query:
                 attributes["http.query"] = query
 
-            attributes["url.full"] = _get_url(
+            url_without_query_string = _get_url(
                 asgi_scope, "http" if ty == "http" else "ws", headers.get("host")
             )
+            query_string = _get_query(asgi_scope)
+            attributes["url.full"] = (
+                f"{url_without_query_string}?{query_string}"
+                if query_string is not None
+                else url_without_query_string
+            )
 
     client = asgi_scope.get("client")
     if client and should_send_default_pii():

tests/integrations/asgi/test_asgi.py

@@ -217,7 +217,10 @@ async def test_capture_transaction(
         )
 
         if should_send_pii:
-            assert span["attributes"]["url.full"] == "http://localhost/some_url"
+            assert (
+                span["attributes"]["url.full"]
+                == "http://localhost/some_url?somevalue=123"
+            )
             assert span["attributes"]["http.query"] == "somevalue=123"
 
     else: