From cb84b9d7883711f421f51f9145323c6a9629b1e9 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 9 Dec 2022 14:02:37 -0800
Subject: [PATCH 01/30] Move log normalization to python script.

---
 test/integration/serverless/log_normalize.py | 130 +++++++++++++++++++
 test/integration/serverless/run.sh           |  75 +----------
 2 files changed, 133 insertions(+), 72 deletions(-)
 create mode 100644 test/integration/serverless/log_normalize.py

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
new file mode 100644
index 0000000000000..3887ee17b6a14
--- /dev/null
+++ b/test/integration/serverless/log_normalize.py
@@ -0,0 +1,130 @@
+import argparse
+import re
+import sys
+
+metric_replaces = [
+        (r'raise Exception', r'\n'),
+        (r'(BEGINMETRIC)', r'\1'),
+        (r'(ENDMETRIC)', r'\1'),
+        (r'(ts":)[0-9]{10}', r'\1XXX'),
+        (r'(min":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        (r'(max":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        (r'(cnt":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        (r'(avg":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        (r'(sum":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        (r'(k":\[)[0-9\.e\-]{1,30}', r'\1XXX'),
+        (r'(datadog-nodev)[0-9]+\.[0-9]+\.[0-9]+', r'\1X\.X\.X'),
+        (r'(datadog_lambda:v)[0-9]+\.[0-9]+\.[0-9]+', r'\1X\.X\.X'),
+        (r'dd_lambda_layer:datadog-go[0-9.]{1,}', r'dd_lambda_layer:datadog-gox.x.x'),
+        (r'(dd_lambda_layer:datadog-python)[0-9_]+\.[0-9]+\.[0-9]+', r'\1X\.X\.X'),
+        (r'(serverless.lambda-extension.integration-test.count)[0-9\.]+', r'\1'),
+        (r'(architecture:)(x86_64|arm64)', r'\1XXX'),
+        (r'$stage', r'XXXXXX'),
+        (r'[ ]$', r''),
+]
+metric_excludes = [
+        r'BEGINLOG.*',
+        r'BEGINTRACE.*',
+]
+metric_requires = [
+        r'BEGINMETRIC.*',
+]
+
+log_replaces = [
+        (r'BEGINLOG', '\1'),
+        (r'ENDLOG', '\1'),
+        (r'("timestamp": )\d{13}', '\1"XXX"'),
+        (r'("timestamp": )\d{13}', '\1"XXX"'),
+        (r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}:\d{3}', 'TIMESTAMP'),
+        (r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z', 'TIMESTAMP'),
+        (r'\d{4}\/\d{2}\/\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
+        (r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
+        (r'"timestamp":\d{13},', '\1'),
+        (r'([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12})', '\0XXX'),
+        (r'([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12})', '\0XXX'),
+        (r'$stage', 'STAGE'),
+        (r'(architecture:)(x86_64|arm64)', '\1XXX'),
+        # ignore a Lambda error that occurs sporadically for log-csharp see here for more info:
+        # https://repost.aws/questions/QUq2OfIFUNTCyCKsChfJLr5w/lambda-function-working-locally-but-crashing-on-aws
+        # TODO
+        # perl -n -e "print unless /LAMBDA_RUNTIME Failed to get next invocation. No Response from endpoint/ or \
+        #  /An error occurred while attempting to execute your code.: LambdaException/ or \
+        #  /terminate called after throwing an instance of 'std::logic_error'/ or \
+        #  /basic_string::_M_construct null not valid/" |
+]
+log_excludes = [
+        r'BEGINMETRIC.*',
+        r'BEGINTRACE.*',
+]
+log_requires = [
+        r'BEGINLOG',
+]
+
+trace_replaces = [
+        (r'BEGINTRACE', '\1'),
+        (r'ENDTRACE', '\1'),
+        (r'(ts":)[0-9]{10}', '\1XXX'),
+        (r'((startTime|endTime|traceID|trace_id|span_id|parent_id|start|system.pid)":)[0-9]+', '\1null'),
+        (r'((tracer_version|language_version)":)["a-zA-Z0-9~\-\.\_]+', '\1null'),
+        (r'(duration":)[0-9]+', '\1null'),
+        (r'((datadog_lambda|dd_trace)":")[0-9]+\.[0-9]+\.[0-9]+', '\1X\.X\.X'),
+        (r'(,"request_id":")[a-zA-Z0-9\-,]+"', '\1null"'),
+        (r'(,"runtime-id":")[a-zA-Z0-9\-,]+"', '\1null"'),
+        (r'(,"system.pid":")[a-zA-Z0-9\-,]+"', '\1null"'),
+        (r'("_dd.no_p_sr":)[0-9\.]+', '\1null'),
+        (r'("architecture":)"(x86_64|arm64)"', '\1"XXX"'),
+        (r'("process_id":)[0-9]+', '\1null'),
+        (r'$stage', 'XXXXXX'),
+        (r'[ ]$', ''),
+]
+trace_excludes = [
+        r'BEGINMETRIC.*',
+        r'BEGINLOG.*',
+]
+trace_requires = [
+        r'BEGINTRACE',
+]
+
+def replace(logs, typ):
+    requires, excludes, replaces = get_updaters(typ)
+    for log in logs:
+        for pattern in requires:
+            if not pattern.search(log):
+                log = ''
+        for pattern in excludes:
+            if pattern.search(log):
+                log = ''
+        for pattern, replace in replaces:
+            log = pattern.sub(replace, log)
+        if log:
+            yield log
+
+def get_updaters(typ):
+    if typ == 'metric':
+        requires, excludes, replaces = (
+                metric_requires, metric_excludes, metric_replaces)
+    elif typ == 'log':
+        requires, excludes, replaces = (
+                log_requires, log_excludes, log_replaces)
+    elif typ == 'trace':
+        requires, excludes, replaces = (
+                trace_requires, trace_excludes, trace_replaces)
+    else:
+        raise ValueError(f'invalid type "{typ}"')
+
+    replaces = [(re.compile(i), j) for i, j in replaces]
+    excludes = [re.compile(i) for i in excludes]
+    requires = [re.compile(i) for i in requires]
+
+    return requires, excludes, replaces
+
+def parse_args():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--type', required=True)
+    parser.add_argument('--logs', required=True)
+    return parser.parse_args()
+
+if __name__ == '__main__':
+    args = parse_args()
+    for line in replace(args.logs.split('\n'), args.type):
+        print(line)
diff --git a/test/integration/serverless/run.sh b/test/integration/serverless/run.sh
index e420136d27534..d2ab343c6c451 100755
--- a/test/integration/serverless/run.sh
+++ b/test/integration/serverless/run.sh
@@ -216,82 +216,13 @@ for function_name in "${all_functions[@]}"; do
     # Replace invocation-specific data like timestamps and IDs with XXX to normalize across executions
     if [[ " ${metric_functions[*]} " =~ " ${function_name} " ]]; then
         # Normalize metrics
-        logs=$(
-            echo "$raw_logs" |
-                perl -p -e "s/raise Exception/\n/g" |
-                grep -v "BEGINLOG.*" |
-                grep -v "BEGINTRACE.*" |
-                grep "BEGINMETRIC.*" |
-                perl -p -e "s/BEGINMETRIC/\1/g" |
-                perl -p -e "s/ENDMETRIC/\1/g" |
-                perl -p -e "s/(ts\":)[0-9]{10}/\1XXX/g" |
-                perl -p -e "s/(min\":)[0-9\.e\-]{1,30}/\1XXX/g" |
-                perl -p -e "s/(max\":)[0-9\.e\-]{1,30}/\1XXX/g" |
-                perl -p -e "s/(cnt\":)[0-9\.e\-]{1,30}/\1XXX/g" |
-                perl -p -e "s/(avg\":)[0-9\.e\-]{1,30}/\1XXX/g" |
-                perl -p -e "s/(sum\":)[0-9\.e\-]{1,30}/\1XXX/g" |
-                perl -p -e "s/(k\":\[)[0-9\.e\-]{1,30}/\1XXX/g" |
-                perl -p -e "s/(datadog-nodev)[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" |
-                perl -p -e "s/(datadog_lambda:v)[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" |
-                perl -p -e "s/dd_lambda_layer:datadog-go[0-9.]{1,}/dd_lambda_layer:datadog-gox.x.x/g" |
-                perl -p -e "s/(dd_lambda_layer:datadog-python)[0-9_]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" |
-                perl -p -e "s/(serverless.lambda-extension.integration-test.count)[0-9\.]+/\1/g" |
-                perl -p -e "s/(architecture:)(x86_64|arm64)/\1XXX/g" |
-                perl -p -e "s/$stage/XXXXXX/g" |
-                perl -p -e "s/[ ]$//g" |
-                node parse-json.js
-        )
+        logs=$(python3 log_normalize.py --type metric --logs "$raw_logs" | node parse-json.js)
     elif [[ " ${log_functions[*]} " =~ " ${function_name} " ]]; then
         # Normalize logs
-        logs=$(
-            echo "$raw_logs" |
-                grep "BEGINLOG" |
-                grep -v "BEGINMETRIC.*" |
-                grep -v "BEGINTRACE.*" |
-                perl -p -e "s/BEGINLOG/\1/g" |
-                perl -p -e "s/ENDLOG/\1/g" |
-                perl -p -e "s/(\"timestamp\": )\d{13}/\1\"XXX\"/g" |
-                perl -p -e "s/(\"timestamp\": )\d{13}/\1\"XXX\"/g" |
-                perl -p -e "s/\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}:\d{3}/TIMESTAMP/g" |
-                perl -p -e "s/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z/TIMESTAMP/g" |
-                perl -p -e "s/\d{4}\/\d{2}\/\d{2}\s\d{2}:\d{2}:\d{2}/TIMESTAMP/g" |
-                perl -p -e "s/\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}/TIMESTAMP/g" |
-                perl -p -e "s/\"timestamp\":\d{13},/\1/g" |
-                perl -p -e "s/([a-zA-Z0-9]{8}\-[a-zA-Z0-9]{4}\-[a-zA-Z0-9]{4}\-[a-zA-Z0-9]{4}\-[a-zA-Z0-9]{12})/\0\XXX/g" |
-                perl -p -e "s/$stage/STAGE/g" |
-                perl -p -e "s/(architecture:)(x86_64|arm64)/\1XXX/g" |
-                # ignore a Lambda error that occurs sporadically for log-csharp
-                # see here for more info: https://repost.aws/questions/QUq2OfIFUNTCyCKsChfJLr5w/lambda-function-working-locally-but-crashing-on-aws
-                perl -n -e "print unless /LAMBDA_RUNTIME Failed to get next invocation. No Response from endpoint/ or \
-                 /An error occurred while attempting to execute your code.: LambdaException/ or \
-                 /terminate called after throwing an instance of 'std::logic_error'/ or \
-                 /basic_string::_M_construct null not valid/" |
-                node parse-json.js
-        )
+        logs=$(python3 log_normalize.py --type log --logs "$raw_logs" | node parse-json.js)
     else
         # Normalize traces
-        logs=$(
-            echo "$raw_logs" |
-                grep "BEGINTRACE" |
-                grep -v "BEGINMETRIC.*" |
-                grep -v "BEGINLOG.*" |
-                perl -p -e "s/BEGINTRACE/\1/g" |
-                perl -p -e "s/ENDTRACE/\1/g" |
-                perl -p -e "s/(ts\":)[0-9]{10}/\1XXX/g" |
-                perl -p -e "s/((startTime|endTime|traceID|trace_id|span_id|parent_id|start|system.pid)\":)[0-9]+/\1null/g" |
-                perl -p -e "s/((tracer_version|language_version)\":)[\"a-zA-Z0-9~\-\.\_]+/\1null/g" |
-                perl -p -e "s/(duration\":)[0-9]+/\1null/g" |
-                perl -p -e "s/((datadog_lambda|dd_trace)\":\")[0-9]+\.[0-9]+\.[0-9]+/\1X\.X\.X/g" |
-                perl -p -e "s/(,\"request_id\":\")[a-zA-Z0-9\-,]+\"/\1null\"/g" |
-                perl -p -e "s/(,\"runtime-id\":\")[a-zA-Z0-9\-,]+\"/\1null\"/g" |
-                perl -p -e "s/(,\"system.pid\":\")[a-zA-Z0-9\-,]+\"/\1null\"/g" |
-                perl -p -e "s/(\"_dd.no_p_sr\":)[0-9\.]+/\1null/g" |
-                perl -p -e "s/(\"architecture\":)\"(x86_64|arm64)\"/\1\"XXX\"/g" |
-                perl -p -e "s/(\"process_id\":)[0-9]+/\1null/g" |
-                perl -p -e "s/$stage/XXXXXX/g" |
-                perl -p -e "s/[ ]$//g" |
-                node parse-json.js
-        )
+        logs=$(python3 log_normalize.py --type trace --logs "$raw_logs" | node parse-json.js)
     fi
 
     function_snapshot_path="./snapshots/${function_name}"

From 68be51b1b1daad29b638bc434f42e310aea30911 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Thu, 15 Dec 2022 11:16:30 -0800
Subject: [PATCH 02/30] Write normalizers for proper parsing.

---
 test/integration/serverless/log_normalize.py | 212 +++++++++----------
 test/integration/serverless/parse-json.js    |  17 --
 test/integration/serverless/run.sh           |  14 +-
 3 files changed, 108 insertions(+), 135 deletions(-)
 delete mode 100644 test/integration/serverless/parse-json.js

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index 3887ee17b6a14..02cb633742941 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -1,130 +1,122 @@
 import argparse
+import json
 import re
 import sys
 
-metric_replaces = [
-        (r'raise Exception', r'\n'),
-        (r'(BEGINMETRIC)', r'\1'),
-        (r'(ENDMETRIC)', r'\1'),
-        (r'(ts":)[0-9]{10}', r'\1XXX'),
-        (r'(min":)[0-9\.e\-]{1,30}', r'\1XXX'),
-        (r'(max":)[0-9\.e\-]{1,30}', r'\1XXX'),
-        (r'(cnt":)[0-9\.e\-]{1,30}', r'\1XXX'),
-        (r'(avg":)[0-9\.e\-]{1,30}', r'\1XXX'),
-        (r'(sum":)[0-9\.e\-]{1,30}', r'\1XXX'),
-        (r'(k":\[)[0-9\.e\-]{1,30}', r'\1XXX'),
-        (r'(datadog-nodev)[0-9]+\.[0-9]+\.[0-9]+', r'\1X\.X\.X'),
-        (r'(datadog_lambda:v)[0-9]+\.[0-9]+\.[0-9]+', r'\1X\.X\.X'),
-        (r'dd_lambda_layer:datadog-go[0-9.]{1,}', r'dd_lambda_layer:datadog-gox.x.x'),
-        (r'(dd_lambda_layer:datadog-python)[0-9_]+\.[0-9]+\.[0-9]+', r'\1X\.X\.X'),
-        (r'(serverless.lambda-extension.integration-test.count)[0-9\.]+', r'\1'),
-        (r'(architecture:)(x86_64|arm64)', r'\1XXX'),
-        (r'$stage', r'XXXXXX'),
-        (r'[ ]$', r''),
-]
-metric_excludes = [
-        r'BEGINLOG.*',
-        r'BEGINTRACE.*',
-]
-metric_requires = [
-        r'BEGINMETRIC.*',
-]
+def normalize_metrics(stage):
+    return [
+            replace(r'raise Exception', r'\n'),
+            require(r'BEGINMETRIC.*ENDMETRIC'),
+            exclude(r'BEGINMETRIC'),
+            exclude(r'ENDMETRIC'),
+            replace(r'(ts":)[0-9]{10}', r'\1XXX'),
+            replace(r'(min":)[0-9\.e\-]{1,30}', r'\1XXX'),
+            replace(r'(max":)[0-9\.e\-]{1,30}', r'\1XXX'),
+            replace(r'(cnt":)[0-9\.e\-]{1,30}', r'\1XXX'),
+            replace(r'(avg":)[0-9\.e\-]{1,30}', r'\1XXX'),
+            replace(r'(sum":)[0-9\.e\-]{1,30}', r'\1XXX'),
+            replace(r'(k":\[)[0-9\.e\-]{1,30}', r'\1XXX'),
+            replace(r'(datadog-nodev)[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
+            replace(r'(datadog_lambda:v)[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
+            replace(r'dd_lambda_layer:datadog-go[0-9.]{1,}', r'dd_lambda_layer:datadog-gox.x.x'),
+            replace(r'(dd_lambda_layer:datadog-python)[0-9_]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
+            replace(r'(serverless.lambda-extension.integration-test.count)[0-9\.]+', r'\1'),
+            replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'),
+            replace(stage, 'XXXXXX'),
+            exclude(r'[ ]$'),
+    ]
 
-log_replaces = [
-        (r'BEGINLOG', '\1'),
-        (r'ENDLOG', '\1'),
-        (r'("timestamp": )\d{13}', '\1"XXX"'),
-        (r'("timestamp": )\d{13}', '\1"XXX"'),
-        (r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}:\d{3}', 'TIMESTAMP'),
-        (r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z', 'TIMESTAMP'),
-        (r'\d{4}\/\d{2}\/\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
-        (r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
-        (r'"timestamp":\d{13},', '\1'),
-        (r'([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12})', '\0XXX'),
-        (r'([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12})', '\0XXX'),
-        (r'$stage', 'STAGE'),
-        (r'(architecture:)(x86_64|arm64)', '\1XXX'),
-        # ignore a Lambda error that occurs sporadically for log-csharp see here for more info:
-        # https://repost.aws/questions/QUq2OfIFUNTCyCKsChfJLr5w/lambda-function-working-locally-but-crashing-on-aws
-        # TODO
-        # perl -n -e "print unless /LAMBDA_RUNTIME Failed to get next invocation. No Response from endpoint/ or \
-        #  /An error occurred while attempting to execute your code.: LambdaException/ or \
-        #  /terminate called after throwing an instance of 'std::logic_error'/ or \
-        #  /basic_string::_M_construct null not valid/" |
-]
-log_excludes = [
-        r'BEGINMETRIC.*',
-        r'BEGINTRACE.*',
-]
-log_requires = [
-        r'BEGINLOG',
-]
+def normalize_logs(stage):
+    return [
+            require(r'BEGINLOG.*ENDLOG'),
+            exclude(r'BEGINLOG'),
+            exclude(r'ENDLOG'),
+            #exclude(r'\n'),
+            #replace(r'("timestamp":\s*)\d{13}', r'\1"XXX"'),
+            replace(r'("timestamp":\s*?)\d{13}', r'\1"XXX"'),
+            replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}:\d{3}', 'TIMESTAMP'),
+            replace(r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z', 'TIMESTAMP'),
+            replace(r'\d{4}\/\d{2}\/\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
+            replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
+            #replace(r'"timestamp":\d{13},', '\1'),
+            #replace(r'"timestamp":\d{13},', ''),
+            replace(r'([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12})', r'XXX'),
+            replace(stage, 'XXXXXX'),
+            replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'),
+            # ignore a Lambda error that occurs sporadically for log-csharp see here for more info:
+            # https://repost.aws/questions/QUq2OfIFUNTCyCKsChfJLr5w/lambda-function-working-locally-but-crashing-on-aws
+            # TODO
+            # perl -n -e "print unless /LAMBDA_RUNTIME Failed to get next invocation. No Response from endpoint/ or \
+            #  /An error occurred while attempting to execute your code.: LambdaException/ or \
+            #  /terminate called after throwing an instance of 'std::logic_error'/ or \
+            #  /basic_string::_M_construct null not valid/" |
+    ]
 
-trace_replaces = [
-        (r'BEGINTRACE', '\1'),
-        (r'ENDTRACE', '\1'),
-        (r'(ts":)[0-9]{10}', '\1XXX'),
-        (r'((startTime|endTime|traceID|trace_id|span_id|parent_id|start|system.pid)":)[0-9]+', '\1null'),
-        (r'((tracer_version|language_version)":)["a-zA-Z0-9~\-\.\_]+', '\1null'),
-        (r'(duration":)[0-9]+', '\1null'),
-        (r'((datadog_lambda|dd_trace)":")[0-9]+\.[0-9]+\.[0-9]+', '\1X\.X\.X'),
-        (r'(,"request_id":")[a-zA-Z0-9\-,]+"', '\1null"'),
-        (r'(,"runtime-id":")[a-zA-Z0-9\-,]+"', '\1null"'),
-        (r'(,"system.pid":")[a-zA-Z0-9\-,]+"', '\1null"'),
-        (r'("_dd.no_p_sr":)[0-9\.]+', '\1null'),
-        (r'("architecture":)"(x86_64|arm64)"', '\1"XXX"'),
-        (r'("process_id":)[0-9]+', '\1null'),
-        (r'$stage', 'XXXXXX'),
-        (r'[ ]$', ''),
-]
-trace_excludes = [
-        r'BEGINMETRIC.*',
-        r'BEGINLOG.*',
-]
-trace_requires = [
-        r'BEGINTRACE',
-]
+def normalize_traces(stage):
+    return [
+            require(r'BEGINTRACE.*ENDTRACE'),
+            exclude(r'BEGINTRACE'),
+            exclude(r'ENDTRACE'),
+            replace(r'(ts":)[0-9]{10}', r'\1XXX'),
+            replace(r'((startTime|endTime|traceID|trace_id|span_id|parent_id|start|system.pid)":)[0-9]+', r'\1null'),
+            replace(r'((tracer_version|language_version)":)["a-zA-Z0-9~\-\.\_]+', r'\1null'),
+            replace(r'(duration":)[0-9]+', r'\1null'),
+            replace(r'((datadog_lambda|dd_trace)":")[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
+            replace(r'(,"request_id":")[a-zA-Z0-9\-,]+"', r'\1null"'),
+            replace(r'(,"runtime-id":")[a-zA-Z0-9\-,]+"', r'\1null"'),
+            replace(r'(,"system.pid":")[a-zA-Z0-9\-,]+"', r'\1null"'),
+            replace(r'("_dd.no_p_sr":)[0-9\.]+', r'\1null'),
+            replace(r'("architecture":)"(x86_64|arm64)"', r'\1"XXX"'),
+            replace(r'("process_id":)[0-9]+', r'\1null'),
+            replace(stage, 'XXXXXX'),
+            exclude(r'[ ]$'),
+    ]
 
-def replace(logs, typ):
-    requires, excludes, replaces = get_updaters(typ)
-    for log in logs:
-        for pattern in requires:
-            if not pattern.search(log):
-                log = ''
-        for pattern in excludes:
-            if pattern.search(log):
-                log = ''
-        for pattern, replace in replaces:
-            log = pattern.sub(replace, log)
-        if log:
-            yield log
+def replace(pattern, repl):
+    comp = re.compile(pattern, flags=re.DOTALL)
+    def _replace(log):
+        return comp.sub(repl, log)
+    return _replace
 
-def get_updaters(typ):
-    if typ == 'metric':
-        requires, excludes, replaces = (
-                metric_requires, metric_excludes, metric_replaces)
-    elif typ == 'log':
-        requires, excludes, replaces = (
-                log_requires, log_excludes, log_replaces)
-    elif typ == 'trace':
-        requires, excludes, replaces = (
-                trace_requires, trace_excludes, trace_replaces)
+def exclude(pattern):
+    comp = re.compile(pattern, flags=re.DOTALL)
+    return replace(pattern, '')
+
+def require(pattern):
+    comp = re.compile(pattern, flags=re.DOTALL)
+    def _require(log):
+        match = comp.search(log)
+        if not match:
+            return ''
+        return match.group(0)
+    return _require
+
+def normalize(log, typ, stage):
+    for normalizer in get_normalizers(typ, stage):
+        log = normalizer(log)
+    return format_json(log)
+
+def get_normalizers(typ, stage):
+    if typ == 'metrics':
+        return normalize_metrics(stage)
+    elif typ == 'logs':
+        return normalize_logs(stage)
+    elif typ == 'traces':
+        return normalize_traces(stage)
     else:
         raise ValueError(f'invalid type "{typ}"')
 
-    replaces = [(re.compile(i), j) for i, j in replaces]
-    excludes = [re.compile(i) for i in excludes]
-    requires = [re.compile(i) for i in requires]
-
-    return requires, excludes, replaces
+def format_json(log):
+    return json.dumps(json.loads(log, strict=False), indent=2)
 
 def parse_args():
     parser = argparse.ArgumentParser()
     parser.add_argument('--type', required=True)
     parser.add_argument('--logs', required=True)
+    parser.add_argument('--stage', required=True)
     return parser.parse_args()
 
 if __name__ == '__main__':
     args = parse_args()
-    for line in replace(args.logs.split('\n'), args.type):
-        print(line)
+    log = normalize(args.logs, args.type, args.stage)
+    print(json.dumps(json.loads(log), indent=2))
diff --git a/test/integration/serverless/parse-json.js b/test/integration/serverless/parse-json.js
deleted file mode 100644
index 8f7651144e1dd..0000000000000
--- a/test/integration/serverless/parse-json.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict'
-
-var readline = require('readline');
-var rl = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout,
-  terminal: false
-});
-
-rl.on('line', function(line){
-    try {
-      const obj = JSON.parse(line)
-      console.log(JSON.stringify(obj, null, 2))
-    } catch (e) {
-      console.log(line)
-    }
-})
\ No newline at end of file
diff --git a/test/integration/serverless/run.sh b/test/integration/serverless/run.sh
index d2ab343c6c451..42862c81b4a17 100755
--- a/test/integration/serverless/run.sh
+++ b/test/integration/serverless/run.sh
@@ -216,25 +216,23 @@ for function_name in "${all_functions[@]}"; do
     # Replace invocation-specific data like timestamps and IDs with XXX to normalize across executions
     if [[ " ${metric_functions[*]} " =~ " ${function_name} " ]]; then
         # Normalize metrics
-        logs=$(python3 log_normalize.py --type metric --logs "$raw_logs" | node parse-json.js)
+        logs=$(python3 log_normalize.py --type metrics --logs "$raw_logs" --stage $stage)
     elif [[ " ${log_functions[*]} " =~ " ${function_name} " ]]; then
         # Normalize logs
-        logs=$(python3 log_normalize.py --type log --logs "$raw_logs" | node parse-json.js)
+        logs=$(python3 log_normalize.py --type logs --logs "$raw_logs" --stage $stage)
     else
         # Normalize traces
-        logs=$(python3 log_normalize.py --type trace --logs "$raw_logs" | node parse-json.js)
+        logs=$(python3 log_normalize.py --type traces --logs "$raw_logs" --stage $stage)
     fi
 
     function_snapshot_path="./snapshots/${function_name}"
 
-    jsonLogs="$(echo $logs | node parse-json.js)"
-
     if [ ! -f "$function_snapshot_path" ]; then
         printf "${MAGENTA} CREATE ${END_COLOR} $function_name\n"
-        echo "$jsonLogs" >"$function_snapshot_path"
+        echo "$logs" >"$function_snapshot_path"
     elif [ "$UPDATE_SNAPSHOTS" == "true" ]; then
         printf "${MAGENTA} UPDATE ${END_COLOR} $function_name\n"
-        echo "$jsonLogs" > "$function_snapshot_path"
+        echo "$logs" > "$function_snapshot_path"
     else
         if [[ " ${functions_to_skip[*]} " =~ " ${function_name} " ]]; then
             printf "${YELLOW} SKIP ${END_COLOR} $function_name\n"
@@ -245,7 +243,7 @@ for function_name in "${all_functions[@]}"; do
             printf "${YELLOW} SKIP ${END_COLOR} $function_name, no .NET support on arm64\n"
             continue
         fi
-        diff_output=$(echo "$jsonLogs" | diff - "$function_snapshot_path")
+        diff_output=$(echo "$logs" | diff - "$function_snapshot_path")
         if [ $? -eq 1 ]; then
             failed_functions+=("$function_name")
 

From b3aeac5faf2b9a56b9a73d689361e8653088e026 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Thu, 15 Dec 2022 11:35:46 -0800
Subject: [PATCH 03/30] Sort logs by message string.

---
 test/integration/serverless/log_normalize.py  |  20 ++-
 .../integration/serverless/snapshots/log-node | 122 ++++++++++--------
 .../serverless/snapshots/trace-node           |   1 +
 3 files changed, 85 insertions(+), 58 deletions(-)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index 02cb633742941..92f2673057f85 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -31,18 +31,15 @@ def normalize_logs(stage):
             require(r'BEGINLOG.*ENDLOG'),
             exclude(r'BEGINLOG'),
             exclude(r'ENDLOG'),
-            #exclude(r'\n'),
-            #replace(r'("timestamp":\s*)\d{13}', r'\1"XXX"'),
             replace(r'("timestamp":\s*?)\d{13}', r'\1"XXX"'),
             replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}:\d{3}', 'TIMESTAMP'),
             replace(r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z', 'TIMESTAMP'),
             replace(r'\d{4}\/\d{2}\/\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
             replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
-            #replace(r'"timestamp":\d{13},', '\1'),
-            #replace(r'"timestamp":\d{13},', ''),
             replace(r'([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12})', r'XXX'),
             replace(stage, 'XXXXXX'),
             replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'),
+            sort_by(lambda log: log["message"]["message"]),
             # ignore a Lambda error that occurs sporadically for log-csharp see here for more info:
             # https://repost.aws/questions/QUq2OfIFUNTCyCKsChfJLr5w/lambda-function-working-locally-but-crashing-on-aws
             # TODO
@@ -72,6 +69,10 @@ def normalize_traces(stage):
             exclude(r'[ ]$'),
     ]
 
+#####################
+# BEGIN NORMALIZERS #
+#####################
+
 def replace(pattern, repl):
     comp = re.compile(pattern, flags=re.DOTALL)
     def _replace(log):
@@ -91,6 +92,17 @@ def _require(log):
         return match.group(0)
     return _require
 
+def sort_by(key):
+    def _sort(log):
+        log_json = json.loads(log, strict=False)
+        log_sorted = sorted(log_json, key=key)
+        return json.dumps(log_sorted)
+    return _sort
+
+###################
+# END NORMALIZERS #
+###################
+
 def normalize(log, typ, stage):
     for normalizer in get_normalizers(typ, stage):
         log = normalizer(log)
diff --git a/test/integration/serverless/snapshots/log-node b/test/integration/serverless/snapshots/log-node
index 5577b08a290b9..33f0edfb6187a 100644
--- a/test/integration/serverless/snapshots/log-node
+++ b/test/integration/serverless/snapshots/log-node
@@ -1,198 +1,212 @@
 [
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/trace-node b/test/integration/serverless/snapshots/trace-node
index f48a632647f40..83fe98deffce6 100644
--- a/test/integration/serverless/snapshots/trace-node
+++ b/test/integration/serverless/snapshots/trace-node
@@ -40,6 +40,7 @@
               "version": "integration-tests-version"
             },
             "metrics": {
+              "_sampling_priority_rate_v1": 1,
               "_top_level": 1
             },
             "type": ""

From 93eb7324c86fc63b29eafe9a361c7d3ca5473c47 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Thu, 15 Dec 2022 14:37:08 -0800
Subject: [PATCH 04/30] Update log-csharp.

---
 .../serverless/snapshots/log-csharp           | 104 ++++++++++--------
 1 file changed, 58 insertions(+), 46 deletions(-)

diff --git a/test/integration/serverless/snapshots/log-csharp b/test/integration/serverless/snapshots/log-csharp
index 82c50357e2f0b..1b64ae6db3535 100644
--- a/test/integration/serverless/snapshots/log-csharp
+++ b/test/integration/serverless/snapshots/log-csharp
@@ -1,170 +1,182 @@
 [
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
+      "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]

From 9d93d311ed49903dbd7244dee8d0fa03e04d2ff2 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Thu, 15 Dec 2022 14:48:51 -0800
Subject: [PATCH 05/30] Update log-go.

---
 test/integration/serverless/snapshots/log-go | 104 +++++++++++--------
 1 file changed, 58 insertions(+), 46 deletions(-)

diff --git a/test/integration/serverless/snapshots/log-go b/test/integration/serverless/snapshots/log-go
index 6856ee8e63c15..9f9c673c71bc7 100644
--- a/test/integration/serverless/snapshots/log-go
+++ b/test/integration/serverless/snapshots/log-go
@@ -1,170 +1,182 @@
 [
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "XXX LOG 0 XXX\n",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "XXX LOG 1 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "XXX LOG 2 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "XXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "XXX LOG 2 XXX\n",
+      "message": "XXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "XXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "XXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]

From b13427d8b76056c1831b5b16e08074864f5c4d1c Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Thu, 15 Dec 2022 15:05:35 -0800
Subject: [PATCH 06/30] Update log-java.

---
 .../integration/serverless/snapshots/log-java | 122 ++++++++++--------
 1 file changed, 68 insertions(+), 54 deletions(-)

diff --git a/test/integration/serverless/snapshots/log-java b/test/integration/serverless/snapshots/log-java
index e7b6a7cfca0f3..ebfced8e1fd02 100644
--- a/test/integration/serverless/snapshots/log-java
+++ b/test/integration/serverless/snapshots/log-java
@@ -1,198 +1,212 @@
 [
   {
     "message": {
-      "message": "Picked up JAVA_TOOL_OPTIONS: -javaagent:\"/opt/java/lib/dd-java-agent.jar\" -XX:+TieredCompilation -XX:TieredStopAtLevel=1\n",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "[dd.trace TIMESTAMP +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Serverless extension has been detected, using DDAgentWriter\n",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "Picked up JAVA_TOOL_OPTIONS: -javaagent:\"/opt/java/lib/dd-java-agent.jar\" -XX:+TieredCompilation -XX:TieredStopAtLevel=1\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "XXX Log 0 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "XXX Log 1 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "XXX Log 2 XXX\n",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "XXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "XXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "XXX Log 0 XXX\n",
+      "message": "XXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "XXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "[dd.trace TIMESTAMP +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Serverless extension has been detected, using DDAgentWriter\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]

From f9e6fe4609ef7eafe39634ddb6ff9f16ae2d364d Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Thu, 15 Dec 2022 15:07:29 -0800
Subject: [PATCH 07/30] Update log-python.

---
 .../serverless/snapshots/log-python           | 104 ++++++++++--------
 1 file changed, 58 insertions(+), 46 deletions(-)

diff --git a/test/integration/serverless/snapshots/log-python b/test/integration/serverless/snapshots/log-python
index 537a75857add3..b11b7e97e164f 100644
--- a/test/integration/serverless/snapshots/log-python
+++ b/test/integration/serverless/snapshots/log-python
@@ -1,170 +1,182 @@
 [
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
+      "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]

From 9337b157ed2e19b69d33f48013e9c7d927c9bcfe Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Thu, 15 Dec 2022 15:09:20 -0800
Subject: [PATCH 08/30] Update trace-go.

---
 test/integration/serverless/snapshots/trace-go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/serverless/snapshots/trace-go b/test/integration/serverless/snapshots/trace-go
index e1747ab1fbe51..c07d466b60036 100644
--- a/test/integration/serverless/snapshots/trace-go
+++ b/test/integration/serverless/snapshots/trace-go
@@ -40,6 +40,7 @@
               "version": "integration-tests-version"
             },
             "metrics": {
+              "_sampling_priority_rate_v1": 1,
               "_top_level": 1
             },
             "type": ""

From 8d135a0797b517312d105afd2a3538e1598cb72f Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Thu, 15 Dec 2022 15:11:37 -0800
Subject: [PATCH 09/30] Update trace-java.

---
 test/integration/serverless/snapshots/trace-java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/serverless/snapshots/trace-java b/test/integration/serverless/snapshots/trace-java
index bcfd53b4bb9da..8bc8013e6936d 100644
--- a/test/integration/serverless/snapshots/trace-java
+++ b/test/integration/serverless/snapshots/trace-java
@@ -40,6 +40,7 @@
               "version": "integration-tests-version"
             },
             "metrics": {
+              "_sampling_priority_rate_v1": 1,
               "_top_level": 1
             },
             "type": ""

From 31a97c07dce4f00e35c8626982194316b8f69110 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Thu, 15 Dec 2022 15:12:54 -0800
Subject: [PATCH 10/30] Update trace-python.

---
 test/integration/serverless/snapshots/trace-python | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/serverless/snapshots/trace-python b/test/integration/serverless/snapshots/trace-python
index b8821ad44ff2a..647e066b7b0d8 100644
--- a/test/integration/serverless/snapshots/trace-python
+++ b/test/integration/serverless/snapshots/trace-python
@@ -40,6 +40,7 @@
               "version": "integration-tests-version"
             },
             "metrics": {
+              "_sampling_priority_rate_v1": 1,
               "_top_level": 1
             },
             "type": ""

From 114347487251b5d7305525d04a3a7121618eacf9 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 08:51:58 -0800
Subject: [PATCH 11/30] Capture errors and print.

---
 test/integration/serverless/log_normalize.py | 10 +++++++---
 test/integration/serverless/run.sh           | 10 ++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index 92f2673057f85..bbc76e63dcea9 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -129,6 +129,10 @@ def parse_args():
     return parser.parse_args()
 
 if __name__ == '__main__':
-    args = parse_args()
-    log = normalize(args.logs, args.type, args.stage)
-    print(json.dumps(json.loads(log), indent=2))
+    try:
+        args = parse_args()
+        log = normalize(args.logs, args.type, args.stage)
+        print(json.dumps(json.loads(log), indent=2))
+    except Exception as e:
+        print(f'Error normalizing logs: [{e.__class__.__name__}] {e}')
+        exit(1)
diff --git a/test/integration/serverless/run.sh b/test/integration/serverless/run.sh
index 42862c81b4a17..d252c215b17fc 100755
--- a/test/integration/serverless/run.sh
+++ b/test/integration/serverless/run.sh
@@ -215,15 +215,13 @@ for function_name in "${all_functions[@]}"; do
 
     # Replace invocation-specific data like timestamps and IDs with XXX to normalize across executions
     if [[ " ${metric_functions[*]} " =~ " ${function_name} " ]]; then
-        # Normalize metrics
-        logs=$(python3 log_normalize.py --type metrics --logs "$raw_logs" --stage $stage)
+        norm_type=metrics
     elif [[ " ${log_functions[*]} " =~ " ${function_name} " ]]; then
-        # Normalize logs
-        logs=$(python3 log_normalize.py --type logs --logs "$raw_logs" --stage $stage)
+        norm_type=logs
     else
-        # Normalize traces
-        logs=$(python3 log_normalize.py --type traces --logs "$raw_logs" --stage $stage)
+        norm_type=traces
     fi
+    logs=$(python3 log_normalize.py --type $norm_type --logs "$raw_logs" --stage $stage)
 
     function_snapshot_path="./snapshots/${function_name}"
 

From d36d54dcfa564cc7df08a5ef2360145b4735844d Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 09:24:17 -0800
Subject: [PATCH 12/30] Reenable some tests.

---
 test/integration/serverless/run.sh            |   4 -
 .../serverless/snapshots/log-proxy            | 122 ++++++++++--------
 .../serverless/snapshots/trace-csharp         |   2 +
 3 files changed, 70 insertions(+), 58 deletions(-)

diff --git a/test/integration/serverless/run.sh b/test/integration/serverless/run.sh
index d252c215b17fc..931952f315da2 100755
--- a/test/integration/serverless/run.sh
+++ b/test/integration/serverless/run.sh
@@ -162,11 +162,7 @@ functions_to_skip=(
     "timeout-go"
     "timeout-csharp"
     "timeout-proxy"
-    "trace-csharp" # Will be reactivated when the new dotnet layer will be released
     "trace-proxy" # Will be reactivated when sampling with proxy will be implemented
-    "error-proxy"
-    "log-proxy"
-    "metric-proxy"
 )
 
 echo "Invoking functions for the first time..."
diff --git a/test/integration/serverless/snapshots/log-proxy b/test/integration/serverless/snapshots/log-proxy
index cef6ff6e4bdde..8b15b7e8b5089 100644
--- a/test/integration/serverless/snapshots/log-proxy
+++ b/test/integration/serverless/snapshots/log-proxy
@@ -1,198 +1,212 @@
 [
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
+      "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
+      "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "END RequestId: XXX",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "REPORT",
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP http: proxy error: context canceled\n",
+      "message": "TIMESTAMP UTC | DD_EXTENSION | ERROR | could not forward the request context canceled\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
-      "message": "TIMESTAMP UTC | DD_EXTENSION | ERROR | could not forward the request context canceled\n",
+      "message": "TIMESTAMP http: proxy error: context canceled\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/trace-csharp b/test/integration/serverless/snapshots/trace-csharp
index 2d6df8278c36d..8c7a6148829aa 100644
--- a/test/integration/serverless/snapshots/trace-csharp
+++ b/test/integration/serverless/snapshots/trace-csharp
@@ -48,6 +48,7 @@
             "metrics": {
               "_dd.top_level": 1,
               "_dd.tracer_kr": 0,
+              "_sampling_priority_rate_v1": 1,
               "_sampling_priority_v1": 1,
               "_top_level": 1,
               "process_id": null
@@ -113,6 +114,7 @@
             "metrics": {
               "_dd.top_level": 1,
               "_dd.tracer_kr": 1,
+              "_sampling_priority_rate_v1": 1,
               "_sampling_priority_v1": 1,
               "_top_level": 1,
               "process_id": null

From a4808326f86e2183bf0bd00727f86ab9152b4372 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 10:33:24 -0800
Subject: [PATCH 13/30] Update rest of snapshots, so no tests need to be
 skipped.

---
 .../serverless/snapshots/log-proxy.bak        | 182 ++++++++++++++++++
 .../serverless/snapshots/timeout-csharp       |   4 +-
 .../serverless/snapshots/timeout-go           |   4 +-
 .../serverless/snapshots/timeout-java         |   4 +-
 .../serverless/snapshots/timeout-node         |   4 +-
 .../serverless/snapshots/timeout-proxy        |   4 +-
 .../serverless/snapshots/timeout-python       |   4 +-
 .../serverless/snapshots/trace-proxy          |   4 +-
 8 files changed, 203 insertions(+), 7 deletions(-)
 create mode 100644 test/integration/serverless/snapshots/log-proxy.bak

diff --git a/test/integration/serverless/snapshots/log-proxy.bak b/test/integration/serverless/snapshots/log-proxy.bak
new file mode 100644
index 0000000000000..faca765f3b08b
--- /dev/null
+++ b/test/integration/serverless/snapshots/log-proxy.bak
@@ -0,0 +1,182 @@
+[
+  {
+    "message": {
+      "message": "END RequestId: XXX",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "END RequestId: XXX",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "REPORT",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "REPORT",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "START RequestId: XXX Version: $LATEST",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "START RequestId: XXX Version: $LATEST",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  },
+  {
+    "message": {
+      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
+      "lambda": {
+        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "request_id": "XXX"
+      }
+    },
+    "status": "info",
+    "timestamp": "XXX",
+    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "service": "integration-tests-service",
+    "ddsource": "lambda",
+    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+  }
+]
diff --git a/test/integration/serverless/snapshots/timeout-csharp b/test/integration/serverless/snapshots/timeout-csharp
index 8b137891791fe..4ad53be76fa51 100644
--- a/test/integration/serverless/snapshots/timeout-csharp
+++ b/test/integration/serverless/snapshots/timeout-csharp
@@ -1 +1,3 @@
-
+{
+  "error": "normalization returned empty payload"
+}
diff --git a/test/integration/serverless/snapshots/timeout-go b/test/integration/serverless/snapshots/timeout-go
index 8b137891791fe..4ad53be76fa51 100644
--- a/test/integration/serverless/snapshots/timeout-go
+++ b/test/integration/serverless/snapshots/timeout-go
@@ -1 +1,3 @@
-
+{
+  "error": "normalization returned empty payload"
+}
diff --git a/test/integration/serverless/snapshots/timeout-java b/test/integration/serverless/snapshots/timeout-java
index 8b137891791fe..4ad53be76fa51 100644
--- a/test/integration/serverless/snapshots/timeout-java
+++ b/test/integration/serverless/snapshots/timeout-java
@@ -1 +1,3 @@
-
+{
+  "error": "normalization returned empty payload"
+}
diff --git a/test/integration/serverless/snapshots/timeout-node b/test/integration/serverless/snapshots/timeout-node
index 8b137891791fe..4ad53be76fa51 100644
--- a/test/integration/serverless/snapshots/timeout-node
+++ b/test/integration/serverless/snapshots/timeout-node
@@ -1 +1,3 @@
-
+{
+  "error": "normalization returned empty payload"
+}
diff --git a/test/integration/serverless/snapshots/timeout-proxy b/test/integration/serverless/snapshots/timeout-proxy
index 8b137891791fe..4ad53be76fa51 100644
--- a/test/integration/serverless/snapshots/timeout-proxy
+++ b/test/integration/serverless/snapshots/timeout-proxy
@@ -1 +1,3 @@
-
+{
+  "error": "normalization returned empty payload"
+}
diff --git a/test/integration/serverless/snapshots/timeout-python b/test/integration/serverless/snapshots/timeout-python
index 8b137891791fe..4ad53be76fa51 100644
--- a/test/integration/serverless/snapshots/timeout-python
+++ b/test/integration/serverless/snapshots/timeout-python
@@ -1 +1,3 @@
-
+{
+  "error": "normalization returned empty payload"
+}
diff --git a/test/integration/serverless/snapshots/trace-proxy b/test/integration/serverless/snapshots/trace-proxy
index 8b137891791fe..4ad53be76fa51 100644
--- a/test/integration/serverless/snapshots/trace-proxy
+++ b/test/integration/serverless/snapshots/trace-proxy
@@ -1 +1,3 @@
-
+{
+  "error": "normalization returned empty payload"
+}

From a646b2783a6564b227c8388d8c33d2a00675854c Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 10:34:31 -0800
Subject: [PATCH 14/30] Always return a json parsable string.

---
 test/integration/serverless/log_normalize.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index bbc76e63dcea9..a6169e1b3fef3 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -119,6 +119,8 @@ def get_normalizers(typ, stage):
         raise ValueError(f'invalid type "{typ}"')
 
 def format_json(log):
+    if not log:
+        return '{"error":"normalization returned empty payload"}'
     return json.dumps(json.loads(log, strict=False), indent=2)
 
 def parse_args():

From c1f7cff9ef002b2b3d388c0be63069f44138f6c7 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 10:50:51 -0800
Subject: [PATCH 15/30] Improved error handling.

---
 test/integration/serverless/log_normalize.py | 18 +++++++++++++-----
 test/integration/serverless/run.sh           | 11 +----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index a6169e1b3fef3..257cf6bf5500d 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -120,8 +120,14 @@ def get_normalizers(typ, stage):
 
 def format_json(log):
     if not log:
-        return '{"error":"normalization returned empty payload"}'
-    return json.dumps(json.loads(log, strict=False), indent=2)
+        log = '{"error":"normalization returned empty payload"}'
+    try:
+        return json.dumps(json.loads(log, strict=False), indent=2)
+    except Exception as e:
+        print(json.dumps({
+            "error": "normalization raised exception: [{e.__class__.__name__}] {e}",
+            "normalized-logs": log,
+        }, indent=2))
 
 def parse_args():
     parser = argparse.ArgumentParser()
@@ -133,8 +139,10 @@ def parse_args():
 if __name__ == '__main__':
     try:
         args = parse_args()
-        log = normalize(args.logs, args.type, args.stage)
-        print(json.dumps(json.loads(log), indent=2))
+        print(normalize(args.logs, args.type, args.stage))
     except Exception as e:
-        print(f'Error normalizing logs: [{e.__class__.__name__}] {e}')
+        print(json.dumps({
+            "error": "normalization raised exception: [{e.__class__.__name__}] {e}",
+            "original-logs": args.logs,
+        }, indent=2))
         exit(1)
diff --git a/test/integration/serverless/run.sh b/test/integration/serverless/run.sh
index 931952f315da2..fe56a88035048 100755
--- a/test/integration/serverless/run.sh
+++ b/test/integration/serverless/run.sh
@@ -154,16 +154,7 @@ all_functions=("${metric_functions[@]}" "${log_functions[@]}" "${trace_functions
 
 # Add a function to this list to skip checking its results
 # This should only be used temporarily while we investigate and fix the test
-functions_to_skip=(
-    # Tagging behavior after a timeout is currently known to be flaky
-    "timeout-node"
-    "timeout-python"
-    "timeout-java"
-    "timeout-go"
-    "timeout-csharp"
-    "timeout-proxy"
-    "trace-proxy" # Will be reactivated when sampling with proxy will be implemented
-)
+functions_to_skip=()
 
 echo "Invoking functions for the first time..."
 set +e # Don't exit this script if an invocation fails or there's a diff

From 75aeef71c0f5b99e28d0308e0a38409bae3aebeb Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 11:16:29 -0800
Subject: [PATCH 16/30] Update account number.

---
 .../serverless/snapshots/appsec-csharp        |  12 +-
 .../serverless/snapshots/appsec-java          |  18 +--
 .../serverless/snapshots/error-csharp         | 150 +++++++++---------
 .../serverless/snapshots/error-java           | 138 ++++++++--------
 .../serverless/snapshots/error-node           | 150 +++++++++---------
 .../serverless/snapshots/error-proxy          | 150 +++++++++---------
 .../serverless/snapshots/error-python         | 150 +++++++++---------
 .../serverless/snapshots/log-csharp           |  72 ++++-----
 test/integration/serverless/snapshots/log-go  |  72 ++++-----
 .../integration/serverless/snapshots/log-java |  84 +++++-----
 .../integration/serverless/snapshots/log-node |  84 +++++-----
 .../serverless/snapshots/log-proxy            |  84 +++++-----
 .../serverless/snapshots/log-proxy.bak        |  72 ++++-----
 .../serverless/snapshots/log-python           |  72 ++++-----
 .../serverless/snapshots/metric-csharp        | 138 ++++++++--------
 .../serverless/snapshots/metric-go            | 150 +++++++++---------
 .../serverless/snapshots/metric-java          | 138 ++++++++--------
 .../serverless/snapshots/metric-node          | 144 ++++++++---------
 .../serverless/snapshots/metric-proxy         | 138 ++++++++--------
 .../serverless/snapshots/metric-python        | 144 ++++++++---------
 .../serverless/snapshots/trace-csharp         |  12 +-
 .../integration/serverless/snapshots/trace-go |  42 ++---
 .../serverless/snapshots/trace-java           |  18 +--
 .../serverless/snapshots/trace-node           |  30 ++--
 .../serverless/snapshots/trace-python         |  30 ++--
 25 files changed, 1146 insertions(+), 1146 deletions(-)

diff --git a/test/integration/serverless/snapshots/appsec-csharp b/test/integration/serverless/snapshots/appsec-csharp
index d219b5d19c214..23ac018c743a9 100644
--- a/test/integration/serverless/snapshots/appsec-csharp
+++ b/test/integration/serverless/snapshots/appsec-csharp
@@ -22,13 +22,13 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "component": "WebRequest",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-csharp",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-csharp",
               "functionname": "integration-tests-extension-XXXXXX-appsec-csharp",
               "http.method": "GET",
               "http.status_code": "200",
@@ -88,13 +88,13 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "component": "WebRequest",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-csharp",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-csharp",
               "functionname": "integration-tests-extension-XXXXXX-appsec-csharp",
               "http.method": "GET",
               "http.status_code": "200",
diff --git a/test/integration/serverless/snapshots/appsec-java b/test/integration/serverless/snapshots/appsec-java
index cf9d0846236ff..940c6dab1602e 100644
--- a/test/integration/serverless/snapshots/appsec-java
+++ b/test/integration/serverless/snapshots/appsec-java
@@ -22,12 +22,12 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-java",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-java",
               "functionname": "integration-tests-extension-XXXXXX-appsec-java",
               "memorysize": "1024",
               "region": "eu-west-1",
@@ -78,14 +78,14 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "true",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-java",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-java",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-appsec-java",
               "language": "jvm",
@@ -147,14 +147,14 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "false",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-appsec-java",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-appsec-java",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-appsec-java",
               "language": "jvm",
diff --git a/test/integration/serverless/snapshots/error-csharp b/test/integration/serverless/snapshots/error-csharp
index 42abc8e2022c2..66d06981d6d59 100644
--- a/test/integration/serverless/snapshots/error-csharp
+++ b/test/integration/serverless/snapshots/error-csharp
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,12 +103,12 @@
     "metric": "aws.lambda.enhanced.errors",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -127,12 +127,12 @@
     "metric": "aws.lambda.enhanced.errors",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -151,13 +151,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -176,13 +176,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -201,13 +201,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -226,13 +226,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "init_type:on-demand",
       "memorysize:1024",
@@ -252,13 +252,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "init_type:on-demand",
       "memorysize:1024",
@@ -278,13 +278,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -303,13 +303,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -328,13 +328,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -353,13 +353,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -378,13 +378,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -403,13 +403,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -428,13 +428,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -453,13 +453,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -478,13 +478,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -503,13 +503,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -528,13 +528,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -553,13 +553,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -578,13 +578,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -603,13 +603,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
       "functionname:integration-tests-extension-XXXXXX-error-csharp",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/error-java b/test/integration/serverless/snapshots/error-java
index d06b2e1fef735..80a4bd52d8da9 100644
--- a/test/integration/serverless/snapshots/error-java
+++ b/test/integration/serverless/snapshots/error-java
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,13 +103,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -128,13 +128,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -153,13 +153,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -178,13 +178,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "init_type:on-demand",
       "memorysize:1024",
@@ -204,13 +204,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "init_type:on-demand",
       "memorysize:1024",
@@ -230,13 +230,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -255,13 +255,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -280,13 +280,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -305,13 +305,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -330,13 +330,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -355,13 +355,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -380,13 +380,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -405,13 +405,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -430,13 +430,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -455,13 +455,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -480,13 +480,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -505,13 +505,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -530,13 +530,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -555,13 +555,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
       "functionname:integration-tests-extension-XXXXXX-error-java",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/error-node b/test/integration/serverless/snapshots/error-node
index 856b87613ef07..3a88305685208 100644
--- a/test/integration/serverless/snapshots/error-node
+++ b/test/integration/serverless/snapshots/error-node
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,14 +103,14 @@
     "metric": "aws.lambda.enhanced.errors",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "datadog_lambda:vX.X.X",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -129,14 +129,14 @@
     "metric": "aws.lambda.enhanced.errors",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "datadog_lambda:vX.X.X",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -155,13 +155,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -180,13 +180,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -205,13 +205,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -230,13 +230,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "init_type:on-demand",
       "memorysize:1024",
@@ -256,13 +256,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "init_type:on-demand",
       "memorysize:1024",
@@ -282,13 +282,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -307,13 +307,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -332,13 +332,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -357,13 +357,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -382,13 +382,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -407,13 +407,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -432,13 +432,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -457,13 +457,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -482,13 +482,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -507,13 +507,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -532,13 +532,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -557,13 +557,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -582,13 +582,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -607,13 +607,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
       "functionname:integration-tests-extension-XXXXXX-error-node",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/error-proxy b/test/integration/serverless/snapshots/error-proxy
index 2c7c202437e1b..64eb2dfc7f699 100644
--- a/test/integration/serverless/snapshots/error-proxy
+++ b/test/integration/serverless/snapshots/error-proxy
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,12 +103,12 @@
     "metric": "aws.lambda.enhanced.errors",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -127,12 +127,12 @@
     "metric": "aws.lambda.enhanced.errors",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -151,13 +151,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -176,13 +176,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -201,13 +201,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -226,13 +226,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "init_type:on-demand",
       "memorysize:1024",
@@ -252,13 +252,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "init_type:on-demand",
       "memorysize:1024",
@@ -278,13 +278,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -303,13 +303,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -328,13 +328,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -353,13 +353,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -378,13 +378,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -403,13 +403,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -428,13 +428,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -453,13 +453,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -478,13 +478,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -503,13 +503,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -528,13 +528,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -553,13 +553,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -578,13 +578,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -603,13 +603,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
       "functionname:integration-tests-extension-XXXXXX-error-proxy",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/error-python b/test/integration/serverless/snapshots/error-python
index b4edbd4e36326..365d6e9d4e136 100644
--- a/test/integration/serverless/snapshots/error-python
+++ b/test/integration/serverless/snapshots/error-python
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,15 +103,15 @@
     "metric": "aws.lambda.enhanced.errors",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "datadog_lambda:vX.X.X",
       "dd_extension_version:123",
       "dd_lambda_layer:datadog-pythonX.X.X",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -130,15 +130,15 @@
     "metric": "aws.lambda.enhanced.errors",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "datadog_lambda:vX.X.X",
       "dd_extension_version:123",
       "dd_lambda_layer:datadog-pythonX.X.X",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -157,13 +157,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -182,13 +182,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -207,13 +207,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -232,13 +232,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "init_type:on-demand",
       "memorysize:1024",
@@ -258,13 +258,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "init_type:on-demand",
       "memorysize:1024",
@@ -284,13 +284,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -309,13 +309,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -334,13 +334,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -359,13 +359,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -384,13 +384,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -409,13 +409,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -434,13 +434,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -459,13 +459,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -484,13 +484,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -509,13 +509,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -534,13 +534,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -559,13 +559,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -584,13 +584,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -609,13 +609,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-error-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
       "functionname:integration-tests-extension-XXXXXX-error-python",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/log-csharp b/test/integration/serverless/snapshots/log-csharp
index 1b64ae6db3535..54beeeb033920 100644
--- a/test/integration/serverless/snapshots/log-csharp
+++ b/test/integration/serverless/snapshots/log-csharp
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-go b/test/integration/serverless/snapshots/log-go
index 9f9c673c71bc7..e1bada356cfd5 100644
--- a/test/integration/serverless/snapshots/log-go
+++ b/test/integration/serverless/snapshots/log-go
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-java b/test/integration/serverless/snapshots/log-java
index ebfced8e1fd02..3d4b9a038af53 100644
--- a/test/integration/serverless/snapshots/log-java
+++ b/test/integration/serverless/snapshots/log-java
@@ -3,210 +3,210 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "Picked up JAVA_TOOL_OPTIONS: -javaagent:\"/opt/java/lib/dd-java-agent.jar\" -XX:+TieredCompilation -XX:TieredStopAtLevel=1\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[dd.trace TIMESTAMP +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Serverless extension has been detected, using DDAgentWriter\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-node b/test/integration/serverless/snapshots/log-node
index 33f0edfb6187a..114d007abacd4 100644
--- a/test/integration/serverless/snapshots/log-node
+++ b/test/integration/serverless/snapshots/log-node
@@ -3,210 +3,210 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-proxy b/test/integration/serverless/snapshots/log-proxy
index 8b15b7e8b5089..d6c146d4f4977 100644
--- a/test/integration/serverless/snapshots/log-proxy
+++ b/test/integration/serverless/snapshots/log-proxy
@@ -3,210 +3,210 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP UTC | DD_EXTENSION | ERROR | could not forward the request context canceled\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP http: proxy error: context canceled\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-proxy.bak b/test/integration/serverless/snapshots/log-proxy.bak
index faca765f3b08b..283aa1a2633c4 100644
--- a/test/integration/serverless/snapshots/log-proxy.bak
+++ b/test/integration/serverless/snapshots/log-proxy.bak
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-python b/test/integration/serverless/snapshots/log-python
index b11b7e97e164f..fb4a414c6b42c 100644
--- a/test/integration/serverless/snapshots/log-python
+++ b/test/integration/serverless/snapshots/log-python
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:601427279990,architecture:XXX,aws_account:601427279990,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/metric-csharp b/test/integration/serverless/snapshots/metric-csharp
index a1bd1d6e488e7..01c770aa72e50 100644
--- a/test/integration/serverless/snapshots/metric-csharp
+++ b/test/integration/serverless/snapshots/metric-csharp
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,13 +103,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -128,13 +128,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -153,13 +153,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -178,13 +178,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "init_type:on-demand",
       "memorysize:1024",
@@ -204,13 +204,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "init_type:on-demand",
       "memorysize:1024",
@@ -230,13 +230,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -255,13 +255,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -280,13 +280,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -305,13 +305,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -330,13 +330,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -355,13 +355,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -380,13 +380,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -405,13 +405,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -430,13 +430,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -455,13 +455,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -480,13 +480,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -505,13 +505,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -530,13 +530,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
@@ -555,13 +555,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-csharp",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
       "functionname:integration-tests-extension-XXXXXX-metric-csharp",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/metric-go b/test/integration/serverless/snapshots/metric-go
index d55d03899f9cc..b297516370700 100644
--- a/test/integration/serverless/snapshots/metric-go
+++ b/test/integration/serverless/snapshots/metric-go
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,13 +103,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -128,13 +128,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -153,13 +153,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -178,13 +178,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "init_type:on-demand",
       "memorysize:1024",
@@ -204,13 +204,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "init_type:on-demand",
       "memorysize:1024",
@@ -230,13 +230,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -255,13 +255,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -280,13 +280,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -305,13 +305,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -330,13 +330,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -355,13 +355,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -380,13 +380,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -405,13 +405,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -430,13 +430,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -455,13 +455,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -480,13 +480,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -505,13 +505,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -530,13 +530,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -555,13 +555,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -580,13 +580,13 @@
     "metric": "serverless.lambda-extension.integration-test.count",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "dd_extension_version:123",
       "dd_lambda_layer:datadog-gox.x.x",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
@@ -605,13 +605,13 @@
     "metric": "serverless.lambda-extension.integration-test.count",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "dd_extension_version:123",
       "dd_lambda_layer:datadog-gox.x.x",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-go",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
       "functionname:integration-tests-extension-XXXXXX-metric-go",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/metric-java b/test/integration/serverless/snapshots/metric-java
index 96e8d1648ed46..bc30259dea5a4 100644
--- a/test/integration/serverless/snapshots/metric-java
+++ b/test/integration/serverless/snapshots/metric-java
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,13 +103,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -128,13 +128,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -153,13 +153,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -178,13 +178,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "init_type:on-demand",
       "memorysize:1024",
@@ -204,13 +204,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "init_type:on-demand",
       "memorysize:1024",
@@ -230,13 +230,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -255,13 +255,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -280,13 +280,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -305,13 +305,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -330,13 +330,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -355,13 +355,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -380,13 +380,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -405,13 +405,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -430,13 +430,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -455,13 +455,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -480,13 +480,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -505,13 +505,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -530,13 +530,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
@@ -555,13 +555,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-java",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
       "functionname:integration-tests-extension-XXXXXX-metric-java",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/metric-node b/test/integration/serverless/snapshots/metric-node
index 2d834d8450590..5cd1a67eab758 100644
--- a/test/integration/serverless/snapshots/metric-node
+++ b/test/integration/serverless/snapshots/metric-node
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,13 +103,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -128,13 +128,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -153,13 +153,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -178,13 +178,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "init_type:on-demand",
       "memorysize:1024",
@@ -204,13 +204,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "init_type:on-demand",
       "memorysize:1024",
@@ -230,13 +230,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -255,13 +255,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -280,13 +280,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -305,13 +305,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -330,13 +330,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -355,13 +355,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -380,13 +380,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -405,13 +405,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -430,13 +430,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -455,13 +455,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -480,13 +480,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -505,13 +505,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -530,13 +530,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -555,13 +555,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
@@ -580,13 +580,13 @@
     "metric": "serverless.lambda-extension.integration-test.count",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "dd_extension_version:123",
       "dd_lambda_layer:datadog-nodevX.X.X",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-node",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
       "functionname:integration-tests-extension-XXXXXX-metric-node",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/metric-proxy b/test/integration/serverless/snapshots/metric-proxy
index aa14b046683df..d3a41da8342af 100644
--- a/test/integration/serverless/snapshots/metric-proxy
+++ b/test/integration/serverless/snapshots/metric-proxy
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,13 +103,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -128,13 +128,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -153,13 +153,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -178,13 +178,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "init_type:on-demand",
       "memorysize:1024",
@@ -204,13 +204,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "init_type:on-demand",
       "memorysize:1024",
@@ -230,13 +230,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -255,13 +255,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -280,13 +280,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -305,13 +305,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -330,13 +330,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -355,13 +355,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -380,13 +380,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -405,13 +405,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -430,13 +430,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -455,13 +455,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -480,13 +480,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -505,13 +505,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -530,13 +530,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
@@ -555,13 +555,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-proxy",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
       "functionname:integration-tests-extension-XXXXXX-metric-proxy",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/metric-python b/test/integration/serverless/snapshots/metric-python
index 1e2d144949372..d6ad36546be20 100644
--- a/test/integration/serverless/snapshots/metric-python
+++ b/test/integration/serverless/snapshots/metric-python
@@ -3,13 +3,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -28,13 +28,13 @@
     "metric": "aws.lambda.enhanced.billed_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -53,13 +53,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -78,13 +78,13 @@
     "metric": "aws.lambda.enhanced.duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -103,13 +103,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -128,13 +128,13 @@
     "metric": "aws.lambda.enhanced.estimated_cost",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -153,13 +153,13 @@
     "metric": "aws.lambda.enhanced.init_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -178,13 +178,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "init_type:on-demand",
       "memorysize:1024",
@@ -204,13 +204,13 @@
     "metric": "aws.lambda.enhanced.invocations",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "init_type:on-demand",
       "memorysize:1024",
@@ -230,13 +230,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -255,13 +255,13 @@
     "metric": "aws.lambda.enhanced.max_memory_used",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -280,13 +280,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -305,13 +305,13 @@
     "metric": "aws.lambda.enhanced.memorysize",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -330,13 +330,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -355,13 +355,13 @@
     "metric": "aws.lambda.enhanced.post_runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -380,13 +380,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -405,13 +405,13 @@
     "metric": "aws.lambda.enhanced.produced_bytes",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -430,13 +430,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -455,13 +455,13 @@
     "metric": "aws.lambda.enhanced.response_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -480,13 +480,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -505,13 +505,13 @@
     "metric": "aws.lambda.enhanced.response_latency",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -530,13 +530,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -555,13 +555,13 @@
     "metric": "aws.lambda.enhanced.runtime_duration",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
@@ -580,13 +580,13 @@
     "metric": "serverless.lambda-extension.integration-test.count",
     "distributions": null,
     "tags": [
-      "account_id:601427279990",
+      "account_id:425362996713",
       "architecture:XXX",
-      "aws_account:601427279990",
+      "aws_account:425362996713",
       "dd_extension_version:123",
       "dd_lambda_layer:datadog-pythonX.X.X",
       "env:integration-tests-env",
-      "function_arn:arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-metric-python",
+      "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
       "functionname:integration-tests-extension-XXXXXX-metric-python",
       "memorysize:1024",
       "region:eu-west-1",
diff --git a/test/integration/serverless/snapshots/trace-csharp b/test/integration/serverless/snapshots/trace-csharp
index 8c7a6148829aa..63126c73288b3 100644
--- a/test/integration/serverless/snapshots/trace-csharp
+++ b/test/integration/serverless/snapshots/trace-csharp
@@ -22,13 +22,13 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "component": "WebRequest",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-csharp",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-csharp",
               "functionname": "integration-tests-extension-XXXXXX-trace-csharp",
               "http.method": "GET",
               "http.status_code": "200",
@@ -88,13 +88,13 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "component": "WebRequest",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-csharp",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-csharp",
               "functionname": "integration-tests-extension-XXXXXX-trace-csharp",
               "http.method": "GET",
               "http.status_code": "200",
diff --git a/test/integration/serverless/snapshots/trace-go b/test/integration/serverless/snapshots/trace-go
index c07d466b60036..83ca9af2b8e5c 100644
--- a/test/integration/serverless/snapshots/trace-go
+++ b/test/integration/serverless/snapshots/trace-go
@@ -22,12 +22,12 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go",
               "functionname": "integration-tests-extension-XXXXXX-trace-go",
               "memorysize": "1024",
               "region": "eu-west-1",
@@ -80,15 +80,15 @@
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
               "_dd.p.upstream_services": "YXdzLmxhbWJkYQ|1|1|1.0000",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "true",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
               "dd_trace": "X.X.X",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-trace-go",
               "memorysize": "1024",
@@ -128,12 +128,12 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go",
               "functionname": "integration-tests-extension-XXXXXX-trace-go",
               "http.method": "GET",
               "http.status_code": "200",
@@ -169,12 +169,12 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go",
               "functionname": "integration-tests-extension-XXXXXX-trace-go",
               "memorysize": "1024",
               "region": "eu-west-1",
@@ -229,15 +229,15 @@
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
               "_dd.p.upstream_services": "YXdzLmxhbWJkYQ|1|1|1.0000",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "false",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
               "dd_trace": "X.X.X",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-trace-go",
               "memorysize": "1024",
@@ -277,12 +277,12 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go",
               "functionname": "integration-tests-extension-XXXXXX-trace-go",
               "http.method": "GET",
               "http.status_code": "200",
@@ -318,12 +318,12 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-go",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-go",
               "functionname": "integration-tests-extension-XXXXXX-trace-go",
               "memorysize": "1024",
               "region": "eu-west-1",
diff --git a/test/integration/serverless/snapshots/trace-java b/test/integration/serverless/snapshots/trace-java
index 8bc8013e6936d..648fda7141773 100644
--- a/test/integration/serverless/snapshots/trace-java
+++ b/test/integration/serverless/snapshots/trace-java
@@ -22,12 +22,12 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-java",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-java",
               "functionname": "integration-tests-extension-XXXXXX-trace-java",
               "memorysize": "1024",
               "region": "eu-west-1",
@@ -78,14 +78,14 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "true",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-java",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-java",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-trace-java",
               "language": "jvm",
@@ -147,14 +147,14 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "false",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-java",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-java",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-trace-java",
               "language": "jvm",
diff --git a/test/integration/serverless/snapshots/trace-node b/test/integration/serverless/snapshots/trace-node
index 83fe98deffce6..16364e0d4259b 100644
--- a/test/integration/serverless/snapshots/trace-node
+++ b/test/integration/serverless/snapshots/trace-node
@@ -22,12 +22,12 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node",
               "functionname": "integration-tests-extension-XXXXXX-trace-node",
               "memorysize": "1024",
               "region": "eu-west-1",
@@ -79,12 +79,12 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node",
               "functionname": "integration-tests-extension-XXXXXX-trace-node",
               "language": "javascript",
               "memorysize": "1024",
@@ -118,16 +118,16 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "true",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
               "dd_trace": "X.X.X",
               "env": "integration-tests-env",
               "function.response.body": "ok",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-trace-node",
               "memorysize": "1024",
@@ -187,12 +187,12 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node",
               "functionname": "integration-tests-extension-XXXXXX-trace-node",
               "language": "javascript",
               "memorysize": "1024",
@@ -226,9 +226,9 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "false",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
@@ -236,7 +236,7 @@
               "env": "integration-tests-env",
               "function.request.body": "testing request payload",
               "function.response.body": "ok",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-node",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-trace-node",
               "memorysize": "1024",
diff --git a/test/integration/serverless/snapshots/trace-python b/test/integration/serverless/snapshots/trace-python
index 647e066b7b0d8..4ba88f6981e88 100644
--- a/test/integration/serverless/snapshots/trace-python
+++ b/test/integration/serverless/snapshots/trace-python
@@ -22,12 +22,12 @@
             "error": 0,
             "meta": {
               "_dd.compute_stats": "1",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python",
               "functionname": "integration-tests-extension-XXXXXX-trace-python",
               "memorysize": "1024",
               "region": "eu-west-1",
@@ -79,16 +79,16 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "true",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
               "dd_trace": "X.X.X",
               "env": "integration-tests-env",
               "function.response.body": "ok",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-trace-python",
               "memorysize": "1024",
@@ -129,12 +129,12 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python",
               "functionname": "integration-tests-extension-XXXXXX-trace-python",
               "memorysize": "1024",
               "region": "eu-west-1",
@@ -185,9 +185,9 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "cold_start": "false",
               "datadog_lambda": "X.X.X",
               "dd_extension_version": "123",
@@ -195,7 +195,7 @@
               "env": "integration-tests-env",
               "function.request.body": "testing request payload",
               "function.response.body": "ok",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python",
               "function_version": "$LATEST",
               "functionname": "integration-tests-extension-XXXXXX-trace-python",
               "memorysize": "1024",
@@ -236,12 +236,12 @@
             "meta": {
               "_dd.compute_stats": "1",
               "_dd.origin": "lambda",
-              "account_id": "601427279990",
+              "account_id": "425362996713",
               "architecture": "XXX",
-              "aws_account": "601427279990",
+              "aws_account": "425362996713",
               "dd_extension_version": "123",
               "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:601427279990:function:integration-tests-extension-XXXXXX-trace-python",
+              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-python",
               "functionname": "integration-tests-extension-XXXXXX-trace-python",
               "memorysize": "1024",
               "region": "eu-west-1",

From 79af904762036ed80fce6bfcae41be0d4314fcc4 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 11:20:30 -0800
Subject: [PATCH 17/30] Remove sed backup file.

---
 .../serverless/snapshots/log-proxy.bak        | 182 ------------------
 1 file changed, 182 deletions(-)
 delete mode 100644 test/integration/serverless/snapshots/log-proxy.bak

diff --git a/test/integration/serverless/snapshots/log-proxy.bak b/test/integration/serverless/snapshots/log-proxy.bak
deleted file mode 100644
index 283aa1a2633c4..0000000000000
--- a/test/integration/serverless/snapshots/log-proxy.bak
+++ /dev/null
@@ -1,182 +0,0 @@
-[
-  {
-    "message": {
-      "message": "END RequestId: XXX",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "END RequestId: XXX",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "REPORT",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "REPORT",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "START RequestId: XXX Version: $LATEST",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  },
-  {
-    "message": {
-      "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
-      "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-        "request_id": "XXX"
-      }
-    },
-    "status": "info",
-    "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
-    "service": "integration-tests-service",
-    "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-  }
-]

From f136b326711de69407b6ac9acb604b16b91841aa Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 11:24:53 -0800
Subject: [PATCH 18/30] Changing XXXXXX to STAGE for easier merge.

---
 .../serverless/snapshots/log-csharp           | 72 ++++++++--------
 test/integration/serverless/snapshots/log-go  | 72 ++++++++--------
 .../integration/serverless/snapshots/log-java | 84 +++++++++----------
 .../integration/serverless/snapshots/log-node | 84 +++++++++----------
 .../serverless/snapshots/log-proxy            | 84 +++++++++----------
 .../serverless/snapshots/log-python           | 72 ++++++++--------
 6 files changed, 234 insertions(+), 234 deletions(-)

diff --git a/test/integration/serverless/snapshots/log-csharp b/test/integration/serverless/snapshots/log-csharp
index 54beeeb033920..0c601cb6a01ad 100644
--- a/test/integration/serverless/snapshots/log-csharp
+++ b/test/integration/serverless/snapshots/log-csharp
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-go b/test/integration/serverless/snapshots/log-go
index e1bada356cfd5..ee7cfb81bb553 100644
--- a/test/integration/serverless/snapshots/log-go
+++ b/test/integration/serverless/snapshots/log-go
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-java b/test/integration/serverless/snapshots/log-java
index 3d4b9a038af53..3f854126b42bb 100644
--- a/test/integration/serverless/snapshots/log-java
+++ b/test/integration/serverless/snapshots/log-java
@@ -3,210 +3,210 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "Picked up JAVA_TOOL_OPTIONS: -javaagent:\"/opt/java/lib/dd-java-agent.jar\" -XX:+TieredCompilation -XX:TieredStopAtLevel=1\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[dd.trace TIMESTAMP +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Serverless extension has been detected, using DDAgentWriter\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-node b/test/integration/serverless/snapshots/log-node
index 114d007abacd4..d2ac8f17788a0 100644
--- a/test/integration/serverless/snapshots/log-node
+++ b/test/integration/serverless/snapshots/log-node
@@ -3,210 +3,210 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-proxy b/test/integration/serverless/snapshots/log-proxy
index d6c146d4f4977..02ea38fdec438 100644
--- a/test/integration/serverless/snapshots/log-proxy
+++ b/test/integration/serverless/snapshots/log-proxy
@@ -3,210 +3,210 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP UTC | DD_EXTENSION | ERROR | could not forward the request context canceled\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP http: proxy error: context canceled\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-python b/test/integration/serverless/snapshots/log-python
index fb4a414c6b42c..3571bf71b4f6d 100644
--- a/test/integration/serverless/snapshots/log-python
+++ b/test/integration/serverless/snapshots/log-python
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]

From 60418f29496b784c5c10a3f53655075d759fbfc4 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 11:38:08 -0800
Subject: [PATCH 19/30] Change back to XXXXXX.

---
 .../serverless/snapshots/log-csharp           | 72 ++++++++--------
 test/integration/serverless/snapshots/log-go  | 72 ++++++++--------
 .../integration/serverless/snapshots/log-java | 84 +++++++++----------
 .../integration/serverless/snapshots/log-node | 84 +++++++++----------
 .../serverless/snapshots/log-proxy            | 84 +++++++++----------
 .../serverless/snapshots/log-python           | 72 ++++++++--------
 6 files changed, 234 insertions(+), 234 deletions(-)

diff --git a/test/integration/serverless/snapshots/log-csharp b/test/integration/serverless/snapshots/log-csharp
index 0c601cb6a01ad..54beeeb033920 100644
--- a/test/integration/serverless/snapshots/log-csharp
+++ b/test/integration/serverless/snapshots/log-csharp
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tinfo\tXXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp,functionname:integration-tests-extension-STAGE-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-csharp,functionname:integration-tests-extension-XXXXXX-log-csharp,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-csharp,runtime:dotnet6,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-go b/test/integration/serverless/snapshots/log-go
index ee7cfb81bb553..e1bada356cfd5 100644
--- a/test/integration/serverless/snapshots/log-go
+++ b/test/integration/serverless/snapshots/log-go
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go,functionname:integration-tests-extension-STAGE-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-go,functionname:integration-tests-extension-XXXXXX-log-go,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-go,runtime:provided.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-java b/test/integration/serverless/snapshots/log-java
index 3f854126b42bb..3d4b9a038af53 100644
--- a/test/integration/serverless/snapshots/log-java
+++ b/test/integration/serverless/snapshots/log-java
@@ -3,210 +3,210 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "Picked up JAVA_TOOL_OPTIONS: -javaagent:\"/opt/java/lib/dd-java-agent.jar\" -XX:+TieredCompilation -XX:TieredStopAtLevel=1\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "XXX Log 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[dd.trace TIMESTAMP +0000] [main] INFO datadog.trace.agent.common.writer.WriterFactory - Detected serverless environment. Serverless extension has been detected, using DDAgentWriter\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java,functionname:integration-tests-extension-STAGE-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-java,functionname:integration-tests-extension-XXXXXX-log-java,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-java,runtime:java8.al2,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-node b/test/integration/serverless/snapshots/log-node
index 0dcf2e048605d..5c0c892851803 100644
--- a/test/integration/serverless/snapshots/log-node
+++ b/test/integration/serverless/snapshots/log-node
@@ -3,211 +3,211 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
 <<<<<<< HEAD
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG masked XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-proxy b/test/integration/serverless/snapshots/log-proxy
index 02ea38fdec438..d6c146d4f4977 100644
--- a/test/integration/serverless/snapshots/log-proxy
+++ b/test/integration/serverless/snapshots/log-proxy
@@ -3,210 +3,210 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP\tXXX\tERROR\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP UTC | DD_EXTENSION | ERROR | could not forward the request context canceled\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "TIMESTAMP http: proxy error: context canceled\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy,functionname:integration-tests-extension-STAGE-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-proxy,functionname:integration-tests-extension-XXXXXX-log-proxy,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-proxy,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]
diff --git a/test/integration/serverless/snapshots/log-python b/test/integration/serverless/snapshots/log-python
index 3571bf71b4f6d..fb4a414c6b42c 100644
--- a/test/integration/serverless/snapshots/log-python
+++ b/test/integration/serverless/snapshots/log-python
@@ -3,180 +3,180 @@
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "END RequestId: XXX",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "REPORT",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "START RequestId: XXX Version: $LATEST",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 0 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 1 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   },
   {
     "message": {
       "message": "[ERROR]\tTIMESTAMP\tXXX\tXXX LOG 2 XXX\n",
       "lambda": {
-        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+        "arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
         "request_id": "XXX"
       }
     },
     "status": "info",
     "timestamp": "XXX",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python",
     "service": "integration-tests-service",
     "ddsource": "lambda",
-    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-STAGE-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
+    "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-python,functionname:integration-tests-extension-XXXXXX-log-python,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-python,runtime:python3.8,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
   }
 ]

From b4c4f027c201e1c803796c8d1ce73417004172d0 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 13:42:17 -0800
Subject: [PATCH 20/30] Remove extra stuff.

---
 .../integration/serverless/snapshots/log-node |  1 -
 .../serverless/snapshots/trace-java           | 56 -------------------
 .../serverless/snapshots/trace-node           | 56 -------------------
 3 files changed, 113 deletions(-)

diff --git a/test/integration/serverless/snapshots/log-node b/test/integration/serverless/snapshots/log-node
index 5c0c892851803..114d007abacd4 100644
--- a/test/integration/serverless/snapshots/log-node
+++ b/test/integration/serverless/snapshots/log-node
@@ -73,7 +73,6 @@
     "service": "integration-tests-service",
     "ddsource": "lambda",
     "ddtags": "account_id:425362996713,architecture:XXX,aws_account:425362996713,dd_extension_version:123,env:integration-tests-env,function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-log-node,functionname:integration-tests-extension-XXXXXX-log-node,memorysize:1024,region:eu-west-1,resource:integration-tests-extension-XXXXXX-log-node,runtime:nodejs14.x,service:integration-tests-service,taga:valuea,tagb:valueb,tagc:valuec,tagd:valued,version:integration-tests-version"
-<<<<<<< HEAD
   },
   {
     "message": {
diff --git a/test/integration/serverless/snapshots/trace-java b/test/integration/serverless/snapshots/trace-java
index b40a32079e3f3..40a7dd423a045 100644
--- a/test/integration/serverless/snapshots/trace-java
+++ b/test/integration/serverless/snapshots/trace-java
@@ -1,60 +1,4 @@
 [
-  {
-    "container_id": "",
-    "language_name": "",
-    "language_version": null,
-    "tracer_version": null,
-    "runtime_id": "",
-    "chunks": [
-      {
-        "priority": 1,
-        "origin": "lambda",
-        "spans": [
-          {
-            "service": "integration-tests-service",
-            "name": "aws.lambda.cold_start",
-            "resource": "integration-tests-extension-XXXXXX-trace-java",
-            "trace_id": null,
-            "span_id": null,
-            "parent_id": null,
-            "start": null,
-            "duration": null,
-            "error": 0,
-            "meta": {
-              "_dd.compute_stats": "1",
-              "account_id": "425362996713",
-              "architecture": "XXX",
-              "aws_account": "425362996713",
-              "dd_extension_version": "123",
-              "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-java",
-              "functionname": "integration-tests-extension-XXXXXX-trace-java",
-              "memorysize": "1024",
-              "region": "eu-west-1",
-              "runtime": "java8.al2",
-              "service": "integration-tests-service",
-              "taga": "valuea",
-              "tagb": "valueb",
-              "tagc": "valuec",
-              "tagd": "valued",
-              "version": "integration-tests-version"
-            },
-            "metrics": {
-              "_sampling_priority_rate_v1": 1,
-              "_top_level": 1
-            },
-            "type": ""
-          }
-        ],
-        "tags": null,
-        "dropped_trace": false
-      }
-    ],
-    "tags": null,
-    "env": "integration-tests-env",
-    "hostname": "",
-    "app_version": "integration-tests-version"
-  },
   {
     "container_id": "",
     "language_name": "java",
diff --git a/test/integration/serverless/snapshots/trace-node b/test/integration/serverless/snapshots/trace-node
index ad01699c64575..14604c1acd8c2 100644
--- a/test/integration/serverless/snapshots/trace-node
+++ b/test/integration/serverless/snapshots/trace-node
@@ -1,60 +1,4 @@
 [
-  {
-    "container_id": "",
-    "language_name": "",
-    "language_version": null,
-    "tracer_version": null,
-    "runtime_id": "",
-    "chunks": [
-      {
-        "priority": 1,
-        "origin": "lambda",
-        "spans": [
-          {
-            "service": "integration-tests-service",
-            "name": "aws.lambda.cold_start",
-            "resource": "integration-tests-extension-XXXXXX-trace-node",
-            "trace_id": null,
-            "span_id": null,
-            "parent_id": null,
-            "start": null,
-            "duration": null,
-            "error": 0,
-            "meta": {
-              "_dd.compute_stats": "1",
-              "account_id": "425362996713",
-              "architecture": "XXX",
-              "aws_account": "425362996713",
-              "dd_extension_version": "123",
-              "env": "integration-tests-env",
-              "function_arn": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-trace-node",
-              "functionname": "integration-tests-extension-XXXXXX-trace-node",
-              "memorysize": "1024",
-              "region": "eu-west-1",
-              "runtime": "nodejs14.x",
-              "service": "integration-tests-service",
-              "taga": "valuea",
-              "tagb": "valueb",
-              "tagc": "valuec",
-              "tagd": "valued",
-              "version": "integration-tests-version"
-            },
-            "metrics": {
-              "_sampling_priority_rate_v1": 1,
-              "_top_level": 1
-            },
-            "type": ""
-          }
-        ],
-        "tags": null,
-        "dropped_trace": false
-      }
-    ],
-    "tags": null,
-    "env": "integration-tests-env",
-    "hostname": "",
-    "app_version": "integration-tests-version"
-  },
   {
     "container_id": "",
     "language_name": "nodejs",

From 66afe4a391b8a5e5c1ffae8b6e3749a89c46ad5f Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 16:22:01 -0800
Subject: [PATCH 21/30] Fix flake8 issues.

---
 test/integration/serverless/log_normalize.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index 257cf6bf5500d..b22cb4eba1db8 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -1,7 +1,6 @@
 import argparse
 import json
 import re
-import sys
 
 def normalize_metrics(stage):
     return [
@@ -80,7 +79,6 @@ def _replace(log):
     return _replace
 
 def exclude(pattern):
-    comp = re.compile(pattern, flags=re.DOTALL)
     return replace(pattern, '')
 
 def require(pattern):
@@ -125,7 +123,7 @@ def format_json(log):
         return json.dumps(json.loads(log, strict=False), indent=2)
     except Exception as e:
         print(json.dumps({
-            "error": "normalization raised exception: [{e.__class__.__name__}] {e}",
+            "error": f"normalization raised exception: [{e.__class__.__name__}] {e}",
             "normalized-logs": log,
         }, indent=2))
 
@@ -142,7 +140,7 @@ def parse_args():
         print(normalize(args.logs, args.type, args.stage))
     except Exception as e:
         print(json.dumps({
-            "error": "normalization raised exception: [{e.__class__.__name__}] {e}",
+            "error": f"normalization raised exception: [{e.__class__.__name__}] {e}",
             "original-logs": args.logs,
         }, indent=2))
         exit(1)

From 68a793623eb4fb13ee78b4bdf3a603ace7b90947 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 16:47:32 -0800
Subject: [PATCH 22/30] Make linter happy.

---
 test/integration/serverless/log_normalize.py | 138 +++++++++++--------
 1 file changed, 80 insertions(+), 58 deletions(-)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index b22cb4eba1db8..ca6af24186a71 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -2,110 +2,126 @@
 import json
 import re
 
+
 def normalize_metrics(stage):
     return [
-            replace(r'raise Exception', r'\n'),
-            require(r'BEGINMETRIC.*ENDMETRIC'),
-            exclude(r'BEGINMETRIC'),
-            exclude(r'ENDMETRIC'),
-            replace(r'(ts":)[0-9]{10}', r'\1XXX'),
-            replace(r'(min":)[0-9\.e\-]{1,30}', r'\1XXX'),
-            replace(r'(max":)[0-9\.e\-]{1,30}', r'\1XXX'),
-            replace(r'(cnt":)[0-9\.e\-]{1,30}', r'\1XXX'),
-            replace(r'(avg":)[0-9\.e\-]{1,30}', r'\1XXX'),
-            replace(r'(sum":)[0-9\.e\-]{1,30}', r'\1XXX'),
-            replace(r'(k":\[)[0-9\.e\-]{1,30}', r'\1XXX'),
-            replace(r'(datadog-nodev)[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
-            replace(r'(datadog_lambda:v)[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
-            replace(r'dd_lambda_layer:datadog-go[0-9.]{1,}', r'dd_lambda_layer:datadog-gox.x.x'),
-            replace(r'(dd_lambda_layer:datadog-python)[0-9_]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
-            replace(r'(serverless.lambda-extension.integration-test.count)[0-9\.]+', r'\1'),
-            replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'),
-            replace(stage, 'XXXXXX'),
-            exclude(r'[ ]$'),
+        replace(r'raise Exception', r'\n'),
+        require(r'BEGINMETRIC.*ENDMETRIC'),
+        exclude(r'BEGINMETRIC'),
+        exclude(r'ENDMETRIC'),
+        replace(r'(ts":)[0-9]{10}', r'\1XXX'),
+        replace(r'(min":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        replace(r'(max":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        replace(r'(cnt":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        replace(r'(avg":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        replace(r'(sum":)[0-9\.e\-]{1,30}', r'\1XXX'),
+        replace(r'(k":\[)[0-9\.e\-]{1,30}', r'\1XXX'),
+        replace(r'(datadog-nodev)[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
+        replace(r'(datadog_lambda:v)[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
+        replace(r'dd_lambda_layer:datadog-go[0-9.]{1,}', r'dd_lambda_layer:datadog-gox.x.x'),
+        replace(r'(dd_lambda_layer:datadog-python)[0-9_]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
+        replace(r'(serverless.lambda-extension.integration-test.count)[0-9\.]+', r'\1'),
+        replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'),
+        replace(stage, 'XXXXXX'),
+        exclude(r'[ ]$'),
     ]
 
+
 def normalize_logs(stage):
     return [
-            require(r'BEGINLOG.*ENDLOG'),
-            exclude(r'BEGINLOG'),
-            exclude(r'ENDLOG'),
-            replace(r'("timestamp":\s*?)\d{13}', r'\1"XXX"'),
-            replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}:\d{3}', 'TIMESTAMP'),
-            replace(r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z', 'TIMESTAMP'),
-            replace(r'\d{4}\/\d{2}\/\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
-            replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
-            replace(r'([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12})', r'XXX'),
-            replace(stage, 'XXXXXX'),
-            replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'),
-            sort_by(lambda log: log["message"]["message"]),
-            # ignore a Lambda error that occurs sporadically for log-csharp see here for more info:
-            # https://repost.aws/questions/QUq2OfIFUNTCyCKsChfJLr5w/lambda-function-working-locally-but-crashing-on-aws
-            # TODO
-            # perl -n -e "print unless /LAMBDA_RUNTIME Failed to get next invocation. No Response from endpoint/ or \
-            #  /An error occurred while attempting to execute your code.: LambdaException/ or \
-            #  /terminate called after throwing an instance of 'std::logic_error'/ or \
-            #  /basic_string::_M_construct null not valid/" |
+        require(r'BEGINLOG.*ENDLOG'),
+        exclude(r'BEGINLOG'),
+        exclude(r'ENDLOG'),
+        replace(r'("timestamp":\s*?)\d{13}', r'\1"XXX"'),
+        replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}:\d{3}', 'TIMESTAMP'),
+        replace(r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z', 'TIMESTAMP'),
+        replace(r'\d{4}\/\d{2}\/\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
+        replace(r'\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}', 'TIMESTAMP'),
+        replace(r'([a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12})', r'XXX'),
+        replace(stage, 'XXXXXX'),
+        replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'),
+        sort_by(lambda log: log["message"]["message"]),
+        # ignore a Lambda error that occurs sporadically for log-csharp see here for more info:
+        # https://repost.aws/questions/QUq2OfIFUNTCyCKsChfJLr5w/lambda-function-working-locally-but-crashing-on-aws
+        # TODO
+        # perl -n -e "print unless /LAMBDA_RUNTIME Failed to get next invocation. No Response from endpoint/ or \
+        #  /An error occurred while attempting to execute your code.: LambdaException/ or \
+        #  /terminate called after throwing an instance of 'std::logic_error'/ or \
+        #  /basic_string::_M_construct null not valid/" |
     ]
 
+
 def normalize_traces(stage):
     return [
-            require(r'BEGINTRACE.*ENDTRACE'),
-            exclude(r'BEGINTRACE'),
-            exclude(r'ENDTRACE'),
-            replace(r'(ts":)[0-9]{10}', r'\1XXX'),
-            replace(r'((startTime|endTime|traceID|trace_id|span_id|parent_id|start|system.pid)":)[0-9]+', r'\1null'),
-            replace(r'((tracer_version|language_version)":)["a-zA-Z0-9~\-\.\_]+', r'\1null'),
-            replace(r'(duration":)[0-9]+', r'\1null'),
-            replace(r'((datadog_lambda|dd_trace)":")[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
-            replace(r'(,"request_id":")[a-zA-Z0-9\-,]+"', r'\1null"'),
-            replace(r'(,"runtime-id":")[a-zA-Z0-9\-,]+"', r'\1null"'),
-            replace(r'(,"system.pid":")[a-zA-Z0-9\-,]+"', r'\1null"'),
-            replace(r'("_dd.no_p_sr":)[0-9\.]+', r'\1null'),
-            replace(r'("architecture":)"(x86_64|arm64)"', r'\1"XXX"'),
-            replace(r'("process_id":)[0-9]+', r'\1null'),
-            replace(stage, 'XXXXXX'),
-            exclude(r'[ ]$'),
+        require(r'BEGINTRACE.*ENDTRACE'),
+        exclude(r'BEGINTRACE'),
+        exclude(r'ENDTRACE'),
+        replace(r'(ts":)[0-9]{10}', r'\1XXX'),
+        replace(r'((startTime|endTime|traceID|trace_id|span_id|parent_id|start|system.pid)":)[0-9]+', r'\1null'),
+        replace(r'((tracer_version|language_version)":)["a-zA-Z0-9~\-\.\_]+', r'\1null'),
+        replace(r'(duration":)[0-9]+', r'\1null'),
+        replace(r'((datadog_lambda|dd_trace)":")[0-9]+\.[0-9]+\.[0-9]+', r'\1X.X.X'),
+        replace(r'(,"request_id":")[a-zA-Z0-9\-,]+"', r'\1null"'),
+        replace(r'(,"runtime-id":")[a-zA-Z0-9\-,]+"', r'\1null"'),
+        replace(r'(,"system.pid":")[a-zA-Z0-9\-,]+"', r'\1null"'),
+        replace(r'("_dd.no_p_sr":)[0-9\.]+', r'\1null'),
+        replace(r'("architecture":)"(x86_64|arm64)"', r'\1"XXX"'),
+        replace(r'("process_id":)[0-9]+', r'\1null'),
+        replace(stage, 'XXXXXX'),
+        exclude(r'[ ]$'),
     ]
 
+
 #####################
 # BEGIN NORMALIZERS #
 #####################
 
+
 def replace(pattern, repl):
     comp = re.compile(pattern, flags=re.DOTALL)
+
     def _replace(log):
         return comp.sub(repl, log)
+
     return _replace
 
+
 def exclude(pattern):
     return replace(pattern, '')
 
+
 def require(pattern):
     comp = re.compile(pattern, flags=re.DOTALL)
+
     def _require(log):
         match = comp.search(log)
         if not match:
             return ''
         return match.group(0)
+
     return _require
 
+
 def sort_by(key):
     def _sort(log):
         log_json = json.loads(log, strict=False)
         log_sorted = sorted(log_json, key=key)
         return json.dumps(log_sorted)
+
     return _sort
 
+
 ###################
 # END NORMALIZERS #
 ###################
 
+
 def normalize(log, typ, stage):
     for normalizer in get_normalizers(typ, stage):
         log = normalizer(log)
     return format_json(log)
 
+
 def get_normalizers(typ, stage):
     if typ == 'metrics':
         return normalize_metrics(stage)
@@ -116,16 +132,19 @@ def get_normalizers(typ, stage):
     else:
         raise ValueError(f'invalid type "{typ}"')
 
+
 def format_json(log):
     if not log:
         log = '{"error":"normalization returned empty payload"}'
     try:
         return json.dumps(json.loads(log, strict=False), indent=2)
     except Exception as e:
-        print(json.dumps({
+        err = {
             "error": f"normalization raised exception: [{e.__class__.__name__}] {e}",
             "normalized-logs": log,
-        }, indent=2))
+        }
+        return json.dumps(err, indent=2)
+
 
 def parse_args():
     parser = argparse.ArgumentParser()
@@ -134,13 +153,16 @@ def parse_args():
     parser.add_argument('--stage', required=True)
     return parser.parse_args()
 
+
 if __name__ == '__main__':
     try:
         args = parse_args()
         print(normalize(args.logs, args.type, args.stage))
     except Exception as e:
-        print(json.dumps({
+        err = {
             "error": f"normalization raised exception: [{e.__class__.__name__}] {e}",
             "original-logs": args.logs,
-        }, indent=2))
+        }
+        err_json = json.dumps(err, indent=2)
+        print(err_json)
         exit(1)

From 98b8d5c0c0e4a2c34865f1325df16864d1b3892a Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 19:40:47 -0800
Subject: [PATCH 23/30] Re-sort metrics.

---
 .../serverless/snapshots/error-python         | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/test/integration/serverless/snapshots/error-python b/test/integration/serverless/snapshots/error-python
index 365d6e9d4e136..f1dea142bdb9a 100644
--- a/test/integration/serverless/snapshots/error-python
+++ b/test/integration/serverless/snapshots/error-python
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -106,7 +106,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "datadog_lambda:vX.X.X",
       "dd_extension_version:123",
       "dd_lambda_layer:datadog-pythonX.X.X",
@@ -133,7 +133,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "datadog_lambda:vX.X.X",
       "dd_extension_version:123",
       "dd_lambda_layer:datadog-pythonX.X.X",
@@ -160,7 +160,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -185,7 +185,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -235,7 +235,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -261,7 +261,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -287,7 +287,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -312,7 +312,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -337,7 +337,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -362,7 +362,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -387,7 +387,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -412,7 +412,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -437,7 +437,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -462,7 +462,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -487,7 +487,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -512,7 +512,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -537,7 +537,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -562,7 +562,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -587,7 +587,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",
@@ -612,7 +612,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-python",

From 637a814a7dae48b5eac872249bbdbc322e99f40b Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 19:41:48 -0800
Subject: [PATCH 24/30] Sort metrics by name, then cold start.

---
 test/integration/serverless/log_normalize.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index ca6af24186a71..13a95322188e7 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -24,6 +24,7 @@ def normalize_metrics(stage):
         replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'),
         replace(stage, 'XXXXXX'),
         exclude(r'[ ]$'),
+        sort_by(lambda log: (log["metric"], "cold_start:true" in log["tags"]))
     ]
 
 

From 99a8b0133169c144f47d3a33558493be40a81713 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 19:59:55 -0800
Subject: [PATCH 25/30] Update sort of metrics.

---
 .../serverless/snapshots/error-csharp         | 44 ++++++++---------
 .../serverless/snapshots/error-java           | 44 ++++++++---------
 .../serverless/snapshots/error-node           | 48 +++++++++----------
 .../serverless/snapshots/error-proxy          | 44 ++++++++---------
 .../serverless/snapshots/metric-csharp        | 44 ++++++++---------
 .../serverless/snapshots/metric-go            | 44 ++++++++---------
 .../serverless/snapshots/metric-java          | 44 ++++++++---------
 .../serverless/snapshots/metric-node          | 44 ++++++++---------
 .../serverless/snapshots/metric-proxy         | 44 ++++++++---------
 .../serverless/snapshots/metric-python        | 44 ++++++++---------
 10 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/test/integration/serverless/snapshots/error-csharp b/test/integration/serverless/snapshots/error-csharp
index 66d06981d6d59..c44db211768b3 100644
--- a/test/integration/serverless/snapshots/error-csharp
+++ b/test/integration/serverless/snapshots/error-csharp
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -154,7 +154,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -179,7 +179,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -229,7 +229,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -255,7 +255,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -281,7 +281,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -306,7 +306,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -331,7 +331,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -356,7 +356,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -381,7 +381,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -406,7 +406,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -431,7 +431,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -456,7 +456,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -481,7 +481,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -506,7 +506,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -531,7 +531,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -556,7 +556,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -581,7 +581,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
@@ -606,7 +606,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-csharp",
diff --git a/test/integration/serverless/snapshots/error-java b/test/integration/serverless/snapshots/error-java
index 80a4bd52d8da9..e39cc94b00592 100644
--- a/test/integration/serverless/snapshots/error-java
+++ b/test/integration/serverless/snapshots/error-java
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -106,7 +106,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -131,7 +131,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -181,7 +181,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -207,7 +207,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -233,7 +233,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -258,7 +258,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -283,7 +283,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -308,7 +308,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -333,7 +333,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -358,7 +358,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -383,7 +383,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -408,7 +408,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -433,7 +433,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -458,7 +458,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -483,7 +483,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -508,7 +508,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -533,7 +533,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
@@ -558,7 +558,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-java",
diff --git a/test/integration/serverless/snapshots/error-node b/test/integration/serverless/snapshots/error-node
index 3a88305685208..da0688d846148 100644
--- a/test/integration/serverless/snapshots/error-node
+++ b/test/integration/serverless/snapshots/error-node
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -106,7 +106,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "datadog_lambda:vX.X.X",
       "dd_extension_version:123",
       "env:integration-tests-env",
@@ -132,7 +132,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "datadog_lambda:vX.X.X",
       "dd_extension_version:123",
       "env:integration-tests-env",
@@ -158,7 +158,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -183,7 +183,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -233,7 +233,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -259,7 +259,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -285,7 +285,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -310,7 +310,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -335,7 +335,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -360,7 +360,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -385,7 +385,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -410,7 +410,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -435,7 +435,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -460,7 +460,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -485,7 +485,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -510,7 +510,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -535,7 +535,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -560,7 +560,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -585,7 +585,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
@@ -610,7 +610,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-node",
diff --git a/test/integration/serverless/snapshots/error-proxy b/test/integration/serverless/snapshots/error-proxy
index 64eb2dfc7f699..cf390fa818377 100644
--- a/test/integration/serverless/snapshots/error-proxy
+++ b/test/integration/serverless/snapshots/error-proxy
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -154,7 +154,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -179,7 +179,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -229,7 +229,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -255,7 +255,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -281,7 +281,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -306,7 +306,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -331,7 +331,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -356,7 +356,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -381,7 +381,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -406,7 +406,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -431,7 +431,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -456,7 +456,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -481,7 +481,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -506,7 +506,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -531,7 +531,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -556,7 +556,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -581,7 +581,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
@@ -606,7 +606,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-error-proxy",
diff --git a/test/integration/serverless/snapshots/metric-csharp b/test/integration/serverless/snapshots/metric-csharp
index 01c770aa72e50..09b0ae76a108c 100644
--- a/test/integration/serverless/snapshots/metric-csharp
+++ b/test/integration/serverless/snapshots/metric-csharp
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -106,7 +106,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -131,7 +131,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -181,7 +181,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -207,7 +207,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -233,7 +233,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -258,7 +258,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -283,7 +283,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -308,7 +308,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -333,7 +333,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -358,7 +358,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -383,7 +383,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -408,7 +408,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -433,7 +433,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -458,7 +458,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -483,7 +483,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -508,7 +508,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -533,7 +533,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
@@ -558,7 +558,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-csharp",
diff --git a/test/integration/serverless/snapshots/metric-go b/test/integration/serverless/snapshots/metric-go
index b297516370700..fe42f8a7a6a27 100644
--- a/test/integration/serverless/snapshots/metric-go
+++ b/test/integration/serverless/snapshots/metric-go
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -106,7 +106,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -131,7 +131,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -181,7 +181,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -207,7 +207,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -233,7 +233,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -258,7 +258,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -283,7 +283,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -308,7 +308,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -333,7 +333,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -358,7 +358,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -383,7 +383,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -408,7 +408,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -433,7 +433,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -458,7 +458,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -483,7 +483,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -508,7 +508,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -533,7 +533,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
@@ -558,7 +558,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-go",
diff --git a/test/integration/serverless/snapshots/metric-java b/test/integration/serverless/snapshots/metric-java
index bc30259dea5a4..882ddcd6cb40a 100644
--- a/test/integration/serverless/snapshots/metric-java
+++ b/test/integration/serverless/snapshots/metric-java
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -106,7 +106,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -131,7 +131,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -181,7 +181,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -207,7 +207,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -233,7 +233,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -258,7 +258,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -283,7 +283,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -308,7 +308,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -333,7 +333,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -358,7 +358,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -383,7 +383,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -408,7 +408,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -433,7 +433,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -458,7 +458,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -483,7 +483,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -508,7 +508,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -533,7 +533,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
@@ -558,7 +558,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-java",
diff --git a/test/integration/serverless/snapshots/metric-node b/test/integration/serverless/snapshots/metric-node
index 5cd1a67eab758..f6d8e2802366a 100644
--- a/test/integration/serverless/snapshots/metric-node
+++ b/test/integration/serverless/snapshots/metric-node
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -106,7 +106,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -131,7 +131,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -181,7 +181,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -207,7 +207,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -233,7 +233,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -258,7 +258,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -283,7 +283,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -308,7 +308,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -333,7 +333,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -358,7 +358,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -383,7 +383,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -408,7 +408,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -433,7 +433,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -458,7 +458,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -483,7 +483,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -508,7 +508,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -533,7 +533,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
@@ -558,7 +558,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-node",
diff --git a/test/integration/serverless/snapshots/metric-proxy b/test/integration/serverless/snapshots/metric-proxy
index d3a41da8342af..0e2bb6a2b6f9b 100644
--- a/test/integration/serverless/snapshots/metric-proxy
+++ b/test/integration/serverless/snapshots/metric-proxy
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -106,7 +106,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -131,7 +131,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -181,7 +181,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -207,7 +207,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -233,7 +233,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -258,7 +258,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -283,7 +283,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -308,7 +308,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -333,7 +333,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -358,7 +358,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -383,7 +383,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -408,7 +408,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -433,7 +433,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -458,7 +458,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -483,7 +483,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -508,7 +508,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -533,7 +533,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
@@ -558,7 +558,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-proxy",
diff --git a/test/integration/serverless/snapshots/metric-python b/test/integration/serverless/snapshots/metric-python
index d6ad36546be20..e9ad1f0dc60eb 100644
--- a/test/integration/serverless/snapshots/metric-python
+++ b/test/integration/serverless/snapshots/metric-python
@@ -6,7 +6,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -31,7 +31,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -56,7 +56,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -81,7 +81,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -106,7 +106,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -131,7 +131,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -181,7 +181,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -207,7 +207,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -233,7 +233,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -258,7 +258,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -283,7 +283,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -308,7 +308,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -333,7 +333,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -358,7 +358,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -383,7 +383,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -408,7 +408,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -433,7 +433,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -458,7 +458,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -483,7 +483,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -508,7 +508,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -533,7 +533,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:true",
+      "cold_start:false",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",
@@ -558,7 +558,7 @@
       "account_id:425362996713",
       "architecture:XXX",
       "aws_account:425362996713",
-      "cold_start:false",
+      "cold_start:true",
       "dd_extension_version:123",
       "env:integration-tests-env",
       "function_arn:arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-XXXXXX-metric-python",

From d3ae4e89a258b2c8a3411df403d0635a39750cc5 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 20:19:45 -0800
Subject: [PATCH 26/30] Keep errors consistent to avoid flaky failure tests.

---
 test/integration/serverless/log_normalize.py | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index 13a95322188e7..2c04260e1c9b2 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -24,7 +24,7 @@ def normalize_metrics(stage):
         replace(r'(architecture:)(x86_64|arm64)', r'\1XXX'),
         replace(stage, 'XXXXXX'),
         exclude(r'[ ]$'),
-        sort_by(lambda log: (log["metric"], "cold_start:true" in log["tags"]))
+        sort_by(lambda log: (log["metric"], "cold_start:true" in log["tags"])),
     ]
 
 
@@ -135,16 +135,7 @@ def get_normalizers(typ, stage):
 
 
 def format_json(log):
-    if not log:
-        log = '{"error":"normalization returned empty payload"}'
-    try:
-        return json.dumps(json.loads(log, strict=False), indent=2)
-    except Exception as e:
-        err = {
-            "error": f"normalization raised exception: [{e.__class__.__name__}] {e}",
-            "normalized-logs": log,
-        }
-        return json.dumps(err, indent=2)
+    return json.dumps(json.loads(log, strict=False), indent=2)
 
 
 def parse_args():
@@ -160,10 +151,7 @@ def parse_args():
         args = parse_args()
         print(normalize(args.logs, args.type, args.stage))
     except Exception as e:
-        err = {
-            "error": f"normalization raised exception: [{e.__class__.__name__}] {e}",
-            "original-logs": args.logs,
-        }
+        err = '{"error":"normalization raised exception"}'
         err_json = json.dumps(err, indent=2)
         print(err_json)
         exit(1)

From b45662bea76d02031e33ac34c27489c028254060 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Fri, 16 Dec 2022 21:09:03 -0800
Subject: [PATCH 27/30] Dict instead of string.

---
 test/integration/serverless/log_normalize.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index 2c04260e1c9b2..8c361d16908e8 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -151,7 +151,7 @@ def parse_args():
         args = parse_args()
         print(normalize(args.logs, args.type, args.stage))
     except Exception as e:
-        err = '{"error":"normalization raised exception"}'
+        err = {"error":"normalization raised exception"}
         err_json = json.dumps(err, indent=2)
         print(err_json)
         exit(1)

From 1f3ac482231e8dded8f687c0a82d779a5b86fc88 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Mon, 19 Dec 2022 07:55:42 -0800
Subject: [PATCH 28/30] Change error message.

---
 test/integration/serverless/snapshots/timeout-csharp | 2 +-
 test/integration/serverless/snapshots/timeout-go     | 2 +-
 test/integration/serverless/snapshots/timeout-java   | 2 +-
 test/integration/serverless/snapshots/timeout-node   | 2 +-
 test/integration/serverless/snapshots/timeout-proxy  | 2 +-
 test/integration/serverless/snapshots/timeout-python | 2 +-
 test/integration/serverless/snapshots/trace-proxy    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/integration/serverless/snapshots/timeout-csharp b/test/integration/serverless/snapshots/timeout-csharp
index 4ad53be76fa51..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-csharp
+++ b/test/integration/serverless/snapshots/timeout-csharp
@@ -1,3 +1,3 @@
 {
-  "error": "normalization returned empty payload"
+  "error": "normalization raised exception"
 }
diff --git a/test/integration/serverless/snapshots/timeout-go b/test/integration/serverless/snapshots/timeout-go
index 4ad53be76fa51..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-go
+++ b/test/integration/serverless/snapshots/timeout-go
@@ -1,3 +1,3 @@
 {
-  "error": "normalization returned empty payload"
+  "error": "normalization raised exception"
 }
diff --git a/test/integration/serverless/snapshots/timeout-java b/test/integration/serverless/snapshots/timeout-java
index 4ad53be76fa51..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-java
+++ b/test/integration/serverless/snapshots/timeout-java
@@ -1,3 +1,3 @@
 {
-  "error": "normalization returned empty payload"
+  "error": "normalization raised exception"
 }
diff --git a/test/integration/serverless/snapshots/timeout-node b/test/integration/serverless/snapshots/timeout-node
index 4ad53be76fa51..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-node
+++ b/test/integration/serverless/snapshots/timeout-node
@@ -1,3 +1,3 @@
 {
-  "error": "normalization returned empty payload"
+  "error": "normalization raised exception"
 }
diff --git a/test/integration/serverless/snapshots/timeout-proxy b/test/integration/serverless/snapshots/timeout-proxy
index 4ad53be76fa51..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-proxy
+++ b/test/integration/serverless/snapshots/timeout-proxy
@@ -1,3 +1,3 @@
 {
-  "error": "normalization returned empty payload"
+  "error": "normalization raised exception"
 }
diff --git a/test/integration/serverless/snapshots/timeout-python b/test/integration/serverless/snapshots/timeout-python
index 4ad53be76fa51..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-python
+++ b/test/integration/serverless/snapshots/timeout-python
@@ -1,3 +1,3 @@
 {
-  "error": "normalization returned empty payload"
+  "error": "normalization raised exception"
 }
diff --git a/test/integration/serverless/snapshots/trace-proxy b/test/integration/serverless/snapshots/trace-proxy
index 4ad53be76fa51..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/trace-proxy
+++ b/test/integration/serverless/snapshots/trace-proxy
@@ -1,3 +1,3 @@
 {
-  "error": "normalization returned empty payload"
+  "error": "normalization raised exception"
 }

From 9fa309d539efd64f20b63edfd4c1c5ddbf5b5c53 Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Mon, 19 Dec 2022 08:03:05 -0800
Subject: [PATCH 29/30] Remove unused var.

---
 test/integration/serverless/log_normalize.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index 8c361d16908e8..db75f2abdbd86 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -150,7 +150,7 @@ def parse_args():
     try:
         args = parse_args()
         print(normalize(args.logs, args.type, args.stage))
-    except Exception as e:
+    except Exception:
         err = {"error":"normalization raised exception"}
         err_json = json.dumps(err, indent=2)
         print(err_json)

From 91e6c051a0004423828195f710d15f12a44eb3af Mon Sep 17 00:00:00 2001
From: Rey Abolofia <rey.abolofia@datadoghq.com>
Date: Mon, 19 Dec 2022 08:03:36 -0800
Subject: [PATCH 30/30] Linting error.

---
 test/integration/serverless/log_normalize.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
index db75f2abdbd86..5a687e18f9237 100644
--- a/test/integration/serverless/log_normalize.py
+++ b/test/integration/serverless/log_normalize.py
@@ -151,7 +151,7 @@ def parse_args():
         args = parse_args()
         print(normalize(args.logs, args.type, args.stage))
     except Exception:
-        err = {"error":"normalization raised exception"}
+        err = {"error": "normalization raised exception"}
         err_json = json.dumps(err, indent=2)
         print(err_json)
         exit(1)