fix(integrations): Fix Lambda integration with EventBridge source (getsentry#2546)

davidcroda · sentrivana · web-flow · commit 837f29458d14 · 2023-12-01T12:28:16.000Z
When a lambda is triggered by an AWS EventBridge pipe the record contains an explicit "headers" key with an empty list. This breaks the assumption that headers is always a dict or None. Update the AwsLambdaIntegration to explicitly verify that header is a dict before passing it on to the `continue_trace` function. Fixes getsentryGH-2545 --------- Co-authored-by: Ivana Kellyerova <ivana.kellyerova@sentry.io>
diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py
@@ -137,9 +137,10 @@ def sentry_handler(aws_event, aws_context, *args, **kwargs):
                     # Starting the thread to raise timeout warning exception
                     timeout_thread.start()
 
-            headers = request_data.get("headers")
-            # AWS Service may set an explicit `{headers: None}`, we can't rely on `.get()`'s default.
-            if headers is None:
+            headers = request_data.get("headers", {})
+            # Some AWS Services (ie. EventBridge) set headers as a list
+            # or None, so we must ensure it is a dict
+            if not isinstance(headers, dict):
                 headers = {}
 
             transaction = continue_trace(
diff --git a/tests/integrations/aws_lambda/test_aws.py b/tests/integrations/aws_lambda/test_aws.py
@@ -855,3 +855,26 @@ def test_handler(event, context):
         == error_event["contexts"]["trace"]["trace_id"]
         == "471a43a4192642f0b136d5159a501701"
     )
+
+
+def test_basic_with_eventbridge_source(run_lambda_function):
+    _, events, response = run_lambda_function(
+        LAMBDA_PRELUDE
+        + dedent(
+            """
+        init_sdk()
+
+        def test_handler(event, context):
+            raise Exception("Oh!")
+        """
+        ),
+        b'[{"topic":"lps-ranges","partition":1,"offset":0,"timestamp":1701268939207,"timestampType":"CREATE_TIME","key":"REDACTED","value":"REDACTED","headers":[],"eventSourceArn":"REDACTED","bootstrapServers":"REDACTED","eventSource":"aws:kafka","eventSourceKey":"lps-ranges-1"}]',
+    )
+
+    assert response["FunctionError"] == "Unhandled"
+
+    (event,) = events
+    assert event["level"] == "error"
+    (exception,) = event["exception"]["values"]
+    assert exception["type"] == "Exception"
+    assert exception["value"] == "Oh!"
