diff --git a/aws/logs_monitoring/enhanced_lambda_metrics.py b/aws/logs_monitoring/enhanced_lambda_metrics.py
index ab88b0cd..73bc2b96 100644
--- a/aws/logs_monitoring/enhanced_lambda_metrics.py
+++ b/aws/logs_monitoring/enhanced_lambda_metrics.py
@@ -85,7 +85,7 @@
 logger.setLevel(logging.getLevelName(os.environ.get("DD_LOG_LEVEL", "INFO").upper()))
 
 try:
-    from datadog_lambda.metric import lambda_stats
+    from datadog_lambda.metric import lambda_metric
 
     DD_SUBMIT_ENHANCED_METRICS = True
 except ImportError:
@@ -136,9 +136,7 @@ def submit_to_dd(self):
         logger.debug(
             "Submitting metric {} {} {}".format(self.name, self.value, self.tags)
         )
-        lambda_stats.distribution(
-            self.name, self.value, timestamp=timestamp, tags=self.tags
-        )
+        lambda_metric(self.name, self.value, timestamp=timestamp, tags=self.tags)
 
 
 def get_last_modified_time(s3_file):
diff --git a/aws/logs_monitoring/forwarder.py b/aws/logs_monitoring/forwarder.py
index fa600a27..d5067721 100644
--- a/aws/logs_monitoring/forwarder.py
+++ b/aws/logs_monitoring/forwarder.py
@@ -144,7 +144,7 @@ def _forward_logs(self, logs, key=None):
     def _forward_metrics(self, metrics, key=None):
         """
         Forward custom metrics submitted via logs to Datadog in a background thread
-        using `lambda_stats` that is provided by the Datadog Python Lambda Layer.
+        using `lambda_metric` that is provided by the Datadog Python Lambda Layer.
         """
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug(f"Forwarding {len(metrics)} metrics")
diff --git a/aws/logs_monitoring/template.yaml b/aws/logs_monitoring/template.yaml
index 932060d4..5651292e 100644
--- a/aws/logs_monitoring/template.yaml
+++ b/aws/logs_monitoring/template.yaml
@@ -292,11 +292,14 @@ Parameters:
       - CRITICAL
   DdTraceEnabled:
     Type: String
-    Default: "true"
+    Default: "false"
     AllowedValues:
       - "true"
       - "false"
-    Description: Set to false to disable trace creation and forwarding for the forwarder itself. Enabling this may incur additional Serverless APM charges. See https://docs.datadoghq.com/tracing/trace_collection/library_config/python/#traces
+    Description: |
+      Set to true to enable trace creation for the forwarder itself.
+      Lambda forwarder should be instrumented to forward these traces to Datadog, see https://docs.datadoghq.com/serverless/aws_lambda/.
+      Enabling this may incur additional Serverless APM charges. See https://docs.datadoghq.com/tracing/trace_collection/library_config/python/#traces.
   DdEnhancedMetrics:
     Type: String
     Default: "false"
diff --git a/aws/logs_monitoring/tools/integration_tests/docker-compose.yml b/aws/logs_monitoring/tools/integration_tests/docker-compose.yml
index 96754366..86e6b57d 100644
--- a/aws/logs_monitoring/tools/integration_tests/docker-compose.yml
+++ b/aws/logs_monitoring/tools/integration_tests/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   recorder:
     image: ${PYTHON_BASE}
diff --git a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh
index 8d9521ca..dd3ec382 100755
--- a/aws/logs_monitoring/tools/integration_tests/integration_tests.sh
+++ b/aws/logs_monitoring/tools/integration_tests/integration_tests.sh
@@ -20,10 +20,10 @@ SNAPSHOT_DIR="${INTEGRATION_TESTS_DIR}/${SNAPSHOTS_DIR_NAME}/*"
 SNAPS=($SNAPSHOT_DIR)
 ADDITIONAL_LAMBDA=false
 CACHE_TEST=false
