diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index bbc00f192..fe2fd19fa 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -56,7 +56,7 @@ jobs:
 
       - name: Build the layer
         # This version number is arbitrary and won't be used by AWS
-        run: VERSION=123 ./scripts/build_binary_and_layer_dockerized.sh
+        run: ARCHITECTURE=amd64 VERSION=123 ./scripts/build_binary_and_layer_dockerized.sh
 
       - name: Run tests
         env:
diff --git a/integration_tests/run.sh b/integration_tests/run.sh
index c9ecaa007..549ca0d5c 100755
--- a/integration_tests/run.sh
+++ b/integration_tests/run.sh
@@ -8,6 +8,9 @@
 
 LOGS_WAIT_SECONDS=45
 
+DEFAULT_NODE_LAYER_VERSION=64
+DEFAULT_PYTHON_LAYER_VERSION=49
+
 set -e
 
 script_utc_start_time=$(date -u +"%Y%m%dT%H%M%S")
@@ -18,10 +21,13 @@ if [ -z "$AWS_SECRET_ACCESS_KEY" ]; then
     exit 1
 fi
 
-if [ -n "$BUILD_EXTENSION" ]; then
+if [ "$BUILD_EXTENSION" == "true" ]; then
     echo "Building extension that will be deployed with our test functions"
+    
     # This version number is arbitrary and won't be used by AWS
-    VERSION=123 ./scripts/build_binary_and_layer_dockerized.sh
+    PLACEHOLDER_EXTENSION_VERSION=123
+
+    ARCHITECTURE=amd64 VERSION=$PLACEHOLDER_EXTENSION_VERSION ./scripts/build_binary_and_layer_dockerized.sh
 else
     echo "Not building extension, ensure it has already been built or re-run with 'BUILD_EXTENSION=true'"
 fi
@@ -39,48 +45,36 @@ cd src
 env GOOS=linux go build -ldflags="-s -w" -o ../bootstrap traceGo.go
 cd ..
 
-function getLatestLayerVersion() {
-    layerName=$1
-    lastVersion=$(aws lambda list-layer-versions --layer-name $layerName --region sa-east-1 | jq -r ".LayerVersions | .[0] |  .Version")
-    if [ lastVersion == "null" ]; then
-        exit 1
-    else
-        echo $lastVersion
-    fi
-}
-
 if [ -z "$NODE_LAYER_VERSION" ]; then
-   echo "NODE_LAYER_VERSION not found, getting the latest one"
-   export NODE_LAYER_VERSION=$(getLatestLayerVersion "Datadog-Node14-x")
-   echo "NODE_LAYER_VERSION set to: $NODE_LAYER_VERSION"
+   echo "NODE_LAYER_VERSION not found, using the default"
+   export NODE_LAYER_VERSION=$DEFAULT_NODE_LAYER_VERSION
 fi
 
 if [ -z "$PYTHON_LAYER_VERSION" ]; then
-   echo "PYTHON_LAYER_VERSION not found, getting the latest one"
-   export PYTHON_LAYER_VERSION=$(getLatestLayerVersion "Datadog-Python38")
-   echo "PYTHON_LAYER_VERSION set to: $PYTHON_LAYER_VERSION"
+   echo "PYTHON_LAYER_VERSION not found, using the default"
+   export PYTHON_LAYER_VERSION=$DEFAULT_PYTHON_LAYER_VERSION
 fi
 
+echo "NODE_LAYER_VERSION set to: $NODE_LAYER_VERSION"
+echo "PYTHON_LAYER_VERSION set to: $PYTHON_LAYER_VERSION"
+
 # random 8-character ID to avoid collisions with other runs
 stage=$(xxd -l 4 -c 4 -p < /dev/random)
 
-# always remove the stacks before exiting, no matter what
 function remove_stack() {
     echo "Removing stack for stage : ${stage}"
-    NODE_LAYER_VERSION=${NODE_LAYER_VERSION} \
-    PYTHON_LAYER_VERSION=${PYTHON_LAYER_VERSION} \
     serverless remove --stage ${stage} 
 }
 
-# making sure the remove_stack function will be called no matter what
+# always remove the stacks before exiting, no matter what
 trap remove_stack EXIT
 
-# deploying the stack
+# deploy the stack
 NODE_LAYER_VERSION=${NODE_LAYER_VERSION} \
 PYTHON_LAYER_VERSION=${PYTHON_LAYER_VERSION} \
 serverless deploy --stage ${stage}
 
