Base for tests with embedded SDK.

Author: antonpirker

tests/integrations/aws_lambda/lambda_functions_with_embedded_sdk/TracesSampler/.gitignore

@@ -0,0 +1,11 @@
+# Need to add some ignore rules in this directory, because the unit tests will add the Sentry SDK and its dependencies 
+# into this directory to create a Lambda function package that contains everything needed to instrument a Lambda function using Sentry.
+
+# Ignore everything
+*
+
+# But not index.py
+!index.py
+
+# And not .gitignore itself
+!.gitignore

tests/integrations/aws_lambda/test_aws_lambda.py

@@ -453,18 +453,12 @@ def test_span_origin(lambda_client, test_environment):
 
 
 def test_traces_sampler_has_correct_sampling_context(lambda_client, test_environment):
-    print("111")
-    bla = lambda_client.invoke(
+    lambda_client.invoke(
         FunctionName="TracesSampler",
         Payload=json.dumps({}),
     )
-    print(bla)
-    print("222")
     envelopes = test_environment["server"].envelopes
-    print(envelopes)
-    print("333")
     (transaction_event,) = envelopes
-    print("444")
     assert (
         transaction_event["contexts"]["trace"]["origin"] == "auto.function.aws_lambda"
     )

tests/integrations/aws_lambda/utils.py

@@ -153,7 +153,6 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         ]
         for lambda_dir in lambda_dirs:
             # Copy the Sentry SDK into the function directory
-            import ipdb; ipdb.set_trace()
             sdk_path = os.path.join(LAMBDA_FUNCTION_WITH_EMBEDDED_SDK_DIR, lambda_dir, "sentry_sdk")
             if not os.path.exists(sdk_path):
                 # Find the Sentry SDK in the current environment
@@ -170,20 +169,20 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                 "-m", 
                 "pip", 
                 "install", 
+                "--upgrade",
                 "--target", 
                 os.path.join(LAMBDA_FUNCTION_WITH_EMBEDDED_SDK_DIR, lambda_dir),
                 "-r", 
                 requirements_file,
             ])            
 
-
             CfnResource(
                 self,
                 lambda_dir,
                 type="AWS::Serverless::Function",
                 properties={
                     "CodeUri": os.path.join(LAMBDA_FUNCTION_WITH_EMBEDDED_SDK_DIR, lambda_dir),
-                    "Handler": "sentry_sdk.integrations.init_serverless_sdk.sentry_lambda_handler",
+                    "Handler": "index.handler",
                     "Runtime": PYTHON_VERSION,
                     "Timeout": LAMBDA_FUNCTION_TIMEOUT,
                     "Environment": {