Add PR suggestions

Author: Michal Ploski

pyproject.toml

@@ -138,7 +138,6 @@ addopts = "-ra -vv"
 testpaths = "./tests"
 markers = [
     "perf: marks perf tests to be deselected (deselect with '-m \"not perf\"')",
-    "e2e: marks e2e tests to be deselected (deselect with '-m \"not e2e\"')",
 ]
 
 [build-system]

tests/e2e/logger/test_logger.py

@@ -17,7 +17,6 @@ def config() -> conftest.LambdaConfig:
     }
 
 
-@pytest.mark.e2e
 def test_basic_lambda_logs_visible(execute_lambda: conftest.InfrastructureOutput, config: conftest.LambdaConfig):
     # GIVEN
     lambda_arn = execute_lambda.get_lambda_arn(name="basichandlerarn")
@@ -37,7 +36,6 @@ def test_basic_lambda_logs_visible(execute_lambda: conftest.InfrastructureOutput
     )
 
 
-@pytest.mark.e2e
 def test_basic_lambda_no_debug_logs_visible(
     execute_lambda: conftest.InfrastructureOutput, config: conftest.LambdaConfig
 ):
@@ -57,7 +55,6 @@ def test_basic_lambda_no_debug_logs_visible(
     )
 
 
-@pytest.mark.e2e
 def test_basic_lambda_contextual_data_logged(execute_lambda: conftest.InfrastructureOutput):
     # GIVEN
     required_keys = (
@@ -82,7 +79,6 @@ def test_basic_lambda_contextual_data_logged(execute_lambda: conftest.Infrastruc
     assert all(keys in logs.dict(exclude_unset=True) for logs in filtered_logs for keys in required_keys)
 
 
-@pytest.mark.e2e
 def test_basic_lambda_additional_key_persistence_basic_lambda(
     execute_lambda: conftest.InfrastructureOutput, config: conftest.LambdaConfig
 ):
@@ -105,7 +101,6 @@ def test_basic_lambda_additional_key_persistence_basic_lambda(
     )
 
 
-@pytest.mark.e2e
 def test_basic_lambda_empty_event_logged(execute_lambda: conftest.InfrastructureOutput):
 
     # GIVEN
@@ -122,7 +117,6 @@ def test_basic_lambda_empty_event_logged(execute_lambda: conftest.Infrastructure
     assert any(log.message == {} for log in filtered_logs)
 
 
-@pytest.mark.e2e
 def test_no_context_lambda_contextual_data_not_logged(execute_lambda: conftest.InfrastructureOutput):
 
     # GIVEN
@@ -147,7 +141,6 @@ def test_no_context_lambda_contextual_data_not_logged(execute_lambda: conftest.I
     assert not any(keys in logs.dict(exclude_unset=True) for logs in filtered_logs for keys in required_missing_keys)
 
 
-@pytest.mark.e2e
 def test_no_context_lambda_event_not_logged(execute_lambda: conftest.InfrastructureOutput):
 
     # GIVEN

tests/e2e/metrics/test_metrics.py

@@ -14,13 +14,12 @@ def config() -> conftest.LambdaConfig:
         "parameters": {},
         "environment_variables": {
             "POWERTOOLS_METRICS_NAMESPACE": "powertools-e2e-metric",
-            "POWERTOOLS_SERVICE_NAME": f"test-powertools-service",
+            "POWERTOOLS_SERVICE_NAME": "test-powertools-service",
             "METRIC_NAME": f"business-metric-{uuid.uuid4()}",
         },
     }
 
 
-@pytest.mark.e2e
 def test_basic_lambda_metric_visible(execute_lambda: conftest.InfrastructureOutput, config: conftest.LambdaConfig):
     # GIVEN
     start_date = execute_lambda.get_lambda_execution_time()

tests/e2e/tracer/handlers/basic_handler.py

@@ -13,13 +13,11 @@
 
 @tracer.capture_lambda_handler
 def lambda_handler(event: dict, context: LambdaContext):
-    # tracer.put_annotation(key=ANNOTATION_KEY, value=ANNOTATION_VALUE)
     tracer.put_metadata(key=ANNOTATION_KEY, value=ANNOTATION_VALUE)
     return asyncio.run(collect_payment())
 
 
 @tracer.capture_method
 async def collect_payment() -> str:
-    # tracer.put_annotation(key=ANNOTATION_KEY, value=ANNOTATION_ASYNC_VALUE)
     tracer.put_metadata(key=ANNOTATION_KEY, value=ANNOTATION_ASYNC_VALUE)
     return "success"

tests/e2e/tracer/test_tracer.py

@@ -1,5 +1,4 @@
 import datetime
-import json
 import uuid
 
 import boto3
@@ -21,18 +20,18 @@ def config():
     }
 
 
-@pytest.mark.e2e
 def test_basic_lambda_async_trace_visible(execute_lambda: conftest.InfrastructureOutput, config: conftest.LambdaConfig):
     # GIVEN
     lambda_arn = execute_lambda.get_lambda_arn(name="basichandlerarn")
     start_date = execute_lambda.get_lambda_execution_time()
     end_date = start_date + datetime.timedelta(minutes=5)
+    trace_filter_exporession = f'service("{lambda_arn.split(":")[-1]}")'
 
     # WHEN
     trace = helpers.get_traces(
         start_date=start_date,
         end_date=end_date,
-        lambda_function_name=lambda_arn.split(":")[-1],
+        filter_expression=trace_filter_exporession,
         xray_client=boto3.client("xray"),
     )
 

tests/e2e/utils/helpers.py

@@ -55,33 +55,27 @@ def get_logs(lambda_function_name: str, log_client: CloudWatchClient, start_time
 
 
 @lru_cache(maxsize=10, typed=False)
-@retry(ValueError, delay=1, jitter=1, tries=10)
+@retry(ValueError, delay=1, jitter=1, tries=20)
 def get_metrics(
     namespace: str,
     cw_client: CloudWatchClient,
     start_date: datetime,
-    end_date: datetime,
     metric_name: str,
     service_name: str,
+    end_date: Optional[datetime] = None,
 ):
     response = cw_client.get_metric_data(
         MetricDataQueries=[
             {
                 "Id": "m1",
-                "MetricStat": {
-                    "Metric": {
-                        "Namespace": namespace,
-                        "MetricName": metric_name,
-                        "Dimensions": [{"Name": "service", "Value": service_name}],
-                    },
-                    "Period": 600,
-                    "Stat": "Maximum",
-                },
+                "Expression": f'SELECT MAX("{metric_name}") from SCHEMA("{namespace}",service) \
+                    where service=\'{service_name}\'',
                 "ReturnData": True,
+                "Period": 600,
             },
         ],
         StartTime=start_date,
-        EndTime=end_date,
+        EndTime=end_date if end_date else datetime.utcnow(),
     )
     result = response["MetricDataResults"][0]
     if not result["Values"]:
@@ -90,14 +84,14 @@ def get_metrics(
 
 
 @retry(ValueError, delay=1, jitter=1, tries=10)
-def get_traces(lambda_function_name: str, xray_client: XRayClient, start_date: datetime, end_date: datetime) -> Dict:
+def get_traces(filter_expression: str, xray_client: XRayClient, start_date: datetime, end_date: datetime) -> Dict:
     paginator = xray_client.get_paginator("get_trace_summaries")
     response_iterator = paginator.paginate(
         StartTime=start_date,
         EndTime=end_date,
         TimeRangeType="Event",
         Sampling=False,
-        FilterExpression=f'service("{lambda_function_name}")',
+        FilterExpression=filter_expression,
     )
 
     traces = [trace["TraceSummaries"][0]["Id"] for trace in response_iterator if trace["TraceSummaries"]]

tests/e2e/utils/infrastructure.py

@@ -55,10 +55,10 @@ def _create_layer(self, stack: Stack):
                     command=[
                         "bash",
                         "-c",
-                        f"poetry export --with-credentials --format requirements.txt --output /tmp/requirements.txt &&\
+                        rf"poetry export --with-credentials --format requirements.txt --output /tmp/requirements.txt &&\
                             pip install -r /tmp/requirements.txt -t {output_dir} &&\
                             cp -R {input_dir} {output_dir} &&\
-                            find {output_dir}/ -regex '^.*__pycache__.*' -delete",
+                            find {output_dir}/ -type d -name __pycache__ -prune -exec rm -rf {{}} \;",
                     ],
                 ),
             ),