fix minor tweaks

Author: florentinl

tests/appsec/test_traces.py

@@ -68,15 +68,20 @@ def setup_custom_span_tags(self):
         weblog.get("/waf", params={"key": "\n :"})  # rules.http_protocol_violation.crs_921_160
         weblog.get("/waf", headers={"random-key": "acunetix-user-agreement"})  # rules.security_scanner.crs_913_110
 
-    @bug(library="python_lambda", reason="APPSEC-58201")
     def test_custom_span_tags(self):
         """AppSec should store in all APM spans some tags when enabled."""
 
         spans = [span for _, span in interfaces.library.get_root_spans()]
         assert spans, "No root spans to validate"
-        spans = [s for s in spans if s.get("type") == "web"]
-        assert spans, "No spans of type web to validate"
+        spans = [s for s in spans if s.get("type") in ("web", "serverless")]
+        assert spans, "No spans of type web or serverless to validate"
         for span in spans:
+            if span.get("type") == "serverless" and "_dd.appsec.unsupported_event_type" in span["metrics"]:
+                # For serverless, the `healthcheck` event is not supported
+                assert (
+                    span["metrics"]["_dd.appsec.unsupported_event_type"] == 1
+                ), "_dd.appsec.unsupported_event_type should be 1 or 1.0"
+                continue
             assert "_dd.appsec.enabled" in span["metrics"], "Cannot find _dd.appsec.enabled in span metrics"
             assert span["metrics"]["_dd.appsec.enabled"] == 1, "_dd.appsec.enabled should be 1 or 1.0"
             assert "_dd.runtime_family" in span["meta"], "Cannot find _dd.runtime_family in span meta"
@@ -87,14 +92,15 @@ def test_custom_span_tags(self):
     def setup_header_collection(self):
         self.r = weblog.get("/headers", headers={"User-Agent": "Arachni/v1", "Content-Type": "text/plain"})
 
+    @bug(library="python_lambda", reason="APPSEC-58202")
     @bug(context.library < f"python@{PYTHON_RELEASE_GA_1_1}", reason="APMRP-360")
     @bug(context.library < "java@1.2.0", weblog_variant="spring-boot-openliberty", reason="APPSEC-6734")
     @bug(
         context.library < "nodejs@5.57.0",
         weblog_variant="fastify",
         reason="APPSEC-57432",  # Response headers collection not supported yet
     )
-    @irrelevant(context.library not in ["golang", "nodejs", "java", "dotnet"], reason="test")
+    @irrelevant(context.library not in ["golang", "nodejs", "java", "dotnet", "python_lambda"], reason="test")
     @irrelevant(context.scenario is scenarios.external_processing, reason="Irrelevant tag set for golang")
     def test_header_collection(self):
         """AppSec should collect some headers for http.request and http.response and store them in span tags.

utils/_context/_scenarios/__init__.py

@@ -1,10 +1,10 @@
 import json
 
-from utils._context._scenarios.aws_lambda import LambdaScenario
 from utils._context.header_tag_vars import VALID_CONFIGS, INVALID_CONFIGS, CONFIG_WILDCARD
 from utils.proxy.ports import ProxyPorts
 from utils.tools import update_environ_with_local_env
 
+from .aws_lambda import LambdaScenario
 from .core import Scenario, scenario_groups
 from .default import DefaultScenario
 from .endtoend import DockerScenario, EndToEndScenario

utils/_context/containers.py

@@ -1065,21 +1065,18 @@ def __init__(
         volumes = volumes or {}
 
         environment["DD_PROXY_HTTPS"] = f"http://proxy:{ProxyPorts.agent}"
-        environment["DD_PROXY_HTTP"] = f"http://proxy:{ProxyPorts.agent}"
-        environment["DD_APM_NON_LOCAL_TRAFFIC"] = (
-            "true"  # Required for the extension to receive traces from outside the container
-        )
+        environment["DD_LOG_LEVEL"] = "debug"
         volumes.update(
             {
                 "./utils/build/docker/agent/ca-certificates.crt": {
                     "bind": "/etc/ssl/certs/ca-certificates.crt",
                     "mode": "ro",
                 },
                 "./utils/build/docker/agent/datadog.yaml": {
-                    "bind": "/etc/datadog-agent/datadog.yaml",
+                    "bind": "/var/task/datadog.yaml",
                     "mode": "ro",
                 },
-            },
+            }
         )
 
         super().__init__(

utils/build/docker/python_lambda/apigw-rest.Dockerfile

@@ -14,5 +14,6 @@ COPY utils/build/docker/python_lambda/function/. ${LAMBDA_TASK_ROOT}
 RUN pip install -r ${LAMBDA_TASK_ROOT}/requirements.txt
 
 ENV DD_LAMBDA_HANDLER=handler.lambda_handler
+ENV DD_TRACE_MANAGED_SERVICES=false
 
 ENTRYPOINT ["/bin/sh"]

utils/build/docker/python_lambda/function/requirements.txt

@@ -1 +1 @@
-aws-lambda-powertools
+aws-lambda-powertools==3.17.0