Update github workflow

.github/workflows/integration_test.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.11", "3.12"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.10', '3.11']
+        python-version: ['3.11', '3.12']
     steps:
       - name: Checkout source
         uses: actions/checkout@v3

aws/logs_monitoring/requirements.txt

@@ -4,7 +4,7 @@ cattrs
 certifi
 charset-normalizer
 datadog-lambda==6.104.0
-datadog==0.48.0
+datadog==0.50.2
 ddsketch==3.0.1
 ddtrace==2.17.3
 deprecated

aws/logs_monitoring/template.yaml

@@ -259,6 +259,13 @@ Parameters:
       - WARN
       - ERROR
       - CRITICAL
+  DdTraceEnabled:
+    Type: String
+    Default: true
+    AllowedValues:
+      - true
+      - false
+    Description: Set to false to disable trace forwarding.
 Conditions:
   IsAWSChina: !Equals [!Ref 'AWS::Partition', aws-cn]
   IsGovCloud: !Equals [!Ref 'AWS::Partition', aws-us-gov]
@@ -348,6 +355,7 @@ Conditions:
     - !Equals [!Join ["", !Ref VPCSubnetIds], ""]
   SetDdLogLevel: !Not
     - !Equals [!Ref DdLogLevel, ""]
+  SetDdTraceEnabled: !Equals [!Ref DdTraceEnabled, false]
 Rules:
   MustSetDdApiKey:
     Assertions:
@@ -540,6 +548,10 @@ Resources:
             - SetDdLogLevel
             - !Ref DdLogLevel
             - !Ref AWS::NoValue
+          DD_TRACE_ENABLED: !If
+            - SetDdTraceEnabled
+            - !Ref DdTraceEnabled
+            - "false"
       ReservedConcurrentExecutions: !If
         - SetReservedConcurrentExecutions
         - !Ref ReservedConcurrency

aws/logs_monitoring/tools/integration_tests/docker-compose.yml

@@ -27,7 +27,6 @@ services:
       AWS_SECURITY_TOKEN: "${AWS_SECURITY_TOKEN}"
       AWS_SESSION_TOKEN: "${AWS_SESSION_TOKEN}"
       AWS_DEFAULT_REGION: us-east-1
-      DOCKER_LAMBDA_STAY_OPEN: 1
       DD_LOG_LEVEL: ${LOG_LEVEL:-info}
       DD_API_KEY: abcdefghijklmnopqrstuvwxyz012345 # Must be 32 characters exactly
       DD_URL: recorder # Used for logs intake
@@ -46,6 +45,7 @@ services:
       DD_FETCH_LOG_GROUP_TAGS: "true"
       DD_FETCH_STEP_FUNCTIONS_TAGS: "false"  # intentionally set false to allow integration test for step function logs to run without hitting aws
       DD_STORE_FAILED_EVENTS: "false"
+      DD_TRACE_ENABLED: "true"
     expose:
       - 8080
     depends_on:
@@ -60,7 +60,7 @@ services:
 
   tester:
     image: ${PYTHON_BASE}
-    command: /bin/sh -c 'pip install "deepdiff<6" && pip install "urllib3" && python -m unittest discover'
+    command: /bin/sh -c 'pip install "deepdiff<6" && python -m unittest discover'
     volumes:
       - ./tester:/tester
       - ${SNAPSHOTS_DIR_NAME}:/snapshots

aws/logs_monitoring/tools/integration_tests/forwarder/Dockerfile

@@ -5,5 +5,3 @@ ARG forwarder
 
 # Add the code into /var/task (will unzip files)
 ADD $forwarder /var/task/
-
-CMD ["lambda_function.lambda_handler"]

aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot

@@ -79,7 +79,13 @@
         "DD-EVP-ORIGIN": "aws_forwarder",
         "DD-EVP-ORIGIN-VERSION": "<redacted from snapshot>",
         "Host": "recorder:8080",
