forgot to move setting of a url.query behind the pii check

Author: ericapisani

sentry_sdk/integrations/aiohttp.py

@@ -159,12 +159,7 @@ async def sentry_app_handle(
                                 header_value
                             )
 
-                        url_attributes = (
-                            {"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,
@@ -173,6 +168,9 @@ async def sentry_app_handle(
                             )
                             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:
                             client_address_attributes["client.address"] = request.remote

tests/integrations/aiohttp/test_aiohttp.py

@@ -1296,12 +1296,14 @@ async def hello(request):
 
 
 @pytest.mark.asyncio
+@pytest.mark.parametrize("send_pii", [True, False])
 async def test_url_query_attribute_span_streaming(
-    sentry_init, aiohttp_client, capture_items
+    sentry_init, aiohttp_client, capture_items, send_pii
 ):
     sentry_init(
         integrations=[AioHttpIntegration()],
         traces_sample_rate=1.0,
+        send_default_pii=send_pii,
         _experiments={"trace_lifecycle": "stream"},
     )
 
@@ -1322,7 +1324,10 @@ async def hello(request):
     assert len(items) == 2
     server_segment, client_segment = [item.payload for item in items]
 
-    assert server_segment["attributes"]["url.query"] == "foo=bar&baz=qux"
+    if send_pii:
+        assert server_segment["attributes"]["url.query"] == "foo=bar&baz=qux"
+    else:
+        assert "url.query" not in server_segment["attributes"]
 
 
 @pytest.mark.asyncio