add headers

Author: sentrivana

sentry_sdk/integrations/_wsgi_common.py

@@ -3,7 +3,7 @@
 
 import sentry_sdk
 from sentry_sdk.scope import should_send_default_pii
-from sentry_sdk.utils import AnnotatedValue, logger
+from sentry_sdk.utils import AnnotatedValue, logger, SENSITIVE_DATA_SUBSTITUTE
 
 try:
     from django.http.request import RawPostDataException
@@ -221,6 +221,22 @@ def _filter_headers(headers):
     }
 
 
+def _request_headers_to_span_attributes(headers):
+    # type: (dict[str, str]) -> dict[str, str]
+    attributes = {}
+
+    headers = _filter_headers(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
+
+    return attributes
+
+
 def _in_http_status_code_range(code, code_ranges):
     # type: (object, list[HttpStatusCodeRange]) -> bool
     for target in code_ranges:

sentry_sdk/integrations/aiohttp.py

@@ -13,6 +13,7 @@
 from sentry_sdk.sessions import track_session
 from sentry_sdk.integrations._wsgi_common import (
     _filter_headers,
+    _request_headers_to_span_attributes,
     request_body_within_bounds,
 )
 from sentry_sdk.tracing import (
@@ -394,4 +395,6 @@ def _prepopulate_attributes(request):
         if request.query_string:
             attributes["url.full"] = f"{url}?{request.query_string}"
 
+    attributes.update(_request_headers_to_span_attributes(dict(request.headers)))
+
     return attributes

sentry_sdk/integrations/asgi.py

@@ -21,6 +21,7 @@
 )
 from sentry_sdk.integrations._wsgi_common import (
     DEFAULT_HTTP_METHODS_TO_CAPTURE,
+    _request_headers_to_span_attributes,
 )
 from sentry_sdk.sessions import track_session
 from sentry_sdk.tracing import (
@@ -363,4 +364,6 @@ def _prepopulate_attributes(scope):
 
         attributes["url.full"] = full_url
 
+    attributes.update(_request_headers_to_span_attributes(_get_headers(scope)))
+
     return attributes

sentry_sdk/integrations/aws_lambda.py

@@ -20,7 +20,10 @@
     reraise,
 )
 from sentry_sdk.integrations import Integration
-from sentry_sdk.integrations._wsgi_common import _filter_headers
+from sentry_sdk.integrations._wsgi_common import (
+    _filter_headers,
+    _request_headers_to_span_attributes,
+)
 
 from typing import TYPE_CHECKING
 
@@ -162,7 +165,7 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
                     name=aws_context.function_name,
                     source=TRANSACTION_SOURCE_COMPONENT,
                     origin=AwsLambdaIntegration.origin,
-                    attributes=_prepopulate_attributes(aws_event, aws_context),
+                    attributes=_prepopulate_attributes(aws_event, aws_context, headers),
                 ):
                     try:
                         return handler(aws_event, aws_context, *args, **kwargs)
@@ -487,10 +490,15 @@ def _prepopulate_attributes(aws_event, aws_context):
             url += f"?{aws_event['queryStringParameters']}"
         attributes["url.full"] = url
 
-    headers = aws_event.get("headers") or {}
+    headers = {}
+    if aws_event.get("headers") and isinstance(aws_event["headers"], dict):
+        headers = aws_event["headers"]
+
     if headers.get("X-Forwarded-Proto"):
         attributes["network.protocol.name"] = headers["X-Forwarded-Proto"]
     if headers.get("Host"):
         attributes["server.address"] = headers["Host"]
 
+    attributes.update(_request_headers_to_span_attributes(headers))
+
     return attributes

sentry_sdk/integrations/gcp.py

@@ -7,7 +7,10 @@
 import sentry_sdk
 from sentry_sdk.consts import OP
 from sentry_sdk.integrations import Integration
-from sentry_sdk.integrations._wsgi_common import _filter_headers
+from sentry_sdk.integrations._wsgi_common import (
+    _filter_headers,
+    _request_headers_to_span_attributes,
+)
 from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.tracing import TRANSACTION_SOURCE_COMPONENT
 from sentry_sdk.utils import (
@@ -249,4 +252,8 @@ def _prepopulate_attributes(gcp_event):
         if getattr(gcp_event, key, None):
             attributes[attr] = getattr(gcp_event, key)
 
+    if hasattr(gcp_event, "headers"):
+        headers = gcp_event.headers
+        attributes.update(_request_headers_to_span_attributes(headers))
+
     return attributes

sentry_sdk/integrations/tornado.py

@@ -22,6 +22,7 @@
     RequestExtractor,
     _filter_headers,
     _is_json_content_type,
+    _request_headers_to_span_attributes,
 )
 from sentry_sdk.integrations.logging import ignore_logger
 
@@ -257,4 +258,6 @@ def _prepopulate_attributes(request):
     with capture_internal_exceptions():
         attributes["url.full"] = request.full_url()
 
+    attributes.update(_request_headers_to_span_attributes(request.headers))
+
     return attributes

sentry_sdk/integrations/wsgi.py

@@ -9,6 +9,7 @@
 from sentry_sdk.integrations._wsgi_common import (
     DEFAULT_HTTP_METHODS_TO_CAPTURE,
     _filter_headers,
+    _request_headers_to_span_attributes,
 )
 from sentry_sdk.sessions import track_session
 from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_ROUTE
@@ -344,4 +345,6 @@ 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)))
+
     return attributes