-DD_FETCH_LAMBDA_TAGS="true"
-DD_FETCH_LOG_GROUP_TAGS="true"
-DD_FETCH_STEP_FUNCTIONS_TAGS="true"
-DD_STORE_FAILED_EVENTS="true"
+DD_FETCH_LAMBDA_TAGS="false"
+DD_FETCH_LOG_GROUP_TAGS="false"
+DD_FETCH_STEP_FUNCTIONS_TAGS="false"
+DD_STORE_FAILED_EVENTS="false"
 
 script_start_time=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 echo "Starting script time: $script_start_time"
@@ -85,6 +85,8 @@ if [ $CACHE_TEST == true ]; then
 
         SNAPSHOTS_DIR_NAME="snapshots-cache-test"
         DD_FETCH_LAMBDA_TAGS="true"
+        DD_FETCH_LOG_GROUP_TAGS="true"
+        DD_FETCH_STEP_FUNCTIONS_TAGS="true"
 
         # Deploy test lambda function with tags
         AWS_LAMBDA_FUNCTION_INVOKED="cache_test_lambda"
diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot
index b6e42af2..2b175380 100644
--- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot
+++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_customized_log_group_lambda_invocation.json~snapshot
@@ -91,51 +91,6 @@
     {
       "data": {
         "series": [
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.list_tags_log_group_api_call",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_write_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
           {
             "device": null,
             "host": null,
@@ -147,7 +102,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -162,7 +117,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -177,7 +132,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           }
diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot
index cebea35d..1eb5dc50 100644
--- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot
+++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log.json~snapshot
@@ -64,51 +64,6 @@
     {
       "data": {
         "series": [
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.list_tags_log_group_api_call",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_write_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
           {
             "device": null,
             "host": null,
@@ -120,7 +75,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -135,7 +90,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -150,7 +105,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           }
diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot
index 161c808a..5983e34c 100644
--- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot
+++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_cloudtrail.json~snapshot
@@ -100,51 +100,6 @@
     {
       "data": {
         "series": [
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.list_tags_log_group_api_call",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_write_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
           {
             "device": null,
             "host": null,
@@ -156,7 +111,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -171,7 +126,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -186,7 +141,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           }
diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot
index 7b3430f4..6f770a10 100644
--- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot
+++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_coldstart.json~snapshot
@@ -1,80 +1,108 @@
 {
   "events": [
     {
-      "data": {
-        "series": [
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
+      "data": [
+        {
+          "aws": {
+            "awslogs": {
+              "logGroup": "/aws/lambda/storms-cloudwatch-event",
+              "logStream": "2020/06/04/[$LATEST]af2b1e1843b84a2d80c67840ae3ffa72",
+              "owner": "601427279990"
+            },
+            "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function"
           },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.list_tags_log_group_api_call",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
+          "ddsource": "lambda",
+          "ddsourcecategory": "aws",
+          "ddtags": "forwardername:test_function,forwarder_version:<redacted from snapshot>,env:none,aws_account:012345678912,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event",
+          "host": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event",
+          "id": "35486831490800643125153606102923171443962457178576257024",
+          "lambda": {
+            "arn": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event"
           },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_write_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
+          "message": "START RequestId: <redacted from snapshot> Version: $LATEST\\n",
+          "service": "storms-cloudwatch-event",
+          "timestamp": 1591284559098
+        },
+        {
+          "aws": {
+            "awslogs": {
+              "logGroup": "/aws/lambda/storms-cloudwatch-event",
+              "logStream": "2020/06/04/[$LATEST]af2b1e1843b84a2d80c67840ae3ffa72",
+              "owner": "601427279990"
+            },
+            "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function"
           },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.incoming_events",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
+          "ddsource": "lambda",
+          "ddsourcecategory": "aws",
+          "ddtags": "forwardername:test_function,forwarder_version:<redacted from snapshot>,env:none,aws_account:012345678912,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event",
+          "host": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event",
+          "id": "35486831490867545360749197972347778598780402263094198273",
+          "lambda": {
+            "arn": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event"
           },
+          "message": "END RequestId: <redacted from snapshot>\\n",
+          "service": "storms-cloudwatch-event",
+          "timestamp": 1591284559101
+        },
+        {
+          "aws": {
+            "awslogs": {
+              "logGroup": "/aws/lambda/storms-cloudwatch-event",
+              "logStream": "2020/06/04/[$LATEST]af2b1e1843b84a2d80c67840ae3ffa72",
+              "owner": "601427279990"
+            },
+            "invoked_function_arn": "arn:aws:lambda:us-east-1:012345678912:function:test_function"
+          },
+          "ddsource": "lambda",
+          "ddsourcecategory": "aws",
+          "ddtags": "forwardername:test_function,forwarder_version:<redacted from snapshot>,env:none,aws_account:012345678912,functionname:storms-cloudwatch-event,region:us-east-1,service:storms-cloudwatch-event",
+          "host": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event",
+          "id": "35486831490867545360749197972347778598780402263094198274",
+          "lambda": {
+            "arn": "arn:aws:lambda:us-east-1:012345678912:function:storms-cloudwatch-event"
+          },
+          "message": "REPORT RequestId: <redacted from snapshot>\\tDuration: 1.76 ms\\tBilled Duration: 100 ms\\tMemory Size: 128 MB\\tMax Memory Used: 48 MB\\tInit Duration: 120.96 ms\\t\\n",
+          "service": "storms-cloudwatch-event",
+          "timestamp": 1591284559101
+        }
+      ],
+      "headers": {
+        "Accept": "*/*",
+        "Accept-Encoding": "gzip, deflate",
+        "Connection": "keep-alive",
+        "Content-Length": "<redacted from snapshot>",
+        "Content-type": "application/json",
+        "DD-API-KEY": "abcdefghijklmnopqrstuvwxyz012345",
+        "DD-EVP-ORIGIN": "aws_forwarder",
+        "DD-EVP-ORIGIN-VERSION": "<redacted from snapshot>",
+        "DD-STORAGE-TAG": "s3,cloudwatch",
+        "Host": "recorder:8080",
+        "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"
+    },
+    {
+      "data": {
+        "series": [
           {
             "device": null,
             "host": null,
             "interval": 10,
-            "metric": "aws.dd_forwarder.local_lambda_cache_expired",
+            "metric": "aws.dd_forwarder.incoming_events",
             "points": "<redacted from snapshot>",
             "tags": [
               "forwardername:test_function",
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -82,14 +110,14 @@
             "device": null,
             "host": null,
             "interval": 10,
-            "metric": "aws.dd_forwarder.s3_cache_fetch_failure",
+            "metric": "aws.dd_forwarder.logs_forwarded",
             "points": "<redacted from snapshot>",
             "tags": [
               "forwardername:test_function",
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -97,14 +125,14 @@
             "device": null,
             "host": null,
             "interval": 10,
-            "metric": "aws.dd_forwarder.s3_cache_expired",
+            "metric": "aws.dd_forwarder.metrics_forwarded",
             "points": "<redacted from snapshot>",
             "tags": [
               "forwardername:test_function",
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           }
diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot
index cd04b92e..b4e4a82e 100644
--- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot
+++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_custom_tags.json~snapshot
@@ -46,21 +46,6 @@
     {
       "data": {
         "series": [
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_local_cache_hit",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
           {
             "device": null,
             "host": null,
@@ -72,7 +57,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -87,7 +72,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -102,7 +87,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           }
diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot
index 5c831c8b..13183e3f 100644
--- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot
+++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_lambda_invocation.json~snapshot
@@ -718,51 +718,6 @@
     {
       "data": {
         "series": [
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.list_tags_log_group_api_call",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_write_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
           {
             "device": null,
             "host": null,
@@ -774,7 +729,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -789,7 +744,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -804,7 +759,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -819,7 +774,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -844,7 +799,7 @@
               "functionname:hello-dog-node-dev-hello12x",
               "region:us-east-1",
               "service:hello-dog-node-dev-hello12x",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -855,7 +810,7 @@
             "metric": "hello.js10x.dog-2",
             "points": "<redacted from snapshot>",
             "tags": [
-              "dd_lambda_layer:datadog-nodev12.14.1",
+              "dd_lambda_layer:<redacted from snapshot>",
               "function_arn:arn:aws:lambda:us-east-1:012345678912:function:hello-dog-node-dev-hello12x",
               "forwardername:test_function",
               "forwarder_version:<redacted from snapshot>",
@@ -864,7 +819,7 @@
               "functionname:hello-dog-node-dev-hello12x",
               "region:us-east-1",
               "service:hello-dog-node-dev-hello12x",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -879,7 +834,8 @@
               "cold_start:false",
               "region:us-east-1",
               "aws_account:012345678912",
-              "functionname:hello-dog-node-dev-hello12x"
+              "functionname:hello-dog-node-dev-hello12x",
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -894,7 +850,8 @@
               "cold_start:false",
               "region:us-east-1",
               "aws_account:012345678912",
-              "functionname:hello-dog-node-dev-hello12x"
+              "functionname:hello-dog-node-dev-hello12x",
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -909,7 +866,8 @@
               "cold_start:false",
               "region:us-east-1",
               "aws_account:012345678912",
-              "functionname:hello-dog-node-dev-hello12x"
+              "functionname:hello-dog-node-dev-hello12x",
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -924,7 +882,8 @@
               "cold_start:false",
               "region:us-east-1",
               "aws_account:012345678912",
-              "functionname:hello-dog-node-dev-hello12x"
+              "functionname:hello-dog-node-dev-hello12x",
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           }
@@ -951,4 +910,4 @@
       "verb": "POST"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot
index 674f47ef..fe96782f 100644
--- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot
+++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_service_tag.json~snapshot
@@ -46,21 +46,6 @@
     {
       "data": {
         "series": [
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_local_cache_hit",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
           {
             "device": null,
             "host": null,
@@ -72,7 +57,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -87,7 +72,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -102,7 +87,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           }
diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot
index 5af19a91..7d6c7a9f 100644
--- a/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot
+++ b/aws/logs_monitoring/tools/integration_tests/snapshots/cloudwatch_log_timeout.json~snapshot
@@ -112,21 +112,6 @@
     {
       "data": {
         "series": [
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_local_cache_hit",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
           {
             "device": null,
             "host": null,
@@ -138,7 +123,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -153,7 +138,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -168,7 +153,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -181,7 +166,8 @@
             "tags": [
               "region:us-east-1",
               "aws_account:012345678912",
-              "functionname:storms-cloudwatch-event"
+              "functionname:storms-cloudwatch-event",
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           }
diff --git a/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot b/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot
index bc154d8b..c50c55e4 100644
--- a/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot
+++ b/aws/logs_monitoring/tools/integration_tests/snapshots/step_functions_log.json~snapshot
@@ -46,51 +46,6 @@
     {
       "data": {
         "series": [
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_fetch_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.list_tags_log_group_api_call",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
-          {
-            "device": null,
-            "host": null,
-            "interval": 10,
-            "metric": "aws.dd_forwarder.loggroup_cache_write_failure",
-            "points": "<redacted from snapshot>",
-            "tags": [
-              "forwardername:test_function",
-              "forwarder_memorysize:3008",
-              "forwarder_version:<redacted from snapshot>",
-              "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
-            ],
-            "type": "distribution"
-          },
           {
             "device": null,
             "host": null,
@@ -102,7 +57,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -117,7 +72,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           },
@@ -132,7 +87,7 @@
               "forwarder_memorysize:3008",
               "forwarder_version:<redacted from snapshot>",
               "event_type:awslogs",
-              "dd_lambda_layer:datadog-python313_8.120.0"
+              "dd_lambda_layer:<redacted from snapshot>"
             ],
             "type": "distribution"
           }
diff --git a/aws/logs_monitoring/tools/integration_tests/tester/test_snapshots.py b/aws/logs_monitoring/tools/integration_tests/tester/test_snapshots.py
index 08826bf9..5e759a22 100644
--- a/aws/logs_monitoring/tools/integration_tests/tester/test_snapshots.py
+++ b/aws/logs_monitoring/tools/integration_tests/tester/test_snapshots.py
@@ -74,6 +74,12 @@ def filter_snapshot(self, snapshot):
             "forwarder_version:<redacted from snapshot>",
             snapshot,
         )
+        # Lambda layer version in tags
+        snapshot = re.sub(
+            r"dd_lambda_layer:[^,\s\"]+",
+            "dd_lambda_layer:<redacted from snapshot>",
+            snapshot,
+        )
         # Forwarder version in trace payloads
         snapshot = re.sub(
             r"\"forwarder_version\":\s\"\d+\.\d+\.\d+\"",