-# invoking functions
+# invoke functions
 metric_function_names=("enhanced-metric-node" "enhanced-metric-python" "no-enhanced-metric-node" "no-enhanced-metric-python" "timeout-node" "timeout-python")
 log_function_names=("log-node" "log-python")
 trace_function_names=("simple-trace-node" "simple-trace-python" "simple-trace-go")
@@ -90,10 +84,8 @@ all_functions=("${metric_function_names[@]}" "${log_function_names[@]}" "${trace
 set +e # Don't exit this script if an invocation fails or there's a diff
 
 for function_name in "${all_functions[@]}"; do
-    NODE_LAYER_VERSION=${NODE_LAYER_VERSION} \
-    PYTHON_LAYER_VERSION=${PYTHON_LAYER_VERSION} \
     serverless invoke --stage ${stage} -f ${function_name}
-    # two invocations are needed since enhanced metrics are computed with the REPORT log line (which is trigered at the end of the first invocation)
+    # two invocations are needed since enhanced metrics are computed with the REPORT log line (which is created at the end of the first invocation)
     return_value=$(serverless invoke --stage ${stage} -f ${function_name})
 
     # Compare new return value to snapshot
@@ -181,7 +173,7 @@ for function_name in "${all_functions[@]}"; do
         # If no snapshot file exists yet, we create one
         echo "Writing logs to $function_snapshot_path because no snapshot exists yet"
         echo "$logs" >$function_snapshot_path
-    elif [ -n "$UPDATE_SNAPSHOTS" ]; then
+    elif [ "$UPDATE_SNAPSHOTS" == "true" ]; then
         # If $UPDATE_SNAPSHOTS is set to true write the new logs over the current snapshot
         echo "Overwriting log snapshot for $function_snapshot_path"
         echo "$logs" >$function_snapshot_path
diff --git a/integration_tests/serverless.yml b/integration_tests/serverless.yml
index fefe89065..57602d87e 100644
--- a/integration_tests/serverless.yml
+++ b/integration_tests/serverless.yml
@@ -46,7 +46,7 @@ functions:
     runtime: nodejs14.x
     handler: src/metric.enhancedMetricTest
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
@@ -57,7 +57,7 @@ functions:
     runtime: python3.8
     handler: datadog_lambda.handler.handler
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
@@ -69,7 +69,7 @@ functions:
     runtime: nodejs14.x
     handler: src/metric.noEnhancedMetricTest
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
@@ -79,7 +79,7 @@ functions:
     runtime: python3.8
     handler: datadog_lambda.handler.handler
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
@@ -90,7 +90,7 @@ functions:
     runtime: nodejs14.x
     handler: src/metric.timeoutMetricTest
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
@@ -100,7 +100,7 @@ functions:
     runtime: python3.8
     handler: datadog_lambda.handler.handler
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
@@ -111,7 +111,7 @@ functions:
     runtime: nodejs14.x
     handler: src/log.logTest
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
@@ -127,7 +127,7 @@ functions:
     runtime: python3.8
     handler: datadog_lambda.handler.handler
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
@@ -144,7 +144,7 @@ functions:
     runtime: nodejs14.x
     handler: /opt/nodejs/node_modules/datadog-lambda-js/handler.handler
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Node14-x:${env:NODE_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
@@ -160,7 +160,7 @@ functions:
     runtime: python3.8
     handler: datadog_lambda.handler.handler
     layers:
-      - arn:aws:lambda:${self:provider.region}:601427279990:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
+      - arn:aws:lambda:${self:provider.region}:464622532012:layer:Datadog-Python38:${env:PYTHON_LAYER_VERSION}
       - { Ref: RecorderExtensionLambdaLayer }
       - { Ref: DatadogExtensionIntegrationTestLambdaLayer }
     environment:
diff --git a/integration_tests/snapshots/enhanced-metric-node b/integration_tests/snapshots/enhanced-metric-node
index c353fee3e..9adebceed 100644
--- a/integration_tests/snapshots/enhanced-metric-node
+++ b/integration_tests/snapshots/enhanced-metric-node
@@ -1,10 +1,10 @@
-[sketch] {"metric":"aws.lambda.enhanced.billed_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.estimated_cost","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.init_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:false","datadog_lambda:vX.X.X","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","runtime:nodejs14.x","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","runtime:nodejs14.x","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.max_memory_used","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.memorysize","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-nodevX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.billed_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.estimated_cost","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.init_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:false","datadog_lambda:vX.X.X","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","runtime:nodejs14.x","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","runtime:nodejs14.x","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.max_memory_used","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.memorysize","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-nodevX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-node","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
diff --git a/integration_tests/snapshots/enhanced-metric-python b/integration_tests/snapshots/enhanced-metric-python
index 466477eca..1f2c36e36 100644
--- a/integration_tests/snapshots/enhanced-metric-python
+++ b/integration_tests/snapshots/enhanced-metric-python
@@ -1,10 +1,10 @@
-[sketch] {"metric":"aws.lambda.enhanced.billed_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.estimated_cost","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.init_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:false","datadog_lambda:vX.X.X","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","runtime:python3.8","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","runtime:python3.8","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.max_memory_used","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.memorysize","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.billed_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.estimated_cost","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.init_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:false","datadog_lambda:vX.X.X","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","runtime:python3.8","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","runtime:python3.8","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.max_memory_used","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.memorysize","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-enhanced-metric-python","service:integration-tests-service","taga:valuea","tagb:valueb","tagc:valuec","tagd:valued","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
diff --git a/integration_tests/snapshots/log-node b/integration_tests/snapshots/log-node
index 3e7515d28..704907de3 100644
--- a/integration_tests/snapshots/log-node
+++ b/integration_tests/snapshots/log-node
@@ -1,6 +1,6 @@
 [log] {"message":{"message":"START XXX"}}
-[log] {"message":{"message":"XXX LOG 0 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
-[log] {"message":{"message":"XXX LOG 1 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
-[log] {"message":{"message":"XXX LOG 2 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
+[log] {"message":{"message":"XXX LOG 0 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,architecture:x86_64,architecture:x86_64,architecture:x86_64,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,memorysize:1024,memorysize:1024,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
+[log] {"message":{"message":"XXX LOG 1 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,architecture:x86_64,architecture:x86_64,architecture:x86_64,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,memorysize:1024,memorysize:1024,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
+[log] {"message":{"message":"XXX LOG 2 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,architecture:x86_64,architecture:x86_64,architecture:x86_64,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,functionname:integration-tests-extension-STAGE-log-node,memorysize:1024,memorysize:1024,memorysize:1024,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,resource:integration-tests-extension-STAGE-log-node,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
 [log] {"message":{"message":"END XXX"}}
 [log] {"message":{"message":"REPORT XXX"}}
diff --git a/integration_tests/snapshots/log-python b/integration_tests/snapshots/log-python
index 119849b47..ddb942cf9 100644
--- a/integration_tests/snapshots/log-python
+++ b/integration_tests/snapshots/log-python
@@ -1,6 +1,6 @@
 [log] {"message":{"message":"START XXX"}}
-[log] {"message":{"message":"XXX LOG 0 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
-[log] {"message":{"message":"XXX LOG 1 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
-[log] {"message":{"message":"XXX LOG 2 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
+[log] {"message":{"message":"XXX LOG 0 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,architecture:x86_64,architecture:x86_64,architecture:x86_64,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,memorysize:1024,memorysize:1024,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
+[log] {"message":{"message":"XXX LOG 1 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,architecture:x86_64,architecture:x86_64,architecture:x86_64,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,memorysize:1024,memorysize:1024,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
+[log] {"message":{"message":"XXX LOG 2 XXX\n","lambda":{"arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python"}},"status":"info","timestamp":TIMESTAMP,"hostname":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python","service":"integration-tests-service","ddsource":"lambda","ddtags":"account_id:601427279990,account_id:601427279990,account_id:601427279990,architecture:x86_64,architecture:x86_64,architecture:x86_64,aws_account:601427279990,aws_account:601427279990,aws_account:601427279990,dd_extension_version:123,dd_extension_version:123,dd_extension_version:123,env:integration-tests-env,env:integration-tests-env,env:integration-tests-env,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,functionname:integration-tests-extension-STAGE-log-python,memorysize:1024,memorysize:1024,memorysize:1024,region:sa-east-1,region:sa-east-1,region:sa-east-1,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,resource:integration-tests-extension-STAGE-log-python,service:integration-tests-service,service:integration-tests-service,service:integration-tests-service,taga:valuea,taga:valuea,taga:valuea,tagb:valueb,tagb:valueb,tagb:valueb,tagc:valuec,tagc:valuec,tagc:valuec,tagd:valued,tagd:valued,tagd:valued,version:integration-tests-version,version:integration-tests-version,version:integration-tests-version"}
 [log] {"message":{"message":"END XXX"}}
 [log] {"message":{"message":"REPORT XXX"}}
diff --git a/integration_tests/snapshots/no-enhanced-metric-node b/integration_tests/snapshots/no-enhanced-metric-node
index 8ab4350a5..c9f0e4b96 100644
--- a/integration_tests/snapshots/no-enhanced-metric-node
+++ b/integration_tests/snapshots/no-enhanced-metric-node
@@ -1 +1 @@
-[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-nodevX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-no-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-no-enhanced-metric-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-no-enhanced-metric-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-nodevX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-no-enhanced-metric-node","functionname:integration-tests-extension-XXXXXX-no-enhanced-metric-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-no-enhanced-metric-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
diff --git a/integration_tests/snapshots/no-enhanced-metric-python b/integration_tests/snapshots/no-enhanced-metric-python
index 89606f217..a55a2bd5d 100644
--- a/integration_tests/snapshots/no-enhanced-metric-python
+++ b/integration_tests/snapshots/no-enhanced-metric-python
@@ -1 +1 @@
-[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-no-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-no-enhanced-metric-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-no-enhanced-metric-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-no-enhanced-metric-python","functionname:integration-tests-extension-XXXXXX-no-enhanced-metric-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-no-enhanced-metric-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
diff --git a/integration_tests/snapshots/simple-trace-go b/integration_tests/snapshots/simple-trace-go
index a715489b4..658adb6cb 100644
--- a/integration_tests/snapshots/simple-trace-go
+++ b/integration_tests/snapshots/simple-trace-go
@@ -1,2 +1,2 @@
-[trace] {"traceID":XXX,"spans":[{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-go","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","cold_start":"false","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-go","runtime-id":"XXX","service":"integration-tests-service","system.pid":"XXX","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.top_level":1,"_sampling_priority_v1":1,"_top_level":1},"type":"serverless"},{"service":"aws.lambda","name":"http.request","resource":"http.request","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","http.method":"GET","http.status_code":"200","http.url":"","region":"sa-east-1","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_sampling_priority_v1":1},"type":"http"},{"service":"aws.lambda","name":"child.span","resource":"child.span","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","region":"sa-east-1","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_sampling_priority_v1":1},"type":""}],"startTime":XXX,"endTime":XXX}
-[trace] {"traceID":XXX,"spans":[{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-go","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","cold_start":"true","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-go","runtime-id":"XXX","service":"integration-tests-service","system.pid":"XXX","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.top_level":1,"_sampling_priority_v1":1,"_top_level":1},"type":"serverless"},{"service":"aws.lambda","name":"http.request","resource":"http.request","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","http.method":"GET","http.status_code":"200","http.url":"","region":"sa-east-1","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_sampling_priority_v1":1},"type":"http"},{"service":"aws.lambda","name":"child.span","resource":"child.span","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","region":"sa-east-1","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_sampling_priority_v1":1},"type":""}],"startTime":XXX,"endTime":XXX}
+[trace] {"traceID":XXX,"spans":[{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-go","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","cold_start":"false","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","memorysize":"1024","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-go","runtime-id":"XXX","service":"integration-tests-service","system.pid":"XXX","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.top_level":1,"_sampling_priority_v1":1,"_top_level":1},"type":"serverless"},{"service":"aws.lambda","name":"http.request","resource":"http.request","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","http.method":"GET","http.status_code":"200","http.url":"","memorysize":"1024","region":"sa-east-1","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_sampling_priority_v1":1},"type":"http"},{"service":"aws.lambda","name":"child.span","resource":"child.span","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","memorysize":"1024","region":"sa-east-1","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_sampling_priority_v1":1},"type":""}],"startTime":XXX,"endTime":XXX}
+[trace] {"traceID":XXX,"spans":[{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-go","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","cold_start":"true","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","memorysize":"1024","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-go","runtime-id":"XXX","service":"integration-tests-service","system.pid":"XXX","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.top_level":1,"_sampling_priority_v1":1,"_top_level":1},"type":"serverless"},{"service":"aws.lambda","name":"http.request","resource":"http.request","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","http.method":"GET","http.status_code":"200","http.url":"","memorysize":"1024","region":"sa-east-1","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_sampling_priority_v1":1},"type":"http"},{"service":"aws.lambda","name":"child.span","resource":"child.span","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-go","functionname":"integration-tests-extension-XXXXXX-simple-trace-go","memorysize":"1024","region":"sa-east-1","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_sampling_priority_v1":1},"type":""}],"startTime":XXX,"endTime":XXX}
diff --git a/integration_tests/snapshots/simple-trace-node b/integration_tests/snapshots/simple-trace-node
index 17b10a8a5..51b73be06 100644
--- a/integration_tests/snapshots/simple-trace-node
+++ b/integration_tests/snapshots/simple-trace-node
@@ -1,2 +1,2 @@
-[trace] {"traceID":XXX,"spans":[{"service":"integration-tests-service","name":"integration_test","resource":"integration-test","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-node","functionname":"integration-tests-extension-XXXXXX-simple-trace-node","language":"javascript","region":"sa-east-1","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.measured":1,"_sample_rate":1,"_sampling_priority_v1":1,"_top_level":1},"type":""},{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-node","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","cold_start":"false","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-node","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-node","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-node","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.measured":1,"_sample_rate":1,"_sampling_priority_v1":1,"_top_level":1},"type":"serverless"}],"startTime":XXX,"endTime":XXX}
-[trace] {"traceID":XXX,"spans":[{"service":"integration-tests-service","name":"integration_test","resource":"integration-test","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-node","functionname":"integration-tests-extension-XXXXXX-simple-trace-node","language":"javascript","region":"sa-east-1","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.measured":1,"_sample_rate":1,"_sampling_priority_v1":1,"_top_level":1},"type":""},{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-node","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","cold_start":"true","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-node","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-node","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-node","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.measured":1,"_sample_rate":1,"_sampling_priority_v1":1,"_top_level":1},"type":"serverless"}],"startTime":XXX,"endTime":XXX}
+[trace] {"traceID":XXX,"spans":[{"service":"integration-tests-service","name":"integration_test","resource":"integration-test","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-node","functionname":"integration-tests-extension-XXXXXX-simple-trace-node","language":"javascript","memorysize":"1024","region":"sa-east-1","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.measured":1,"_sample_rate":1,"_sampling_priority_v1":1,"_top_level":1},"type":""},{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-node","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","cold_start":"false","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-node","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-node","memorysize":"1024","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-node","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.measured":1,"_sample_rate":1,"_sampling_priority_v1":1,"_top_level":1},"type":"serverless"}],"startTime":XXX,"endTime":XXX}
+[trace] {"traceID":XXX,"spans":[{"service":"integration-tests-service","name":"integration_test","resource":"integration-test","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-node","functionname":"integration-tests-extension-XXXXXX-simple-trace-node","language":"javascript","memorysize":"1024","region":"sa-east-1","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.measured":1,"_sample_rate":1,"_sampling_priority_v1":1,"_top_level":1},"type":""},{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-node","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","cold_start":"true","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-node","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-node","memorysize":"1024","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-node","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.measured":1,"_sample_rate":1,"_sampling_priority_v1":1,"_top_level":1},"type":"serverless"}],"startTime":XXX,"endTime":XXX}
diff --git a/integration_tests/snapshots/simple-trace-python b/integration_tests/snapshots/simple-trace-python
index 483362115..f2a7f4d43 100644
--- a/integration_tests/snapshots/simple-trace-python
+++ b/integration_tests/snapshots/simple-trace-python
@@ -1 +1 @@
-[trace] {"traceID":XXX,"spans":[{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-python","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","cold_start":"true","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-python","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-python","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-python","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.tracer_kr":1,"_sampling_priority_v1":1,"_top_level":1,"system.pid":XXX},"type":"serverless"},{"service":"aws.lambda","name":"integration_test","resource":"integration-test","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-python","functionname":"integration-tests-extension-XXXXXX-simple-trace-python","region":"sa-east-1","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":null,"type":""}],"startTime":XXX,"endTime":XXX}
+[trace] {"traceID":XXX,"spans":[{"service":"aws.lambda","name":"aws.lambda","resource":"integration-tests-extension-XXXXXX-simple-trace-python","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","cold_start":"true","datadog_lambda":"X.X.X","dd_extension_version":"123","dd_trace":"X.X.X","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-python","function_version":"$LATEST","functionname":"integration-tests-extension-XXXXXX-simple-trace-python","memorysize":"1024","region":"sa-east-1","request_id":"XXX","resource_names":"integration-tests-extension-XXXXXX-simple-trace-python","runtime-id":"XXX","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":{"_dd.agent_psr":1,"_dd.tracer_kr":1,"_sampling_priority_v1":1,"_top_level":1,"system.pid":XXX},"type":"serverless"},{"service":"aws.lambda","name":"integration_test","resource":"integration-test","trace_id":XXX,"span_id":XXX,"parent_id":XXX,"start":XXX,"duration":XXX,"error":0,"meta":{"_dd.compute_stats":"1","_dd.origin":"lambda","account_id":"601427279990","architecture":"x86_64","aws_account":"601427279990","dd_extension_version":"123","env":"integration-tests-env","function_arn":"arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-simple-trace-python","functionname":"integration-tests-extension-XXXXXX-simple-trace-python","memorysize":"1024","region":"sa-east-1","service":"integration-tests-service","tagA":"valueA","tagB":"valueB","taga":"valuea","tagb":"valueb","tagc":"valuec","tagd":"valued","version":"integration-tests-version"},"metrics":null,"type":""}],"startTime":XXX,"endTime":XXX}
diff --git a/integration_tests/snapshots/timeout-node b/integration_tests/snapshots/timeout-node
index 65b182bcf..0e9f5a6e7 100644
--- a/integration_tests/snapshots/timeout-node
+++ b/integration_tests/snapshots/timeout-node
@@ -1,14 +1,14 @@
-[sketch] {"metric":"aws.lambda.enhanced.billed_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.estimated_cost","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.init_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","runtime:nodejs14.x","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","runtime:nodejs14.x","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.max_memory_used","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.memorysize","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:false","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.timeouts","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:false","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.timeouts","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-nodevX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-nodevX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.billed_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.estimated_cost","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.init_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","runtime:nodejs14.x","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","runtime:nodejs14.x","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.max_memory_used","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.memorysize","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:false","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.timeouts","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:false","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.timeouts","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-nodevX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-nodevX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-node","functionname:integration-tests-extension-XXXXXX-timeout-node","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-node","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
diff --git a/integration_tests/snapshots/timeout-python b/integration_tests/snapshots/timeout-python
index d4a71473b..131ad5110 100644
--- a/integration_tests/snapshots/timeout-python
+++ b/integration_tests/snapshots/timeout-python
@@ -1,14 +1,14 @@
-[sketch] {"metric":"aws.lambda.enhanced.billed_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.estimated_cost","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.init_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","runtime:python3.8","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","runtime:python3.8","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.max_memory_used","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.memorysize","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:false","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.timeouts","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:false","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"aws.lambda.enhanced.timeouts","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
-[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.billed_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.estimated_cost","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.init_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","runtime:python3.8","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.invocations","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","datadog_lambda:vX.X.X","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","runtime:python3.8","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.max_memory_used","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.memorysize","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:false","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.runtime_duration","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":XXX,"max":XXX,"avg":XXX,"sum":XXX,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.timeouts","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:false","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"aws.lambda.enhanced.timeouts","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","cold_start:true","dd_extension_version:123","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
+[sketch] {"metric":"serverless.lambda-extension.integration-test.count","distributions":null,"tags":["account_id:601427279990","architecture:x86_64","aws_account:601427279990","dd_extension_version:123","dd_lambda_layer:datadog-pythonX.X.X","env:integration-tests-env","function_arn:arn:aws:lambda:sa-east-1:601427279990:function:integration-tests-extension-XXXXXX-timeout-python","functionname:integration-tests-extension-XXXXXX-timeout-python","memorysize:1024","region:sa-east-1","resource:integration-tests-extension-XXXXXX-timeout-python","service:integration-tests-service","version:integration-tests-version"],"dogsketches":[{"ts":XXX,"cnt":1,"min":1,"max":1,"avg":1,"sum":1,"k":[XXX],"n":[1]}]} 
diff --git a/scripts/build_binary_and_layer_dockerized.sh b/scripts/build_binary_and_layer_dockerized.sh
index 1fa559dc1..de731d02c 100755
--- a/scripts/build_binary_and_layer_dockerized.sh
+++ b/scripts/build_binary_and_layer_dockerized.sh
@@ -59,14 +59,14 @@ function docker_build_zip {
 }
 
 
-if [ $ARCHITECTURE == "amd64" ]; then
+if [ "$ARCHITECTURE" == "amd64" ]; then
     echo "Building for amd64 only"
     docker_build_zip amd64
-elif [ $ARCHITECTURE == "arm64" ]; then
+elif [ "$ARCHITECTURE" == "arm64" ]; then
     echo "Building for arm64 only"
     docker_build_zip arm64
 else
-    echo "No valid ARCHITECTURE variable found (allowed values are : arm64, amd64), building for both amd64 and arm64"
+    echo "No valid ARCHITECTURE variable found (allowed values are: amd64, arm64), building for both amd64 and arm64"
     docker_build_zip amd64
     docker_build_zip arm64
 fi