Some clenaup

Author: antonpirker

tests/integrations/aws_lambda/test_aws_lambda.py

@@ -10,33 +10,34 @@
 
 from aws_cdk import App
 
-from .utils import DummyLambdaStack, SentryTestServer, SAM_PORT
+from .utils import LocalLambdaStack, SentryServerForTesting, SAM_PORT
 
 
 SAM_TEMPLATE_FILE = "sam.template.yaml"
 
 
 @pytest.fixture(scope="session", autouse=True)
 def test_environment():
-    print("Setting up AWS Lambda test infrastructure")
+    print("[test_environment fixture] Setting up AWS Lambda test infrastructure")
 
-    # Setup dummy relay to capture envelopes
-    server = SentryTestServer()
+    # Start Sentry server
+    server = SentryServerForTesting()
     server.start()
     time.sleep(1)  # Give it a moment to start up
 
-    # Create the SAM stack
+    # Create local AWS SAM stack
     app = App()
-    stack = DummyLambdaStack(app, "DummyLambdaStack")
+    stack = LocalLambdaStack(app, "LocalLambdaStack")
 
-    # Write template to file
-    template = app.synth().get_stack_by_name("DummyLambdaStack").template
+    # Write SAM template to file
+    template = app.synth().get_stack_by_name("LocalLambdaStack").template
     with open(SAM_TEMPLATE_FILE, "w") as f:
         yaml.dump(template, f)
 
+    # Write SAM debug log to file
     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}")
+    print("[test_environment fixture] Writing SAM debug log to: %s" % debug_log_file)
 
     # Start SAM local
     process = subprocess.Popen(
@@ -57,19 +58,19 @@ def test_environment():
 
     try:
         # Wait for SAM to be ready
-        DummyLambdaStack.wait_for_stack()
+        LocalLambdaStack.wait_for_stack()
 
         def before_test():
             server.clear_envelopes()
 
         yield {
             "stack": stack,
             "server": server,
-            "before_test": before_test,  # Add this function to the yielded dict
+            "before_test": before_test,
         }
 
     finally:
-        print("Tearing down AWS Lambda test infrastructure")
+        print("[test_environment fixture] Tearing down AWS Lambda test infrastructure")
 
         process.terminate()
         process.wait(timeout=5)  # Give it time to shut down gracefully
@@ -439,8 +440,3 @@ def test_span_origin(lambda_client, test_environment):
     assert (
         transaction_event["contexts"]["trace"]["origin"] == "auto.function.aws_lambda"
     )
-
-
-def test_init_sentry_manually():
-    # todo
-    pass

tests/integrations/aws_lambda/utils.py

@@ -17,30 +17,32 @@
 from scripts.build_aws_lambda_layer import build_packaged_zip, DIST_PATH
 
 
-PYTHON_VERSION = f"python{sys.version_info.major}.{sys.version_info.minor}"
-SAM_PORT = 3001
-LAMBDA_FUNCTION_TIMEOUT = 10
 LAMBDA_FUNCTION_DIR = "./tests/integrations/aws_lambda/lambda_functions/"
+LAMBDA_FUNCTION_TIMEOUT = 10
+SAM_PORT = 3001
+
+PYTHON_VERSION = f"python{sys.version_info.major}.{sys.version_info.minor}"
 
 
-class DummyLambdaStack(Stack):
+class LocalLambdaStack(Stack):
     def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         super().__init__(scope, construct_id, **kwargs)
-
-        print(f"CREATING STACK: {self}")
+        print("[LocalLambdaStack] Creating local SAM Lambda Stack: %s" % self)
 
         # Override the template synthesis
         self.template_options.template_format_version = "2010-09-09"
         self.template_options.transforms = ["AWS::Serverless-2016-10-31"]
 
-        print("- Create Sentry Lambda layer package")
+        print("[LocalLambdaStack] 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")
+        print(
+            "[LocalLambdaStack] Add Sentry Lambda layer containing the Sentry SDK to the SAM stack"
+        )
         self.sentry_layer = CfnResource(
             self,
             "SentryPythonServerlessSDK",
@@ -53,9 +55,12 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
             },
         )
 
-        print("- Add all Lambda functions defined in /tests/integrations/aws_lambda/lambda_functions/ to the SAM stack")
+        print(
+            "[LocalLambdaStack] Add all Lambda functions defined in /tests/integrations/aws_lambda/lambda_functions/ to the SAM stack"
+        )
         lambda_dirs = [
-            d for d in os.listdir(LAMBDA_FUNCTION_DIR)
+            d
+            for d in os.listdir(LAMBDA_FUNCTION_DIR)
             if os.path.isdir(os.path.join(LAMBDA_FUNCTION_DIR, d))
         ]
         for lambda_dir in lambda_dirs:
@@ -68,7 +73,9 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                     "Handler": "sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler",
                     "Runtime": PYTHON_VERSION,
                     "Timeout": LAMBDA_FUNCTION_TIMEOUT,
-                    "Layers": [{"Ref": self.sentry_layer.logical_id}],  # Add layer containing the Sentry SDK to function.
+                    "Layers": [
+                        {"Ref": self.sentry_layer.logical_id}
+                    ],  # Add layer containing the Sentry SDK to function.
                     "Environment": {
                         "Variables": {
                             "SENTRY_DSN": "http://[email protected]:9999/0",
@@ -78,8 +85,13 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                     },
                 },
             )
-            print(f"  - Created Lambda function: {lambda_dir} ({os.path.join(LAMBDA_FUNCTION_DIR, lambda_dir)})")
-
+            print(
+                "[LocalLambdaStack] - Created Lambda function: %s (%s)"
+                % (
+                    lambda_dir,
+                    os.path.join(LAMBDA_FUNCTION_DIR, lambda_dir),
+                )
+            )
 
     @classmethod
     def wait_for_stack(cls, timeout=30, port=SAM_PORT):
@@ -90,7 +102,8 @@ 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. (Maybe Docker is not running?)".format(timeout)
+                    "SAM failed to start within %s seconds. (Maybe Docker is not running?)"
+                    % timeout
                 )
 
             try:
@@ -104,18 +117,24 @@ def wait_for_stack(cls, timeout=30, port=SAM_PORT):
                 continue
 
 
-class SentryTestServer:
-    def __init__(self, port=9999):
+class SentryServerForTesting:
+    """
+    A simple Sentry.io style server that accepts envelopes and stores them in a list.
+    """
+
+    def __init__(self, port=9999, log_level="warning"):
         self.envelopes = []
         self.port = port
+        self.log_level = log_level
         self.app = FastAPI()
 
         @self.app.post("/api/0/envelope/")
         async def envelope(request: Request):
+            print("[SentryServerForTesting] Received envelope")
             try:
                 raw_body = await request.body()
             except:
-                return {"status": "no body"}
+                return {"status": "no body received"}
 
             try:
                 body = gzip.decompress(raw_body).decode("utf-8")
@@ -143,13 +162,13 @@ async def envelope(request: Request):
             return {"status": "ok"}
 
     def run_server(self):
-        uvicorn.run(self.app, host="0.0.0.0", port=self.port, log_level="warning")
+        uvicorn.run(self.app, host="0.0.0.0", port=self.port, log_level=self.log_level)
 
     def start(self):
-        print("[SENTRY SERVER] Starting server")
+        print("[SentryServerForTesting] Starting server")
         server_thread = threading.Thread(target=self.run_server, daemon=True)
         server_thread.start()
 
     def clear_envelopes(self):
-        print("[SENTRY SERVER] Clearing envelopes")
+        print("[SentryServerForTesting] Clearing envelopes")
         self.envelopes = []