Making AWS Lambda invokation work reliabily

Author: antonpirker

tests/integrations/aws_lambda/lambda_functions/basic_exception/index.py

@@ -0,0 +1,8 @@
+
+def handler(event, context):
+    1/0
+    raise Exception("Oh!")
+
+    return {
+        "event": event,
+    }

tests/integrations/aws_lambda/lambda_functions/basic_ok/index.py

@@ -0,0 +1,5 @@
+
+def handler(event, context):
+    return {
+        "event": event,
+    }

tests/integrations/aws_lambda/test_aws_lambda.py

@@ -2,6 +2,7 @@
 import json
 import pytest
 import subprocess
+import tempfile
 import time
 import yaml
 
@@ -30,17 +31,23 @@ def test_environment():
     with open(SAM_TEMPLATE_FILE, "w") as f:
         yaml.dump(template, f)
 
+    debug_log_file = tempfile.gettempdir() + "/sentry_aws_lambda_tests_sam_debug.log"
+    debug_log = open(debug_log_file, "w")
+    print(f"Writing SAM debug log to: {debug_log_file}")
+
     # Start SAM local
     process = subprocess.Popen(
         [
             "sam",
             "local",
             "start-lambda",
+            "--debug",
             "--template",
             SAM_TEMPLATE_FILE,
+            "--warm-containers", "EAGER",
         ],
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+        stdout=debug_log,
+        stderr=debug_log,
         text=True,  # This makes stdout/stderr return strings instead of bytes
     )
 
@@ -88,7 +95,7 @@ def lambda_client():
 
 # def test_basic_ok(lambda_client, test_environment):
 #     response = lambda_client.invoke(
-#         FunctionName="BasicOk", 
+#         FunctionName="BasicOk",
 #         Payload=json.dumps({"name": "Ivana"}),
 #     )
 #     result = json.loads(response["Payload"].read().decode())
@@ -102,27 +109,25 @@ def lambda_client():
 
 
 def test_xxx(lambda_client, test_environment):
-    for x in range(20):   
+    for x in range(20):
         test_environment["server"].clear_envelopes()
         print(f"*** BasicException {x} ***")
         response = lambda_client.invoke(
-            FunctionName="BasicException", 
+            FunctionName="BasicException",
             Payload=json.dumps({}),
         )
         print("- RESPONSE")
         print(response)
         print("- PAYLOAD")
         print(response["Payload"].read().decode())
-        print(f'- ENVELOPES {len(test_environment["server"].envelopes)}')
-
-
-
-    assert False
+        num_envelopes = len(test_environment["server"].envelopes)
+        print(f'- ENVELOPES {num_envelopes}')
+        assert num_envelopes == 2
 
 
 # def test_basic(lambda_client, test_environment):
 #     response = lambda_client.invoke(
-#         FunctionName="BasicException", 
+#         FunctionName="BasicException",
 #         Payload=json.dumps({"name": "Neel"}),
 #     )
 #     print("RESPONSE")

tests/integrations/aws_lambda/utils.py

@@ -17,6 +17,7 @@
 
 
 SAM_PORT = 3001
+FUNCTIONS_DIR = "./tests/integrations/aws_lambda/lambda_functions/"
 
 
 class DummyLambdaStack(Stack):
@@ -29,13 +30,14 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         self.template_options.template_format_version = "2010-09-09"
         self.template_options.transforms = ["AWS::Serverless-2016-10-31"]
 
-        # Create Sentry Lambda layer to the SAM stack
+        print("- Create Sentry Lambda layer package")
         filename = "sentry-sdk-lambda-layer.zip"
         build_packaged_zip(
             make_dist=True,
             out_zip_filename=filename,
         )
 
+        print("- Add Sentry Lambda layer containing the Sentry SDK to the SAM stack")
         self.sentry_layer = CfnResource(
             self,
             "SentryPythonServerlessSDK",
@@ -54,10 +56,9 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
             },
         )
 
-        # Add all lambda functions from /tests/integrations/aws_lambda/lambda_functions/ to the SAM stack
-        FUNCTIONS_DIR = "./tests/integrations/aws_lambda/lambda_functions/"
+        print("- Add all Lambda functions defined in /tests/integrations/aws_lambda/lambda_functions/ to the SAM stack")
         lambda_dirs = [
-            d for d in os.listdir(FUNCTIONS_DIR) 
+            d for d in os.listdir(FUNCTIONS_DIR)
             if os.path.isdir(os.path.join(FUNCTIONS_DIR, d))
         ]
         for lambda_dir in lambda_dirs:
@@ -71,6 +72,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                     "CodeUri": os.path.join(FUNCTIONS_DIR, lambda_dir),
                     "Handler": "sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler",
                     "Runtime": "python3.12",
+                    "Timeout": 15,
                     "Layers": [{"Ref": self.sentry_layer.logical_id}],  # Add layer containing the Sentry SDK to function.
                     "Environment": {
                         "Variables": {
@@ -81,7 +83,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                     },
                 },
             )
-            print(f"- created function: {lambda_name} / {os.path.join(FUNCTIONS_DIR, lambda_dir)}")
+            print(f"  - Created Lambda function: {lambda_name} / {os.path.join(FUNCTIONS_DIR, lambda_dir)}")
 
 
     @classmethod
@@ -93,7 +95,7 @@ def wait_for_stack(cls, timeout=30, port=SAM_PORT):
         while True:
             if time.time() - start_time > timeout:
                 raise TimeoutError(
-                    "SAM failed to start within {} seconds".format(timeout)
+                    "SAM failed to start within {} seconds. (Maybe Docker is not running?)".format(timeout)
                 )
 
             try: