ref: Store headers as lists

Author: sentrivana

sentry_sdk/integrations/_asgi_common.py

@@ -177,7 +177,7 @@ def _get_request_attributes(
 
         filtered_headers = _filter_headers(headers)
         for header, value in filtered_headers.items():
-            attributes[f"http.request.header.{header.lower()}"] = value
+            attributes[f"http.request.header.{header.lower()}"] = [value]
 
         if has_data_collection_enabled(client_options):
             filtered_query_string = None

sentry_sdk/integrations/aiohttp.py

@@ -150,9 +150,9 @@ async def sentry_app_handle(
 
                     header_attributes: "dict[str, Any]" = {}
                     for header, header_value in _filter_headers(headers).items():
-                        header_attributes[f"http.request.header.{header.lower()}"] = (
+                        header_attributes[f"http.request.header.{header.lower()}"] = [
                             header_value
-                        )
+                        ]
 
                     url_attributes = {}
                     client_address_attributes = {}

sentry_sdk/integrations/aws_lambda.py

@@ -167,9 +167,9 @@ def sentry_handler(
 
             header_attributes: "dict[str, Any]" = {}
             for header, header_value in _filter_headers(headers).items():
-                header_attributes[f"http.request.header.{header.lower()}"] = (
+                header_attributes[f"http.request.header.{header.lower()}"] = [
                     header_value
-                )
+                ]
 
             additional_attributes: "dict[str, Any]" = {}
             if "httpMethod" in request_data:

sentry_sdk/integrations/chalice.py

@@ -95,7 +95,7 @@ def wrapped_view_function(**function_args: "Any") -> "Any":
 
                 header_attrs: "Dict[str, Any]" = {}
                 for header, value in _filter_headers(headers).items():
-                    header_attrs[f"http.request.header.{header.lower()}"] = value
+                    header_attrs[f"http.request.header.{header.lower()}"] = [value]
 
                 additional_attrs: "Dict[str, Any]" = {}
                 if "method" in request_dict:

sentry_sdk/integrations/gcp.py

@@ -87,9 +87,9 @@ def sentry_func(
             if hasattr(gcp_event, "headers"):
                 headers = gcp_event.headers
                 for header, header_value in _filter_headers(headers).items():
-                    header_attributes[f"http.request.header.{header.lower()}"] = (
+                    header_attributes[f"http.request.header.{header.lower()}"] = [
                         header_value
-                    )
+                    ]
 
             additional_attributes = {}
             if hasattr(gcp_event, "method"):

sentry_sdk/integrations/quart.py

@@ -188,7 +188,7 @@ async def _request_websocket_started(app: "Quart", **kwargs: "Any") -> None:
         for header, header_value in _filter_headers(
             dict(request_websocket.headers)
         ).items():
-            header_attributes[f"http.request.header.{header.lower()}"] = header_value
+            header_attributes[f"http.request.header.{header.lower()}"] = [header_value]
 
         segment.set_attributes(header_attributes)
 

sentry_sdk/integrations/sanic.py

@@ -262,7 +262,7 @@ def _get_request_attributes(request: "Request") -> "Dict[str, Any]":
 
     headers = _filter_headers(dict(request.headers))
     for header, value in headers.items():
-        attributes[f"{SPANDATA.HTTP_REQUEST_HEADER}.{header.lower()}"] = value
+        attributes[f"{SPANDATA.HTTP_REQUEST_HEADER}.{header.lower()}"] = [value]
 
     urlparts = urlsplit(request.url)
     client_options = sentry_sdk.get_client().options

sentry_sdk/integrations/tornado.py

@@ -166,7 +166,7 @@ def _get_request_attributes(request: "Any") -> "Dict[str, Any]":
 
     headers = _filter_headers(dict(request.headers))
     for header, value in headers.items():
-        attributes[f"{SPANDATA.HTTP_REQUEST_HEADER}.{header.lower()}"] = value
+        attributes[f"{SPANDATA.HTTP_REQUEST_HEADER}.{header.lower()}"] = [value]
 
     attributes["url.path"] = request.path
 

sentry_sdk/integrations/wsgi.py

@@ -417,7 +417,7 @@ def _get_request_attributes(
 
     headers = _filter_headers(dict(_get_headers(environ)))
     for header, value in headers.items():
-        attributes[f"http.request.header.{header.lower()}"] = value
+        attributes[f"http.request.header.{header.lower()}"] = [value]
 
     url_scheme = environ.get("wsgi.url_scheme")
     if url_scheme:

tests/integrations/aiohttp/test_aiohttp.py

@@ -1438,15 +1438,13 @@ async def hello(request):
 
     # Data collection always substitutes sensitive headers with
     # SENSITIVE_DATA_SUBSTITUTE ("[Filtered]"). The original token must not leak.
-    assert (
-        server_span["attributes"]["http.request.header.authorization"]
-        == SENSITIVE_DATA_SUBSTITUTE
-    )
+    assert server_span["attributes"]["http.request.header.authorization"] == [
+        SENSITIVE_DATA_SUBSTITUTE
+    ]
     # Non-sensitive headers pass through untouched.
-    assert (
-        server_span["attributes"]["http.request.header.x-custom-header"]
-        == "passthrough"
-    )
+    assert server_span["attributes"]["http.request.header.x-custom-header"] == [
+        "passthrough"
+    ]
 
 
 @pytest.mark.asyncio