-        "User-Agent": "<redacted from snapshot>"
+        "User-Agent": "<redacted from snapshot>",
+        "traceparent": "<redacted from snapshot>",
+        "tracestate": "<redacted from snapshot>",
+        "x-datadog-parent-id": "<redacted from snapshot>",
+        "x-datadog-sampling-priority": "1",
+        "x-datadog-tags": "<redacted from snapshot>",
+        "x-datadog-trace-id": "<redacted from snapshot>"
       },
       "path": "/api/v2/logs",
       "verb": "POST"
@@ -182,7 +188,13 @@
         "Content-Type": "application/json",
         "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345",
         "Host": "recorder:8080",
-        "User-Agent": "<redacted from snapshot>"
+        "User-Agent": "<redacted from snapshot>",
+        "traceparent": "<redacted from snapshot>",
+        "tracestate": "<redacted from snapshot>",
+        "x-datadog-parent-id": "<redacted from snapshot>",
+        "x-datadog-sampling-priority": "1",
+        "x-datadog-tags": "<redacted from snapshot>",
+        "x-datadog-trace-id": "<redacted from snapshot>"
       },
       "path": "/api/v1/distribution_points",
       "verb": "POST"

aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot

@@ -51,7 +51,13 @@
         "DD-EVP-ORIGIN": "aws_forwarder",
         "DD-EVP-ORIGIN-VERSION": "<redacted from snapshot>",
         "Host": "recorder:8080",
-        "User-Agent": "<redacted from snapshot>"
+        "User-Agent": "<redacted from snapshot>",
+        "traceparent": "<redacted from snapshot>",
+        "tracestate": "<redacted from snapshot>",
+        "x-datadog-parent-id": "<redacted from snapshot>",
+        "x-datadog-sampling-priority": "1",
+        "x-datadog-tags": "<redacted from snapshot>",
+        "x-datadog-trace-id": "<redacted from snapshot>"
       },
       "path": "/api/v2/logs",
       "verb": "POST"
@@ -154,7 +160,13 @@
         "Content-Type": "application/json",
         "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345",
         "Host": "recorder:8080",
-        "User-Agent": "<redacted from snapshot>"
+        "User-Agent": "<redacted from snapshot>",
+        "traceparent": "<redacted from snapshot>",
+        "tracestate": "<redacted from snapshot>",
+        "x-datadog-parent-id": "<redacted from snapshot>",
+        "x-datadog-sampling-priority": "1",
+        "x-datadog-tags": "<redacted from snapshot>",
+        "x-datadog-trace-id": "<redacted from snapshot>"
       },
       "path": "/api/v1/distribution_points",
       "verb": "POST"

aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_apigateway.json~snapshot

@@ -76,7 +76,13 @@
         "DD-EVP-ORIGIN": "aws_forwarder",
         "DD-EVP-ORIGIN-VERSION": "<redacted from snapshot>",
         "Host": "recorder:8080",
-        "User-Agent": "<redacted from snapshot>"
+        "User-Agent": "<redacted from snapshot>",
+        "traceparent": "<redacted from snapshot>",
+        "tracestate": "<redacted from snapshot>",
+        "x-datadog-parent-id": "<redacted from snapshot>",
+        "x-datadog-sampling-priority": "1",
+        "x-datadog-tags": "<redacted from snapshot>",
+        "x-datadog-trace-id": "<redacted from snapshot>"
       },
       "path": "/api/v2/logs",
       "verb": "POST"
@@ -179,7 +185,13 @@
         "Content-Type": "application/json",
         "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345",
         "Host": "recorder:8080",
-        "User-Agent": "<redacted from snapshot>"
+        "User-Agent": "<redacted from snapshot>",
+        "traceparent": "<redacted from snapshot>",
+        "tracestate": "<redacted from snapshot>",
+        "x-datadog-parent-id": "<redacted from snapshot>",
+        "x-datadog-sampling-priority": "1",
+        "x-datadog-tags": "<redacted from snapshot>",
+        "x-datadog-trace-id": "<redacted from snapshot>"
       },
       "path": "/api/v1/distribution_points",
       "verb": "POST"