diff --git a/test/integration/serverless/log_normalize.py b/test/integration/serverless/log_normalize.py
new file mode 100644
index 0000000000000..5a687e18f9237
--- /dev/null
+++ b/test/integration/serverless/log_normalize.py
@@ -0,0 +1,157 @@
+import argparse
+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'[ ]$'),
+        sort_by(lambda log: (log["metric"], "cold_start:true" in log["tags"])),
+    ]
+
+
+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/" |
+    ]
+
+
+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'[ ]$'),
+    ]
+
+
+#####################
+# 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)
+    elif typ == 'logs':
+        return normalize_logs(stage)
+    elif typ == 'traces':
+        return normalize_traces(stage)
+    else:
+        raise ValueError(f'invalid type "{typ}"')
+
+
+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__':
+    try:
+        args = parse_args()
+        print(normalize(args.logs, args.type, args.stage))
+    except Exception:
+        err = {"error": "normalization raised exception"}
+        err_json = json.dumps(err, indent=2)
+        print(err_json)
+        exit(1)
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 e420136d27534..fe56a88035048 100755
--- a/test/integration/serverless/run.sh
+++ b/test/integration/serverless/run.sh
@@ -154,20 +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-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"
-)
+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
@@ -215,95 +202,22 @@ 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
-        )
+        norm_type=metrics
     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
-        )
+        norm_type=logs
     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
-        )
+        norm_type=traces
     fi
+    logs=$(python3 log_normalize.py --type $norm_type --logs "$raw_logs" --stage $stage)
 
     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"
@@ -314,7 +228,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")
 
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/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",
diff --git a/test/integration/serverless/snapshots/log-csharp b/test/integration/serverless/snapshots/log-csharp
index 4c21fa9eeb484..54beeeb033920 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: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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-csharp",
+    "timestamp": "XXX",
+    "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 51df74c6b5814..e1bada356cfd5 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: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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-go",
+    "timestamp": "XXX",
+    "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 6cd11f1b9734d..3d4b9a038af53 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: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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-java",
+    "timestamp": "XXX",
+    "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 f67599a4e411d..114d007abacd4 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: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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-node",
+    "timestamp": "XXX",
+    "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 d69b18ec6415e..d6c146d4f4977 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: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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-proxy",
+    "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-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 b1e9a2a7c2f93..fb4a414c6b42c 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: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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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",
+      "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",
-    "hostname": "arn:aws:lambda:eu-west-1:425362996713:function:integration-tests-extension-STAGE-log-python",
+    "timestamp": "XXX",
+    "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"
   }
 ]
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 0fec343cb4097..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",
@@ -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 282212d2964c5..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",
@@ -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",
diff --git a/test/integration/serverless/snapshots/timeout-csharp b/test/integration/serverless/snapshots/timeout-csharp
index 8b137891791fe..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-csharp
+++ b/test/integration/serverless/snapshots/timeout-csharp
@@ -1 +1,3 @@
-
+{
+  "error": "normalization raised exception"
+}
diff --git a/test/integration/serverless/snapshots/timeout-go b/test/integration/serverless/snapshots/timeout-go
index 8b137891791fe..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-go
+++ b/test/integration/serverless/snapshots/timeout-go
@@ -1 +1,3 @@
-
+{
+  "error": "normalization raised exception"
+}
diff --git a/test/integration/serverless/snapshots/timeout-java b/test/integration/serverless/snapshots/timeout-java
index 8b137891791fe..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-java
+++ b/test/integration/serverless/snapshots/timeout-java
@@ -1 +1,3 @@
-
+{
+  "error": "normalization raised exception"
+}
diff --git a/test/integration/serverless/snapshots/timeout-node b/test/integration/serverless/snapshots/timeout-node
index 8b137891791fe..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-node
+++ b/test/integration/serverless/snapshots/timeout-node
@@ -1 +1,3 @@
-
+{
+  "error": "normalization raised exception"
+}
diff --git a/test/integration/serverless/snapshots/timeout-proxy b/test/integration/serverless/snapshots/timeout-proxy
index 8b137891791fe..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-proxy
+++ b/test/integration/serverless/snapshots/timeout-proxy
@@ -1 +1,3 @@
-
+{
+  "error": "normalization raised exception"
+}
diff --git a/test/integration/serverless/snapshots/timeout-python b/test/integration/serverless/snapshots/timeout-python
index 8b137891791fe..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/timeout-python
+++ b/test/integration/serverless/snapshots/timeout-python
@@ -1 +1,3 @@
-
+{
+  "error": "normalization raised exception"
+}
diff --git a/test/integration/serverless/snapshots/trace-csharp b/test/integration/serverless/snapshots/trace-csharp
index b4ad1035e625f..63126c73288b3 100644
--- a/test/integration/serverless/snapshots/trace-csharp
+++ b/test/integration/serverless/snapshots/trace-csharp
@@ -47,7 +47,7 @@
             },
             "metrics": {
               "_dd.top_level": 1,
-              "_dd.tracer_kr": 1,
+              "_dd.tracer_kr": 0,
               "_sampling_priority_rate_v1": 1,
               "_sampling_priority_v1": 1,
               "_top_level": 1,
diff --git a/test/integration/serverless/snapshots/trace-proxy b/test/integration/serverless/snapshots/trace-proxy
index 8b137891791fe..059f4251737b1 100644
--- a/test/integration/serverless/snapshots/trace-proxy
+++ b/test/integration/serverless/snapshots/trace-proxy
@@ -1 +1,3 @@
-
+{
+  "error": "normalization raised exception"
+}