Address the encoding issue raised by warden

Author: ericapisani

sentry_sdk/integrations/aws_lambda.py

@@ -6,6 +6,7 @@
 from datetime import datetime, timedelta, timezone
 from os import environ
 from typing import TYPE_CHECKING
+from urllib.parse import urlencode
 
 import sentry_sdk
 from sentry_sdk.api import continue_trace
@@ -166,9 +167,7 @@ def sentry_handler(
             if should_send_default_pii() and "queryStringParameters" in request_data:
                 qs = request_data["queryStringParameters"]
                 if qs:
-                    additional_attributes["url.query"] = "&".join(
-                        f"{k}={v}" for k, v in qs.items()
-                    )
+                    additional_attributes["url.query"] = urlencode(qs)
 
             sampling_context = {
                 "aws_event": aws_event,

tests/integrations/aws_lambda/test_aws_lambda.py

@@ -672,7 +672,7 @@ def test_span_streaming_request_attributes(lambda_client, test_environment):
             "Accept": "text/html",
         },
         "httpMethod": "POST",
-        "queryStringParameters": {"foo": "bar"},
+        "queryStringParameters": {"foo": "bar", "a-complicated-value": "a=b&c=d"},
         "path": "/test",
     }
 
@@ -688,7 +688,7 @@ def test_span_streaming_request_attributes(lambda_client, test_environment):
     attrs = segment_span["attributes"]
 
     assert _get_span_attr(attrs, "http.request.method") == "POST"
-    assert _get_span_attr(attrs, "url.query") == "foo=bar"
+    assert _get_span_attr(attrs, "url.query") == "foo=bar&a-complicated-value=a%3Db%26c%3Dd"
     assert (
         _get_span_attr(attrs, "http.request.header.content-type") == "application/json"
     )