.

Author: sentrivana

sentry_sdk/integrations/_wsgi_common.py

@@ -230,9 +230,7 @@ def _request_headers_to_span_attributes(headers):
     for header, value in headers.items():
         if isinstance(value, AnnotatedValue):
             value = SENSITIVE_DATA_SUBSTITUTE
-        else:
-            value = value.lower()
-        attributes[f"http.request.header.{header}"] = value
+        attributes[f"http.request.header.{header.lower()}"] = value
 
     return attributes
 

sentry_sdk/integrations/wsgi.py

@@ -345,6 +345,8 @@ def _prepopulate_attributes(wsgi_environ, use_x_forwarded_for=False):
         query = wsgi_environ.get("QUERY_STRING")
         attributes["url.full"] = f"{url}?{query}"
 
-    attributes.update(_request_headers_to_span_attributes(_get_headers(wsgi_environ)))
+    attributes.update(
+        _request_headers_to_span_attributes(dict(_get_headers(wsgi_environ)))
+    )
 
     return attributes

tests/integrations/aiohttp/test_aiohttp.py

@@ -309,7 +309,9 @@ async def kangaroo_handler(request):
     app.router.add_get("/tricks/kangaroo", kangaroo_handler)
 
     client = await aiohttp_client(app)
-    await client.get("/tricks/kangaroo?jump=high")
+    await client.get(
+        "/tricks/kangaroo?jump=high", headers={"Custom-Header": "Custom Value"}
+    )
 
     assert traces_sampler.call_count == 1
     sampling_context = traces_sampler.call_args_list[0][0][0]
@@ -324,6 +326,7 @@ async def kangaroo_handler(request):
     assert sampling_context["http.request.method"] == "GET"
     assert sampling_context["server.address"] == "127.0.0.1"
     assert sampling_context["server.port"].isnumeric()
+    assert sampling_context["http.request.header.custom-header"] == "Custom Value"
 
 
 @pytest.mark.asyncio

tests/integrations/asgi/test_asgi.py

@@ -733,6 +733,7 @@ def dummy_traces_sampler(sampling_context):
         assert sampling_context["http.request.method"] == "GET"
         assert sampling_context["network.protocol.version"] == "1.1"
         assert sampling_context["network.protocol.name"] == "http"
+        assert sampling_context["http.request.header.custom-header"] == "Custom Value"
 
     sentry_init(
         traces_sampler=dummy_traces_sampler,
@@ -742,4 +743,4 @@ def dummy_traces_sampler(sampling_context):
     app = SentryAsgiMiddleware(asgi3_app)
 
     async with TestClient(app) as client:
-        await client.get("/test?hello=there")
+        await client.get("/test?hello=there", headers={"Custom-Header": "Custom Value"})

tests/integrations/aws_lambda/test_aws.py

@@ -625,6 +625,7 @@ def test_handler(event, context):
                                 "url.full": "http://x.io/sit/stay/rollover?repeat=twice",
                                 "network.protocol.name": "http",
                                 "server.address": "x.io",
+                                "http.request.header.custom-header": "Custom Value",
                             }
                         )
                     )
@@ -643,7 +644,7 @@ def test_handler(event, context):
             )
         """
         ),
-        b'{"httpMethod": "GET", "path": "/sit/stay/rollover", "query_string": {"repeat": "again"}, "headers": {"Host": "x.io", "X-Forwarded-Proto": "http"}}',
+        b'{"httpMethod": "GET", "path": "/sit/stay/rollover", "query_string": {"repeat": "again"}, "headers": {"Host": "x.io", "X-Forwarded-Proto": "http", "Custom-Header": "Custom Value"}}',
     )
 
     assert response["Payload"]["AssertionError raised"] is False

tests/integrations/gcp/test_gcp.py

@@ -293,11 +293,11 @@ def test_traces_sampler_gets_correct_values_in_sampling_context(
         dedent(
             """
             functionhandler = None
-            event = {
-                "type": "chase",
-                "chasers": ["Maisey", "Charlie"],
-                "num_squirrels": 2,
-            }
+
+            from collections import namedtuple
+            GCPEvent = namedtuple("GCPEvent", ["headers"])
+            event = GCPEvent(headers={"Custom-Header": "Custom Value"})
+
             def cloud_function(functionhandler, event):
                 # this runs after the transaction has started, which means we
                 # can make assertions about traces_sampler
@@ -310,14 +310,15 @@ def cloud_function(functionhandler, event):
                             "gcp.function.entry_point": "cloud_function",
                             "gcp.function.project": "SquirrelChasing",
                             "cloud.provider": "gcp",
+                            "http.request.header.custom-header": "Custom Value",
                         })
                     )
                 except AssertionError:
                     # catch the error and return it because the error itself will
                     # get swallowed by the SDK as an "internal exception"
-                    return {"AssertionError raised": True,}
+                    return {"AssertionError raised": True}
 
-                return {"AssertionError raised": False,}
+                return {"AssertionError raised": False}
             """
         )
         + FUNCTIONS_PRELUDE

tests/integrations/tornado/test_tornado.py

@@ -467,6 +467,7 @@ def traces_sampler(sampling_context):
         assert sampling_context["server.port"].isnumeric()
         assert sampling_context["network.protocol.name"] == "HTTP"
         assert sampling_context["network.protocol.version"] == "1.1"
+        assert sampling_context["http.request.header.custom-header"] == "Custom Value"
 
         return True
 
@@ -476,4 +477,4 @@ def traces_sampler(sampling_context):
     )
 
     client = tornado_testcase(Application([(r"/hi", HelloHandler)]))
-    client.fetch("/hi?foo=bar")
+    client.fetch("/hi?foo=bar", headers={"Custom-Header": "Custom Value"})

tests/integrations/wsgi/test_wsgi.py

@@ -1,5 +1,4 @@
 from collections import Counter
-from datetime import datetime
 from unittest import mock
 
 import pytest
@@ -327,10 +326,7 @@ def dogpark(environ, start_response):
     assert error_event["contexts"]["trace"]["trace_id"] == trace_id
 
 
-def test_traces_sampler_gets_correct_values_in_sampling_context(
-    sentry_init,
-    DictionaryContaining,  # noqa:N803
-):
+def test_traces_sampler_gets_correct_values_in_sampling_context(sentry_init):
     def app(environ, start_response):
         start_response("200 OK", [])
         return ["Go get the ball! Good dog!"]
@@ -343,13 +339,14 @@ def traces_sampler(sampling_context):
         assert (
             sampling_context["url.full"] == "http://localhost/dogs/are/great/?cats=too"
         )
+        assert sampling_context["http.request.header.custom-header"] == "Custom Value"
         return True
 
     sentry_init(send_default_pii=True, traces_sampler=traces_sampler)
     app = SentryWsgiMiddleware(app)
     client = Client(app)
 
-    client.get("/dogs/are/great/?cats=too")
+    client.get("/dogs/are/great/?cats=too", headers={"Custom-Header": "Custom Value"})
 
 
 def test_session_mode_defaults_to_request_mode_in_wsgi_handler(