Some fixes

Author: antonpirker

sentry_sdk/integrations/aws_lambda.py

@@ -5,6 +5,7 @@
 from copy import deepcopy
 from datetime import datetime, timedelta, timezone
 from os import environ
+from urllib.parse import urlencode
 
 import sentry_sdk
 from sentry_sdk.consts import OP
@@ -336,7 +337,7 @@ def event_processor(sentry_event, hint, start_time=start_time):
         request["url"] = _get_url(aws_event, aws_context)
 
         if "queryStringParameters" in aws_event:
-            request["query_string"] = aws_event["queryStringParameters"]
+            request["query_string"] = urlencode(aws_event["queryStringParameters"])
 
         if "headers" in aws_event:
             request["headers"] = _filter_headers(aws_event["headers"])
@@ -483,7 +484,10 @@ def _prepopulate_attributes(aws_event, aws_context):
 
     for prop, attr in EVENT_TO_ATTRIBUTES.items():
         if aws_event.get(prop) is not None:
-            attributes[attr] = aws_event[prop]
+            if prop == "queryStringParameters":
+                attributes[attr] = urlencode(aws_event[prop])
+            else:
+                attributes[attr] = aws_event[prop]
 
     for prop, attr in CONTEXT_TO_ATTRIBUTES.items():
         if getattr(aws_context, prop, None) is not None:
@@ -492,7 +496,7 @@ def _prepopulate_attributes(aws_event, aws_context):
     url = _get_url(aws_event, aws_context)
     if url:
         if aws_event.get("queryStringParameters"):
-            url += f"?{aws_event['queryStringParameters']}"
+            url += f"?{urlencode(aws_event['queryStringParameters'])}"
         attributes["url.full"] = url
 
     headers = {}

tests/integrations/aws_lambda/test_aws.py

@@ -646,7 +646,7 @@ def test_handler(event, context):
         )
     )
 
-    payload = b'{"httpMethod": "GET", "path": "/sit/stay/rollover", "queryStringParameters": "repeat=twice", "headers": {"Host": "x.io", "X-Forwarded-Proto": "http", "Custom-Header": "Custom Value"}}'
+    payload = b'{"httpMethod": "GET", "path": "/sit/stay/rollover", "queryStringParameters": {"repeat": "twice"}, "headers": {"Host": "x.io", "X-Forwarded-Proto": "http", "Custom-Header": "Custom Value"}}'
 
     _, response = run_lambda_function(
         code=function_code,