diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 679b092d..4185e00f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Lint
         run: yarn lint
 
-  test:
+  unit-test:
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
@@ -65,3 +65,38 @@ jobs:
 
       - name: Upload code coverage report
         run: bash <(curl -s https://codecov.io/bash)
+
+  integration-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Node 14
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14
+
+      - name: Cache Node modules
+        id: cache-node-modules
+        uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Install Serverless Framework
+        run: sudo yarn global add serverless --prefix /usr/local
+
+      - name: Install dependencies
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        working-directory: integration_tests
+        run: yarn install
+
+      - name: Run tests
+        env:
+          BUILD_LAYERS: true
+          DD_API_KEY: ${{ secrets.DD_API_KEY }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        run: ./scripts/run_integration_tests.sh
diff --git a/integration_tests/http-requests.js b/integration_tests/http-requests.js
index 8ed60898..498e706e 100644
--- a/integration_tests/http-requests.js
+++ b/integration_tests/http-requests.js
@@ -17,4 +17,4 @@ async function handle(event, context) {
   return responsePayload;
 }
 
-module.exports.handle = process.env.WITH_PLUGIN ? handle : datadog(handle);
+module.exports.handle = datadog(handle);
diff --git a/integration_tests/process-input-traced.js b/integration_tests/process-input-traced.js
index 13c144a8..c6322c9c 100644
--- a/integration_tests/process-input-traced.js
+++ b/integration_tests/process-input-traced.js
@@ -82,4 +82,4 @@ const getAPIGatewayRequestId = tracer.wrap("getAPIGatewayRequestId", (event) =>
   return requestId;
 });
 
-module.exports.handle = process.env.WITH_PLUGIN ? handle : datadog(handle);
+module.exports.handle = datadog(handle);
diff --git a/integration_tests/send-metrics.js b/integration_tests/send-metrics.js
index b2eccc93..7bee8506 100644
--- a/integration_tests/send-metrics.js
+++ b/integration_tests/send-metrics.js
@@ -47,4 +47,4 @@ async function handle(event, context) {
   return responsePayload;
 }
 
-module.exports.handle = process.env.WITH_PLUGIN ? handle : datadog(handle);
+module.exports.handle = datadog(handle);
diff --git a/integration_tests/serverless-plugin.yml b/integration_tests/serverless-plugin.yml
deleted file mode 100644
index c266b402..00000000
--- a/integration_tests/serverless-plugin.yml
+++ /dev/null
@@ -1,164 +0,0 @@
-service: integration-plugin
-
-provider:
-  name: aws
-  environment:
-    DD_INTEGRATION_TEST: true
-    DD_API_KEY: ${env:DD_API_KEY}
-  lambdaHashingVersion: 20201221
-
-layers:
-  node10:
-    package:
-      artifact: ../.layers/datadog_lambda_node10.15.zip
-  node12:
-    package:
-      artifact: ../.layers/datadog_lambda_node12.13.zip
-  node14:
-    package:
-      artifact: ../.layers/datadog_lambda_node14.15.zip
-
-functions:
-  # async-metrics
-  async-metrics_node10_with_plugin:
-    handler: send-metrics.handle
-    runtime: nodejs10.x
-    layers:
-      - { Ref: Node10LambdaLayer }
-    environment:
-      DD_FLUSH_TO_LOG: true
-      WITH_PLUGIN: true
-
-  async-metrics_node12_with_plugin:
-    handler: send-metrics.handle
-    runtime: nodejs12.x
-    layers:
-      - { Ref: Node12LambdaLayer }
-    environment:
-      DD_FLUSH_TO_LOG: true
-      WITH_PLUGIN: true
-
-  async-metrics_node14_with_plugin:
-    handler: send-metrics.handle
-    runtime: nodejs14.x
-    layers:
-      - { Ref: Node14LambdaLayer }
-    environment:
-      DD_FLUSH_TO_LOG: true
-      WITH_PLUGIN: true
-
-  # sync-metrics
-  sync-metrics_node10_with_plugin:
-    handler: send-metrics.handle
-    runtime: nodejs10.x
-    layers:
-      - { Ref: Node10LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-
-  sync-metrics_node12_with_plugin:
-    handler: send-metrics.handle
-    runtime: nodejs12.x
-    layers:
-      - { Ref: Node12LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-
-  sync-metrics_node14_with_plugin:
-    handler: send-metrics.handle
-    runtime: nodejs14.x
-    layers:
-      - { Ref: Node14LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-
-  # http-requests
-  http-requests_node10_with_plugin:
-    handler: http-requests.handle
-    runtime: nodejs10.x
-    layers:
-      - { Ref: Node10LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-
-  http-requests_node12_with_plugin:
-    handler: http-requests.handle
-    runtime: nodejs12.x
-    layers:
-      - { Ref: Node12LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-
-  http-requests_node14_with_plugin:
-    handler: http-requests.handle
-    runtime: nodejs14.x
-    layers:
-      - { Ref: Node14LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-
-  # process-input-traced
-  process-input-traced_node10_with_plugin:
-    handler: process-input-traced.handle
-    runtime: nodejs10.x
-    layers:
-      - { Ref: Node10LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-      DD_FLUSH_TO_LOG: true
-
-  process-input-traced_node12_with_plugin:
-    handler: process-input-traced.handle
-    runtime: nodejs12.x
-    layers:
-      - { Ref: Node12LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-      DD_FLUSH_TO_LOG: true
-
-  process-input-traced_node14_with_plugin:
-    handler: process-input-traced.handle
-    runtime: nodejs14.x
-    layers:
-      - { Ref: Node12LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-      DD_FLUSH_TO_LOG: true
-
-  # throw-error-traced
-  throw-error-traced_node10_with_plugin:
-    handler: throw-error-traced.handle
-    runtime: nodejs10.x
-    layers:
-      - { Ref: Node10LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-      DD_FLUSH_TO_LOG: true
-
-  throw-error-traced_node12_with_plugin:
-    handler: throw-error-traced.handle
-    runtime: nodejs12.x
-    layers:
-      - { Ref: Node12LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-      DD_FLUSH_TO_LOG: true
-
-  throw-error-traced_node14_with_plugin:
-    handler: throw-error-traced.handle
-    runtime: nodejs14.x
-    layers:
-      - { Ref: Node14LambdaLayer }
-    environment:
-      WITH_PLUGIN: true
-      DD_FLUSH_TO_LOG: true
-
-plugins:
-  - serverless-plugin-datadog
-
-custom:
-  datadog:
-    flushMetricsToLogs: true
-    enableXrayTracing: true
-    addLayers: false
-    enableDDTracing: true
diff --git a/integration_tests/serverless.yml b/integration_tests/serverless.yml
index fbad518a..9db60edd 100644
--- a/integration_tests/serverless.yml
+++ b/integration_tests/serverless.yml
@@ -1,7 +1,9 @@
-service: integration
+# IAM permissions require service name to begin with 'integration-tests'
+service: integration-tests-js
 
 provider:
   name: aws
+  region: sa-east-1
   tracing:
     lambda: true
     apiGateway: true
@@ -9,6 +11,12 @@ provider:
     DD_INTEGRATION_TEST: true
     DD_API_KEY: ${env:DD_API_KEY}
   lambdaHashingVersion: 20201221
+  timeout: 15
+  deploymentBucket:
+    name: integration-tests-deployment-bucket
+  iam:
+    # IAM permissions require that all functions are deployed with this role
+    role: "arn:aws:iam::601427279990:role/serverless-integration-test-lambda-role"
 
 layers:
   node10:
@@ -17,7 +25,6 @@ layers:
   node12:
     package:
       artifact: ../.layers/datadog_lambda_node12.13.zip
-
   node14:
     package:
       artifact: ../.layers/datadog_lambda_node14.15.zip
@@ -110,6 +117,7 @@ functions:
       - { Ref: Node14LambdaLayer }
     environment:
       DD_FLUSH_TO_LOG: true
+
   # throw-error-traced
   throw-error-traced_node10:
     handler: throw-error-traced.handle
diff --git a/integration_tests/snapshots/logs/async-metrics_node10.log b/integration_tests/snapshots/logs/async-metrics_node10.log
index 61c75e4c..826448b7 100644
--- a/integration_tests/snapshots/logs/async-metrics_node10.log
+++ b/integration_tests/snapshots/logs/async-metrics_node10.log
@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-async-metrics_node10","resource:integration-dev-async-metrics_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-async-metrics_node10","resource:integration-tests-js-XXXX-async-metrics_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:APIGateway","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
 END RequestId: XXXX
@@ -7,7 +7,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-async-metrics_node10","resource:integration-dev-async-metrics_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-async-metrics_node10","resource:integration-tests-js-XXXX-async-metrics_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
@@ -16,7 +16,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-async-metrics_node10","resource:integration-dev-async-metrics_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-async-metrics_node10","resource:integration-tests-js-XXXX-async-metrics_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
diff --git a/integration_tests/snapshots/logs/async-metrics_node10_with_plugin.log b/integration_tests/snapshots/logs/async-metrics_node10_with_plugin.log
deleted file mode 100644
index d497c6a1..00000000
--- a/integration_tests/snapshots/logs/async-metrics_node10_with_plugin.log
+++ /dev/null
@@ -1,29 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-async-metrics_node10_with_plugin","resource:integration-plugin-dev-async-metrics_node10_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:APIGateway","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-async-metrics_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-async-metrics_node10_with_plugin","cold_start":"true","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-async-metrics_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-async-metrics_node10_with_plugin","resource:integration-plugin-dev-async-metrics_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-async-metrics_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-async-metrics_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-async-metrics_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-async-metrics_node10_with_plugin","resource:integration-plugin-dev-async-metrics_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-async-metrics_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-async-metrics_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-async-metrics_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/async-metrics_node12.log b/integration_tests/snapshots/logs/async-metrics_node12.log
index a8a2d743..3ed686f4 100644
--- a/integration_tests/snapshots/logs/async-metrics_node12.log
+++ b/integration_tests/snapshots/logs/async-metrics_node12.log
@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-async-metrics_node12","resource:integration-dev-async-metrics_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-async-metrics_node12","resource:integration-tests-js-XXXX-async-metrics_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:APIGateway","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
 END RequestId: XXXX
@@ -7,7 +7,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-async-metrics_node12","resource:integration-dev-async-metrics_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-async-metrics_node12","resource:integration-tests-js-XXXX-async-metrics_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
@@ -16,7 +16,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-async-metrics_node12","resource:integration-dev-async-metrics_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-async-metrics_node12","resource:integration-tests-js-XXXX-async-metrics_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
diff --git a/integration_tests/snapshots/logs/async-metrics_node12_with_plugin.log b/integration_tests/snapshots/logs/async-metrics_node12_with_plugin.log
deleted file mode 100644
index 3c595ef0..00000000
--- a/integration_tests/snapshots/logs/async-metrics_node12_with_plugin.log
+++ /dev/null
@@ -1,29 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-async-metrics_node12_with_plugin","resource:integration-plugin-dev-async-metrics_node12_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:APIGateway","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-async-metrics_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-async-metrics_node12_with_plugin","cold_start":"true","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-async-metrics_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-async-metrics_node12_with_plugin","resource:integration-plugin-dev-async-metrics_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-async-metrics_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-async-metrics_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-async-metrics_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-async-metrics_node12_with_plugin","resource:integration-plugin-dev-async-metrics_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-async-metrics_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-async-metrics_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-async-metrics_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/async-metrics_node14.log b/integration_tests/snapshots/logs/async-metrics_node14.log
index e7f466a2..a8a53a3e 100644
--- a/integration_tests/snapshots/logs/async-metrics_node14.log
+++ b/integration_tests/snapshots/logs/async-metrics_node14.log
@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-async-metrics_node14","resource:integration-dev-async-metrics_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-async-metrics_node14","resource:integration-tests-js-XXXX-async-metrics_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:APIGateway","dd_lambda_layer:datadog-nodev14.XX.X"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
 END RequestId: XXXX
@@ -7,7 +7,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-async-metrics_node14","resource:integration-dev-async-metrics_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-async-metrics_node14","resource:integration-tests-js-XXXX-async-metrics_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev14.XX.X"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev14.XX.X"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
@@ -16,7 +16,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-async-metrics_node14","resource:integration-dev-async-metrics_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-async-metrics_node14","resource:integration-tests-js-XXXX-async-metrics_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev14.XX.X"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev14.XX.X"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev14.XX.X"],"v":1}
diff --git a/integration_tests/snapshots/logs/async-metrics_node14_with_plugin.log b/integration_tests/snapshots/logs/async-metrics_node14_with_plugin.log
deleted file mode 100644
index 0b6a8cdc..00000000
--- a/integration_tests/snapshots/logs/async-metrics_node14_with_plugin.log
+++ /dev/null
@@ -1,23 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	Processed APIGateway request
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	Processed SNS request
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	Processed SQS request
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/http-requests_node10.log b/integration_tests/snapshots/logs/http-requests_node10.log
index 115bf13d..f75b0cf6 100644
--- a/integration_tests/snapshots/logs/http-requests_node10.log
+++ b/integration_tests/snapshots/logs/http-requests_node10.log
@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-http-requests_node10","resource:integration-dev-http-requests_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-http-requests_node10","resource:integration-tests-js-XXXX-http-requests_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 HTTP GET https://ip-ranges.datadoghq.com/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
@@ -9,7 +9,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-http-requests_node10","resource:integration-dev-http-requests_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-http-requests_node10","resource:integration-tests-js-XXXX-http-requests_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 HTTP GET https://ip-ranges.datadoghq.com/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
@@ -19,7 +19,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-http-requests_node10","resource:integration-dev-http-requests_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-http-requests_node10","resource:integration-tests-js-XXXX-http-requests_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 HTTP GET https://ip-ranges.datadoghq.com/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
diff --git a/integration_tests/snapshots/logs/http-requests_node10_with_plugin.log b/integration_tests/snapshots/logs/http-requests_node10_with_plugin.log
deleted file mode 100644
index de5628e7..00000000
--- a/integration_tests/snapshots/logs/http-requests_node10_with_plugin.log
+++ /dev/null
@@ -1,26 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-http-requests_node10_with_plugin","resource:integration-plugin-dev-http-requests_node10_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:http-request","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node10_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.com/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node10_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node10_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.eu/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node10_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-http-requests_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node10_with_plugin","cold_start":"true","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-http-requests_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-http-requests_node10_with_plugin","resource:integration-plugin-dev-http-requests_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:http-request","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node10_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.com/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node10_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node10_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.eu/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node10_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-http-requests_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-http-requests_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-http-requests_node10_with_plugin","resource:integration-plugin-dev-http-requests_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:http-request","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node10_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.com/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node10_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node10_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.eu/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node10_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-http-requests_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-http-requests_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/http-requests_node12.log b/integration_tests/snapshots/logs/http-requests_node12.log
index 02bc86e5..24e483f1 100644
--- a/integration_tests/snapshots/logs/http-requests_node12.log
+++ b/integration_tests/snapshots/logs/http-requests_node12.log
@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-http-requests_node12","resource:integration-dev-http-requests_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-http-requests_node12","resource:integration-tests-js-XXXX-http-requests_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 HTTP GET https://ip-ranges.datadoghq.com/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
@@ -9,7 +9,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-http-requests_node12","resource:integration-dev-http-requests_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-http-requests_node12","resource:integration-tests-js-XXXX-http-requests_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 HTTP GET https://ip-ranges.datadoghq.com/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
@@ -19,11 +19,11 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-http-requests_node12","resource:integration-dev-http-requests_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-http-requests_node12","resource:integration-tests-js-XXXX-http-requests_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 HTTP GET https://ip-ranges.datadoghq.com/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
-HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
+HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/http-requests_node12_with_plugin.log b/integration_tests/snapshots/logs/http-requests_node12_with_plugin.log
deleted file mode 100644
index d68edaac..00000000
--- a/integration_tests/snapshots/logs/http-requests_node12_with_plugin.log
+++ /dev/null
@@ -1,26 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-http-requests_node12_with_plugin","resource:integration-plugin-dev-http-requests_node12_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:http-request","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node12_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.com/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node12_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node12_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.eu/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node12_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-http-requests_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node12_with_plugin","cold_start":"true","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-http-requests_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-http-requests_node12_with_plugin","resource:integration-plugin-dev-http-requests_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:http-request","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node12_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.com/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node12_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node12_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.eu/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node12_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-http-requests_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-http-requests_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-http-requests_node12_with_plugin","resource:integration-plugin-dev-http-requests_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:http-request","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node12_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.com/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node12_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"http.request","resource":"GET","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node12_with_plugin","span.kind":"client","http.method":"GET","http.url":"https://ip-ranges.datadoghq.eu/","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-http-requests_node12_with_plugin-http-client","type":"http"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-http-requests_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-http-requests_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-http-requests_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/http-requests_node14.log b/integration_tests/snapshots/logs/http-requests_node14.log
index 189cf111..1fdd1905 100644
--- a/integration_tests/snapshots/logs/http-requests_node14.log
+++ b/integration_tests/snapshots/logs/http-requests_node14.log
@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-http-requests_node14","resource:integration-dev-http-requests_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-http-requests_node14","resource:integration-tests-js-XXXX-http-requests_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 HTTP GET https://ip-ranges.datadoghq.com/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
@@ -9,7 +9,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-http-requests_node14","resource:integration-dev-http-requests_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-http-requests_node14","resource:integration-tests-js-XXXX-http-requests_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 HTTP GET https://ip-ranges.datadoghq.com/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
@@ -19,7 +19,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-http-requests_node14","resource:integration-dev-http-requests_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-http-requests_node14","resource:integration-tests-js-XXXX-http-requests_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 HTTP GET https://ip-ranges.datadoghq.com/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 HTTP GET https://ip-ranges.datadoghq.eu/ Headers: ["Accept:application/json, text/plain, */*","User-Agent:axios/0.21.1","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
diff --git a/integration_tests/snapshots/logs/http-requests_node14_with_plugin.log b/integration_tests/snapshots/logs/http-requests_node14_with_plugin.log
deleted file mode 100644
index 318d9d7f..00000000
--- a/integration_tests/snapshots/logs/http-requests_node14_with_plugin.log
+++ /dev/null
@@ -1,20 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	Snapshot test http requests successfully made to URLs: https://ip-ranges.datadoghq.com,https://ip-ranges.datadoghq.eu
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/process-input-traced_node10.log b/integration_tests/snapshots/logs/process-input-traced_node10.log
index d0c2a2d3..c9f4bb3c 100644
--- a/integration_tests/snapshots/logs/process-input-traced_node10.log
+++ b/integration_tests/snapshots/logs/process-input-traced_node10.log
@@ -1,29 +1,29 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-process-input-traced_node10","resource:integration-dev-process-input-traced_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-process-input-traced_node10","resource:integration-tests-js-XXXX-process-input-traced_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getAPIGatewayRequestId","resource":"getAPIGatewayRequestId","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-dev-process-input-traced_node10","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","cold_start":"true","function_arn":"XXXX_node10","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-dev-process-input-traced_node10","datadog_lambda":"XXXX","dd_trace":"XXXX","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","http.status_code":"200"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","span.kind":"client","dns.hostname":"0.0.0.0","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10-dns"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","span.kind":"client","dns.hostname":"169.254.79.2","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getAPIGatewayRequestId","resource":"getAPIGatewayRequestId","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-tests-js-XXXX-process-input-traced_node10","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10-dns"}]]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-process-input-traced_node10","resource:integration-dev-process-input-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-process-input-traced_node10","resource:integration-tests-js-XXXX-process-input-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","record_event_type":"SNS","record_ids":"95df01b4-ee98-5cb9-9903-4c221d41eb5e","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-dev-process-input-traced_node10","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","cold_start":"false","function_arn":"XXXX_node10","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-dev-process-input-traced_node10","datadog_lambda":"XXXX","dd_trace":"XXXX","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda","event_type":"SNS"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","span.kind":"client","dns.hostname":"0.0.0.0","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10-dns"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","span.kind":"client","dns.hostname":"169.254.79.2","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-tests-js-XXXX-process-input-traced_node10","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10-dns"}]]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-process-input-traced_node10","resource:integration-dev-process-input-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-process-input-traced_node10","resource:integration-tests-js-XXXX-process-input-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","record_event_type":"SQS","record_ids":"059f36b4-87a3-44ab-83d2-661975830a7d,2e1424d4-f796-459a-8184-9c92662be6da","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-dev-process-input-traced_node10","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","cold_start":"false","function_arn":"XXXX_node10","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-dev-process-input-traced_node10","datadog_lambda":"XXXX","dd_trace":"XXXX","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue","event_type":"SQS"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","span.kind":"client","dns.hostname":"0.0.0.0","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10-dns"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"service":"integration-dev-process-input-traced_node10","span.kind":"client","dns.hostname":"169.254.79.2","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node10-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-tests-js-XXXX-process-input-traced_node10","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node10-dns"}]]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/process-input-traced_node10_with_plugin.log b/integration_tests/snapshots/logs/process-input-traced_node10_with_plugin.log
deleted file mode 100644
index c2e04225..00000000
--- a/integration_tests/snapshots/logs/process-input-traced_node10_with_plugin.log
+++ /dev/null
@@ -1,23 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-process-input-traced_node10_with_plugin","resource:integration-plugin-dev-process-input-traced_node10_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node10_with_plugin","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node10_with_plugin"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getAPIGatewayRequestId","resource":"getAPIGatewayRequestId","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node10_with_plugin","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node10_with_plugin"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-process-input-traced_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node10_with_plugin","cold_start":"true","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-process-input-traced_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-process-input-traced_node10_with_plugin","resource:integration-plugin-dev-process-input-traced_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node10_with_plugin","record_event_type":"SNS","record_ids":"95df01b4-ee98-5cb9-9903-4c221d41eb5e","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node10_with_plugin"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-process-input-traced_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-process-input-traced_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda","event_type":"SNS"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-process-input-traced_node10_with_plugin","resource:integration-plugin-dev-process-input-traced_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node10_with_plugin","record_event_type":"SQS","record_ids":"059f36b4-87a3-44ab-83d2-661975830a7d,2e1424d4-f796-459a-8184-9c92662be6da","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node10_with_plugin"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-process-input-traced_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-process-input-traced_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue","event_type":"SQS"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/process-input-traced_node12.log b/integration_tests/snapshots/logs/process-input-traced_node12.log
index 1ed4bcad..93dac3ab 100644
--- a/integration_tests/snapshots/logs/process-input-traced_node12.log
+++ b/integration_tests/snapshots/logs/process-input-traced_node12.log
@@ -1,29 +1,29 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-process-input-traced_node12","resource:integration-dev-process-input-traced_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-process-input-traced_node12","resource:integration-tests-js-XXXX-process-input-traced_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getAPIGatewayRequestId","resource":"getAPIGatewayRequestId","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-dev-process-input-traced_node12","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","cold_start":"true","function_arn":"XXXX_node12","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-dev-process-input-traced_node12","datadog_lambda":"XXXX","dd_trace":"XXXX","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","http.status_code":"200"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","span.kind":"client","dns.hostname":"0.0.0.0","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12-dns"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","span.kind":"client","dns.hostname":"169.254.79.2","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getAPIGatewayRequestId","resource":"getAPIGatewayRequestId","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-tests-js-XXXX-process-input-traced_node12","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12-dns"}]]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-process-input-traced_node12","resource:integration-dev-process-input-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-process-input-traced_node12","resource:integration-tests-js-XXXX-process-input-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","record_event_type":"SNS","record_ids":"95df01b4-ee98-5cb9-9903-4c221d41eb5e","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-dev-process-input-traced_node12","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","cold_start":"false","function_arn":"XXXX_node12","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-dev-process-input-traced_node12","datadog_lambda":"XXXX","dd_trace":"XXXX","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda","event_type":"SNS"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","span.kind":"client","dns.hostname":"0.0.0.0","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12-dns"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","span.kind":"client","dns.hostname":"169.254.79.2","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-tests-js-XXXX-process-input-traced_node12","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12-dns"}]]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-process-input-traced_node12","resource:integration-dev-process-input-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-process-input-traced_node12","resource:integration-tests-js-XXXX-process-input-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","record_event_type":"SQS","record_ids":"059f36b4-87a3-44ab-83d2-661975830a7d,2e1424d4-f796-459a-8184-9c92662be6da","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-dev-process-input-traced_node12","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","cold_start":"false","function_arn":"XXXX_node12","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-dev-process-input-traced_node12","datadog_lambda":"XXXX","dd_trace":"XXXX","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue","event_type":"SQS"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","span.kind":"client","dns.hostname":"0.0.0.0","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12-dns"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"service":"integration-dev-process-input-traced_node12","span.kind":"client","dns.hostname":"169.254.79.2","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node12-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-tests-js-XXXX-process-input-traced_node12","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node12-dns"}]]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/process-input-traced_node12_with_plugin.log b/integration_tests/snapshots/logs/process-input-traced_node12_with_plugin.log
deleted file mode 100644
index d8fcb279..00000000
--- a/integration_tests/snapshots/logs/process-input-traced_node12_with_plugin.log
+++ /dev/null
@@ -1,23 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-process-input-traced_node12_with_plugin","resource:integration-plugin-dev-process-input-traced_node12_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node12_with_plugin","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node12_with_plugin"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getAPIGatewayRequestId","resource":"getAPIGatewayRequestId","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node12_with_plugin","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node12_with_plugin"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-process-input-traced_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node12_with_plugin","cold_start":"true","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-process-input-traced_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-process-input-traced_node12_with_plugin","resource:integration-plugin-dev-process-input-traced_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node12_with_plugin","record_event_type":"SNS","record_ids":"95df01b4-ee98-5cb9-9903-4c221d41eb5e","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node12_with_plugin"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-process-input-traced_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-process-input-traced_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda","event_type":"SNS"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-process-input-traced_node12_with_plugin","resource:integration-plugin-dev-process-input-traced_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node12_with_plugin","record_event_type":"SQS","record_ids":"059f36b4-87a3-44ab-83d2-661975830a7d,2e1424d4-f796-459a-8184-9c92662be6da","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node12_with_plugin"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-process-input-traced_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-process-input-traced_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-process-input-traced_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue","event_type":"SQS"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/process-input-traced_node14.log b/integration_tests/snapshots/logs/process-input-traced_node14.log
index 0f3246a9..a4dc40fd 100644
--- a/integration_tests/snapshots/logs/process-input-traced_node14.log
+++ b/integration_tests/snapshots/logs/process-input-traced_node14.log
@@ -1,29 +1,29 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-process-input-traced_node14","resource:integration-dev-process-input-traced_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-process-input-traced_node14","resource:integration-tests-js-XXXX-process-input-traced_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev14.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getAPIGatewayRequestId","resource":"getAPIGatewayRequestId","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-dev-process-input-traced_node14","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","cold_start":"true","function_arn":"XXXX_node14","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-dev-process-input-traced_node14","datadog_lambda":"XXXX","dd_trace":"XXXX","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","http.status_code":"200"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","span.kind":"client","dns.hostname":"0.0.0.0","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14-dns"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","span.kind":"client","dns.hostname":"169.254.79.2","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getAPIGatewayRequestId","resource":"getAPIGatewayRequestId","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-tests-js-XXXX-process-input-traced_node14","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14-dns"}]]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-process-input-traced_node14","resource:integration-dev-process-input-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-process-input-traced_node14","resource:integration-tests-js-XXXX-process-input-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev14.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","record_event_type":"SNS","record_ids":"95df01b4-ee98-5cb9-9903-4c221d41eb5e","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-dev-process-input-traced_node14","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","cold_start":"false","function_arn":"XXXX_node14","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-dev-process-input-traced_node14","datadog_lambda":"XXXX","dd_trace":"XXXX","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda","event_type":"SNS"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","span.kind":"client","dns.hostname":"0.0.0.0","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14-dns"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","span.kind":"client","dns.hostname":"169.254.79.2","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-tests-js-XXXX-process-input-traced_node14","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14-dns"}]]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-process-input-traced_node14","resource:integration-dev-process-input-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-process-input-traced_node14","resource:integration-tests-js-XXXX-process-input-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 {"e":XXXX,"m":"serverless.integration_test.execution","t":["function:process-input-traced","dd_lambda_layer:datadog-nodev14.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","record_event_type":"SQS","record_ids":"059f36b4-87a3-44ab-83d2-661975830a7d,2e1424d4-f796-459a-8184-9c92662be6da","language":"javascript"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-dev-process-input-traced_node14","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","cold_start":"false","function_arn":"XXXX_node14","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-dev-process-input-traced_node14","datadog_lambda":"XXXX","dd_trace":"XXXX","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue","event_type":"SQS"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","span.kind":"client","dns.hostname":"0.0.0.0","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14-dns"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"service":"integration-dev-process-input-traced_node14","span.kind":"client","dns.hostname":"169.254.79.2","dns.address":"XXXX"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-dev-process-input-traced_node14-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14"},{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-tests-js-XXXX-process-input-traced_node14","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"0.0.0.0","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14-dns"}]]}
+{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"dns.lookup","resource":"169.254.79.2","error":0,"meta":{"XXXX": "XXXX"},"metrics":{"XXXX": "XXXX"},"start":XXXX,"duration":XXXX,"service":"integration-tests-js-XXXX-process-input-traced_node14-dns"}]]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/process-input-traced_node14_with_plugin.log b/integration_tests/snapshots/logs/process-input-traced_node14_with_plugin.log
deleted file mode 100644
index fe7f00ba..00000000
--- a/integration_tests/snapshots/logs/process-input-traced_node14_with_plugin.log
+++ /dev/null
@@ -1,21 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-plugin-dev-process-input-traced_node14_with_plugin","language":"javascript"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node14_with_plugin"}]]}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getAPIGatewayRequestId","resource":"getAPIGatewayRequestId","error":0,"meta":{"service":"integration-plugin-dev-process-input-traced_node14_with_plugin","api_gateway_request_id":"41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9","event_type":"APIGateway","language":"javascript"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node14_with_plugin"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-plugin-dev-process-input-traced_node14_with_plugin","record_event_type":"SNS","record_ids":"95df01b4-ee98-5cb9-9903-4c221d41eb5e","language":"javascript"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node14_with_plugin"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"getRecordIds","resource":"getRecordIds","error":0,"meta":{"service":"integration-plugin-dev-process-input-traced_node14_with_plugin","record_event_type":"SQS","record_ids":"059f36b4-87a3-44ab-83d2-661975830a7d,2e1424d4-f796-459a-8184-9c92662be6da","language":"javascript"},"metrics":{"_sample_rate":1,"_dd.agent_psr":1,"_sampling_priority_v1":1},"start":XXXX,"duration":XXXX,"service":"integration-plugin-dev-process-input-traced_node14_with_plugin"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/sync-metrics_node10.log b/integration_tests/snapshots/logs/sync-metrics_node10.log
index 530fa3a4..eca5aea4 100644
--- a/integration_tests/snapshots/logs/sync-metrics_node10.log
+++ b/integration_tests/snapshots/logs/sync-metrics_node10.log
@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-sync-metrics_node10","resource:integration-dev-sync-metrics_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-sync-metrics_node10","resource:integration-tests-js-XXXX-sync-metrics_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
@@ -7,7 +7,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-sync-metrics_node10","resource:integration-dev-sync-metrics_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-sync-metrics_node10","resource:integration-tests-js-XXXX-sync-metrics_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
@@ -15,7 +15,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-sync-metrics_node10","resource:integration-dev-sync-metrics_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-sync-metrics_node10","resource:integration-tests-js-XXXX-sync-metrics_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
diff --git a/integration_tests/snapshots/logs/sync-metrics_node10_with_plugin.log b/integration_tests/snapshots/logs/sync-metrics_node10_with_plugin.log
deleted file mode 100644
index 76327748..00000000
--- a/integration_tests/snapshots/logs/sync-metrics_node10_with_plugin.log
+++ /dev/null
@@ -1,29 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-sync-metrics_node10_with_plugin","resource:integration-plugin-dev-sync-metrics_node10_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:APIGateway","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-sync-metrics_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-sync-metrics_node10_with_plugin","cold_start":"true","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-sync-metrics_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-sync-metrics_node10_with_plugin","resource:integration-plugin-dev-sync-metrics_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-sync-metrics_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-sync-metrics_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-sync-metrics_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-sync-metrics_node10_with_plugin","resource:integration-plugin-dev-sync-metrics_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev10.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-sync-metrics_node10_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-sync-metrics_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-sync-metrics_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/sync-metrics_node12.log b/integration_tests/snapshots/logs/sync-metrics_node12.log
index 8848092c..175e52da 100644
--- a/integration_tests/snapshots/logs/sync-metrics_node12.log
+++ b/integration_tests/snapshots/logs/sync-metrics_node12.log
@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-sync-metrics_node12","resource:integration-dev-sync-metrics_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-sync-metrics_node12","resource:integration-tests-js-XXXX-sync-metrics_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
@@ -7,7 +7,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-sync-metrics_node12","resource:integration-dev-sync-metrics_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-sync-metrics_node12","resource:integration-tests-js-XXXX-sync-metrics_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
@@ -15,7 +15,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-sync-metrics_node12","resource:integration-dev-sync-metrics_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-sync-metrics_node12","resource:integration-tests-js-XXXX-sync-metrics_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
diff --git a/integration_tests/snapshots/logs/sync-metrics_node12_with_plugin.log b/integration_tests/snapshots/logs/sync-metrics_node12_with_plugin.log
deleted file mode 100644
index 2ce2f1b7..00000000
--- a/integration_tests/snapshots/logs/sync-metrics_node12_with_plugin.log
+++ /dev/null
@@ -1,29 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-sync-metrics_node12_with_plugin","resource:integration-plugin-dev-sync-metrics_node12_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:APIGateway","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-sync-metrics_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-sync-metrics_node12_with_plugin","cold_start":"true","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-sync-metrics_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","http.status_code":"200"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-sync-metrics_node12_with_plugin","resource:integration-plugin-dev-sync-metrics_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SNS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-sync-metrics_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-sync-metrics_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-sync-metrics_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-sync-metrics_node12_with_plugin","resource:integration-plugin-dev-sync-metrics_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.records_processed","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-{"e":XXXX,"m":"serverless.integration_test.execution","t":["tagkey:tagvalue","eventsource:SQS","dd_lambda_layer:datadog-nodev12.XX.X"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-sync-metrics_node12_with_plugin","error":0,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-sync-metrics_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-sync-metrics_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/sync-metrics_node14.log b/integration_tests/snapshots/logs/sync-metrics_node14.log
index cdd1d906..bfb09099 100644
--- a/integration_tests/snapshots/logs/sync-metrics_node14.log
+++ b/integration_tests/snapshots/logs/sync-metrics_node14.log
@@ -1,5 +1,5 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-sync-metrics_node14","resource:integration-dev-sync-metrics_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-sync-metrics_node14","resource:integration-tests-js-XXXX-sync-metrics_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
@@ -7,7 +7,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-sync-metrics_node14","resource:integration-dev-sync-metrics_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-sync-metrics_node14","resource:integration-tests-js-XXXX-sync-metrics_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
@@ -15,7 +15,7 @@ REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-sync-metrics_node14","resource:integration-dev-sync-metrics_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-sync-metrics_node14","resource:integration-tests-js-XXXX-sync-metrics_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
 XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	[dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
 HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX Headers: ["content-type:application/json","x-datadog-parent-id:XXXX","x-datadog-sampling-priority:2","x-datadog-trace-id:XXXX"]
 END RequestId: XXXX
diff --git a/integration_tests/snapshots/logs/sync-metrics_node14_with_plugin.log b/integration_tests/snapshots/logs/sync-metrics_node14_with_plugin.log
deleted file mode 100644
index 0b6a8cdc..00000000
--- a/integration_tests/snapshots/logs/sync-metrics_node14_with_plugin.log
+++ /dev/null
@@ -1,23 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	Processed APIGateway request
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	Processed SNS request
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	{"status":"error","message":"datadog:handler not initialized"}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	INFO	Processed SQS request
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/throw-error-traced_node10.log b/integration_tests/snapshots/logs/throw-error-traced_node10.log
index eef2d7cb..0394b2ea 100644
--- a/integration_tests/snapshots/logs/throw-error-traced_node10.log
+++ b/integration_tests/snapshots/logs/throw-error-traced_node10.log
@@ -1,23 +1,23 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node10","resource:integration-dev-throw-error-traced_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node10","resource:integration-dev-throw-error-traced_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:167:62","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:186:31"]}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node10","resource:integration-tests-js-XXXX-throw-error-traced_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node10","resource:integration-tests-js-XXXX-throw-error-traced_node10","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX"]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node10","resource:integration-dev-throw-error-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node10","resource:integration-dev-throw-error-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:167:62","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:186:31"]}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node10","resource:integration-tests-js-XXXX-throw-error-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node10","resource:integration-tests-js-XXXX-throw-error-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX"]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node10","resource:integration-dev-throw-error-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node10","resource:integration-dev-throw-error-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:167:62","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:186:31"]}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node10","resource:integration-tests-js-XXXX-throw-error-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node10","resource:integration-tests-js-XXXX-throw-error-traced_node10","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
+XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX"]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/throw-error-traced_node10_with_plugin.log b/integration_tests/snapshots/logs/throw-error-traced_node10_with_plugin.log
deleted file mode 100644
index 944f92e4..00000000
--- a/integration_tests/snapshots/logs/throw-error-traced_node10_with_plugin.log
+++ /dev/null
@@ -1,26 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node10_with_plugin","resource:integration-plugin-dev-throw-error-traced_node10_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-throw-error-traced_node10_with_plugin","error":1,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-throw-error-traced_node10_with_plugin","cold_start":"true","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-throw-error-traced_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","http.status_code":"502","error.type":"Error","error.msg":"Hello","error.stack":"Error: Hello\n    at handle (/var/task/throw-error-traced.js:4:11)\n    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25\n    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)\n    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)\n    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71\n    at new Promise (<anonymous>)\n    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108\n    at tracer.trace (/opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56)"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node10_with_plugin","resource:integration-plugin-dev-throw-error-traced_node10_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at tracer.trace (/opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56)"]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node10_with_plugin","resource:integration-plugin-dev-throw-error-traced_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-throw-error-traced_node10_with_plugin","error":1,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-throw-error-traced_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-throw-error-traced_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda","error.type":"Error","error.msg":"Hello","error.stack":"Error: Hello\n    at handle (/var/task/throw-error-traced.js:4:11)\n    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25\n    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)\n    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)\n    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71\n    at new Promise (<anonymous>)\n    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108\n    at tracer.trace (/opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56)"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node10_with_plugin","resource:integration-plugin-dev-throw-error-traced_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at tracer.trace (/opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56)"]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node10_with_plugin","resource:integration-plugin-dev-throw-error-traced_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-throw-error-traced_node10_with_plugin","error":1,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-throw-error-traced_node10_with_plugin","cold_start":"false","function_arn":"XXXX_node10_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-throw-error-traced_node10_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue","error.type":"Error","error.msg":"Hello","error.stack":"Error: Hello\n    at handle (/var/task/throw-error-traced.js:4:11)\n    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25\n    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)\n    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)\n    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71\n    at new Promise (<anonymous>)\n    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108\n    at tracer.trace (/opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56)"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node10_with_plugin","resource:integration-plugin-dev-throw-error-traced_node10_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs10.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at tracer.trace (/opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56)"]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/throw-error-traced_node12.log b/integration_tests/snapshots/logs/throw-error-traced_node12.log
index e42d3dd4..7700c2d1 100644
--- a/integration_tests/snapshots/logs/throw-error-traced_node12.log
+++ b/integration_tests/snapshots/logs/throw-error-traced_node12.log
@@ -1,23 +1,23 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node12","resource:integration-dev-throw-error-traced_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node12","resource:integration-dev-throw-error-traced_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:167:62","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:186:31"]}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node12","resource:integration-tests-js-XXXX-throw-error-traced_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node12","resource:integration-tests-js-XXXX-throw-error-traced_node12","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX"]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node12","resource:integration-dev-throw-error-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:167:62","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:186:31"]}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node12","resource:integration-dev-throw-error-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node12","resource:integration-tests-js-XXXX-throw-error-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node12","resource:integration-tests-js-XXXX-throw-error-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX"]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node12","resource:integration-dev-throw-error-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node12","resource:integration-dev-throw-error-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:167:62","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:186:31"]}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node12","resource:integration-tests-js-XXXX-throw-error-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node12","resource:integration-tests-js-XXXX-throw-error-traced_node12","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
+XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX"]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/throw-error-traced_node12_with_plugin.log b/integration_tests/snapshots/logs/throw-error-traced_node12_with_plugin.log
deleted file mode 100644
index e13a095a..00000000
--- a/integration_tests/snapshots/logs/throw-error-traced_node12_with_plugin.log
+++ /dev/null
@@ -1,26 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node12_with_plugin","resource:integration-plugin-dev-throw-error-traced_node12_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-throw-error-traced_node12_with_plugin","error":1,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-throw-error-traced_node12_with_plugin","cold_start":"true","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-throw-error-traced_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"api-gateway","function_trigger.event_source_arn":"arn:aws:apigateway:us-east-1::/restapis/wt6mne2s9k/stages/test","http.method":"GET","http.status_code":"502","error.type":"Error","error.msg":"Hello","error.stack":"Error: Hello\n    at handle (/var/task/throw-error-traced.js:4:11)\n    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25\n    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)\n    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)\n    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71\n    at new Promise (<anonymous>)\n    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108\n    at /opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node12_with_plugin","resource:integration-plugin-dev-throw-error-traced_node12_with_plugin","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56"]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node12_with_plugin","resource:integration-plugin-dev-throw-error-traced_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-throw-error-traced_node12_with_plugin","error":1,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-throw-error-traced_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-throw-error-traced_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sns","function_trigger.event_source_arn":"arn:aws:sns:us-east-2:123456789012:sns-lambda","error.type":"Error","error.msg":"Hello","error.stack":"Error: Hello\n    at handle (/var/task/throw-error-traced.js:4:11)\n    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25\n    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)\n    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)\n    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71\n    at new Promise (<anonymous>)\n    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108\n    at /opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node12_with_plugin","resource:integration-plugin-dev-throw-error-traced_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56"]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node12_with_plugin","resource:integration-plugin-dev-throw-error-traced_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-{"traces":[[{"trace_id":"XXXX","span_id":"XXXX","parent_id":"XXXX","name":"aws.lambda","resource":"integration-plugin-dev-throw-error-traced_node12_with_plugin","error":1,"meta":{"_dd.origin":"lambda","service":"integration-plugin-dev-throw-error-traced_node12_with_plugin","cold_start":"false","function_arn":"XXXX_node12_with_plugin","function_version":"$LATEST","request_id":"XXXX","resource_names":"integration-plugin-dev-throw-error-traced_node12_with_plugin","datadog_lambda":"XXXX","dd_trace":"XXXX","_dd.parent_source":"xray","function_trigger.event_source":"sqs","function_trigger.event_source_arn":"arn:aws:sqs:us-east-2:123456789012:my-queue","error.type":"Error","error.msg":"Hello","error.stack":"Error: Hello\n    at handle (/var/task/throw-error-traced.js:4:11)\n    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25\n    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)\n    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)\n    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71\n    at new Promise (<anonymous>)\n    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)\n    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108\n    at /opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56"},"metrics":{"_sample_rate":1,"_sampling_priority_v1":2},"start":XXXX,"duration":XXXX,"service":"aws.lambda","type":"serverless"}]]}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-plugin-dev-throw-error-traced_node12_with_plugin","resource:integration-plugin-dev-throw-error-traced_node12_with_plugin","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs12.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at Object.<anonymous> (/var/task/node_modules/datadog-lambda-js/dist/index.js:167:62)","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /opt/nodejs/node_modules/dd-trace/packages/dd-trace/src/tracer.js:94:56"]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/throw-error-traced_node14.log b/integration_tests/snapshots/logs/throw-error-traced_node14.log
index 4fb384e4..aa2b7e1c 100644
--- a/integration_tests/snapshots/logs/throw-error-traced_node14.log
+++ b/integration_tests/snapshots/logs/throw-error-traced_node14.log
@@ -1,23 +1,23 @@
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node14","resource:integration-dev-throw-error-traced_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node14","resource:integration-dev-throw-error-traced_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:167:62","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:186:31"]}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node14","resource:integration-tests-js-XXXX-throw-error-traced_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node14","resource:integration-tests-js-XXXX-throw-error-traced_node14","cold_start:true","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX"]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node14","resource:integration-dev-throw-error-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node14","resource:integration-dev-throw-error-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:167:62","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:186:31"]}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node14","resource:integration-tests-js-XXXX-throw-error-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node14","resource:integration-tests-js-XXXX-throw-error-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX"]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
 
 START RequestId: XXXX Version: $LATEST
-{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node14","resource:integration-dev-throw-error-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
-{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:us-east-1","account_id:XXXX","functionname:integration-dev-throw-error-traced_node14","resource:integration-dev-throw-error-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:4:11)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:150:25","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:167:62","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:44:23)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:25:53)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:19:71","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:15:12)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:161:108","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:186:31"]}
+{"e":XXXX,"m":"aws.lambda.enhanced.invocations","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node14","resource:integration-tests-js-XXXX-throw-error-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+{"e":XXXX,"m":"aws.lambda.enhanced.errors","t":["region:sa-east-1","account_id:XXXX","functionname:integration-tests-js-XXXX-throw-error-traced_node14","resource:integration-tests-js-XXXX-throw-error-traced_node14","cold_start:false","memorysize:1024","datadog_lambda:vX.X.X","runtime:nodejs14.x"],"v":1}
+XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	[dd.trace_id=XXXX dd.span_id=XXXX] Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at handle (/var/task/throw-error-traced.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/utils/handler.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at step (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at Object.next (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at new Promise (<anonymous>)","    at __awaiter (/var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX)","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX","    at /var/task/node_modules/datadog-lambda-js/dist/index.js:XXX:XXX"]}
 END RequestId: XXXX
 REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
 XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/snapshots/logs/throw-error-traced_node14_with_plugin.log b/integration_tests/snapshots/logs/throw-error-traced_node14_with_plugin.log
deleted file mode 100644
index c1ec302a..00000000
--- a/integration_tests/snapshots/logs/throw-error-traced_node14_with_plugin.log
+++ /dev/null
@@ -1,17 +0,0 @@
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at Runtime.handle [as handler] (/var/task/throw-error-traced.js:4:11)","    at Runtime.handleOnce (/var/runtime/Runtime.js:66:25)"]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	Init Duration: XXXX ms	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at Runtime.handle [as handler] (/var/task/throw-error-traced.js:4:11)","    at Runtime.handleOnce (/var/runtime/Runtime.js:66:25)"]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
-
-START RequestId: XXXX Version: $LATEST
-XXXX-XX-XX XX:XX:XX.XXX	XXXX-XXXX-XXXX-XXXX-XXXX	ERROR	Invoke Error 	{"errorType":"Error","errorMessage":"Hello","stack":["Error: Hello","    at Runtime.handle [as handler] (/var/task/throw-error-traced.js:4:11)","    at Runtime.handleOnce (/var/runtime/Runtime.js:66:25)"]}
-END RequestId: XXXX
-REPORT RequestId: XXXX	Duration: XXXX ms	Billed Duration: XXXX ms	Memory Size: 1024 MB	Max Memory Used: XXXX MB	
-XRAY TraceId: XXXX	SegmentId: XXXX	Sampled: true	
diff --git a/integration_tests/throw-error-traced.js b/integration_tests/throw-error-traced.js
index 0cc60635..7828aeda 100644
--- a/integration_tests/throw-error-traced.js
+++ b/integration_tests/throw-error-traced.js
@@ -3,4 +3,4 @@ const { datadog } = require("datadog-lambda-js");
 async function handle(event, context) {
     throw new Error("Hello")
 }
-module.exports.handle = process.env.WITH_PLUGIN ? handle : datadog(handle);
+module.exports.handle = datadog(handle);
diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh
index 63a2212d..93795e31 100755
--- a/scripts/run_integration_tests.sh
+++ b/scripts/run_integration_tests.sh
@@ -12,7 +12,6 @@ set -e
 # defined for every handler_runtime combination
 LAMBDA_HANDLERS=("async-metrics" "sync-metrics" "http-requests" "process-input-traced" "throw-error-traced")
 RUNTIMES=("node10" "node12" "node14")
-CONFIGS=("with-plugin" "without-plugin")
 
 LOGS_WAIT_SECONDS=20
 
@@ -23,11 +22,16 @@ cwd=$(pwd)
 
 integration_tests_dir="$repo_dir/integration_tests"
 
-script_start_time=$(date --iso-8601=seconds)
-echo "$script_start_time"
+script_utc_start_time=$(date -u +"%Y%m%dT%H%M%S")
 
 mismatch_found=false
 
+if [ -z "$AWS_SECRET_ACCESS_KEY" ]; then
+    echo "No AWS credentials were found in the environment."
+    echo "Note that only Datadog employees can run these integration tests."
+    exit 1
+fi
+
 if [ -z "$DD_API_KEY" ]; then
     echo "No DD_API_KEY env var set, exiting"
     exit 1
@@ -47,76 +51,62 @@ fi
 cd $integration_tests_dir
 yarn
 
-# Add local build to node_modules so `serverless-plugin.yml` also has access to local build.
-cd $cwd
-yarn
-yarn build
-rm -rf "$integration_tests/node_modules"
-mkdir -p "$integration_tests_dir/node_modules/datadog-lambda-js"
-cp -r dist "$integration_tests_dir/node_modules/datadog-lambda-js"
-
-cd $integration_tests_dir
-
-
 input_event_files=$(ls ./input_events)
 # Sort event files by name so that snapshots stay consistent
 input_event_files=($(for file_name in ${input_event_files[@]}; do echo $file_name; done | sort))
 
-echo "Deploying functions with plugin"
-serverless deploy -c "./serverless-plugin.yml" --force
-echo "Deploying functions without plugin"
-serverless deploy --force
+# Generate a random 8-character ID to avoid collisions with other runs
+run_id=$(xxd -l 4 -c 4 -p < /dev/random)
 
-echo "Invoking functions"
-set +e # Don't exit this script if an invocation fails or there's a diff
-for _sls_type in "${CONFIGS[@]}"; do
-    for input_event_file in "${input_event_files[@]}"; do
-        for handler_name in "${LAMBDA_HANDLERS[@]}"; do
-            for runtime in "${RUNTIMES[@]}"; do
-                if [ "$_sls_type" = "with-plugin" ]; then
-                    function_name="${handler_name}_${runtime}_with_plugin"
-                else
-                    function_name="${handler_name}_${runtime}"
-                fi
+# Always remove the stack before exiting, no matter what
+function remove_stack() {
+    echo "Removing functions"
+    serverless remove --stage $run_id
+}
+trap remove_stack EXIT
 
-                echo "$function_name"
-                # Get event name without trailing ".json" so we can build the snapshot file name
-                input_event_name=$(echo "$input_event_file" | sed "s/.json//")
-                # Return value snapshot file format is snapshots/return_values/{handler}_{runtime}_{input-event}
-                snapshot_path="./snapshots/return_values/${handler_name}_${runtime}_${input_event_name}.json"
-                function_failed=FALSE
+echo "Deploying functions"
+serverless deploy --stage $run_id
 
-                if [ "$_sls_type" = "with-plugin" ]; then
-                    return_value=$(serverless invoke -f "$function_name" --path "./input_events/$input_event_file" -c "./serverless-plugin.yml")
-                    invoke_success=$?
-                else
-                    return_value=$(serverless invoke -f "$function_name" --path "./input_events/$input_event_file")
-                    invoke_success=$?
-                fi
-                if [ $invoke_success -ne 0 ]; then
-                    return_value="Invocation failed"
-                fi
+echo "Invoking functions"
+set +e # Don't exit this script if an invocation fails or there's a diff
+for input_event_file in "${input_event_files[@]}"; do
+    for handler_name in "${LAMBDA_HANDLERS[@]}"; do
+        for runtime in "${RUNTIMES[@]}"; do
+            function_name="${handler_name}_${runtime}"
+
+            echo "$function_name"
+            # Get event name without trailing ".json" so we can build the snapshot file name
+            input_event_name=$(echo "$input_event_file" | sed "s/.json//")
+            # Return value snapshot file format is snapshots/return_values/{handler}_{runtime}_{input-event}
+            snapshot_path="./snapshots/return_values/${handler_name}_${runtime}_${input_event_name}.json"
+            function_failed=FALSE
+
+            return_value=$(serverless invoke --stage $run_id -f "$function_name" --path "./input_events/$input_event_file")
+            invoke_success=$?
+            if [ $invoke_success -ne 0 ]; then
+                return_value="Invocation failed"
+            fi
 
-                if [ ! -f $snapshot_path ]; then
-                    # If the snapshot file doesn't exist yet, we create it
-                    echo "Writing return value to $snapshot_path because no snapshot exists yet"
-                    echo "$return_value" >$snapshot_path
-                elif [ -n "$UPDATE_SNAPSHOTS" ]; then
-                    # If $UPDATE_SNAPSHOTS is set to true, write the new logs over the current snapshot
-                    echo "Overwriting return value snapshot for $snapshot_path"
-                    echo "$return_value" >$snapshot_path
+            if [ ! -f $snapshot_path ]; then
+                # If the snapshot file doesn't exist yet, we create it
+                echo "Writing return value to $snapshot_path because no snapshot exists yet"
+                echo "$return_value" >$snapshot_path
+            elif [ -n "$UPDATE_SNAPSHOTS" ]; then
+                # If $UPDATE_SNAPSHOTS is set to true, write the new logs over the current snapshot
+                echo "Overwriting return value snapshot for $snapshot_path"
+                echo "$return_value" >$snapshot_path
+            else
+                # Compare new return value to snapshot
+                diff_output=$(echo "$return_value" | diff - $snapshot_path)
+                if [ $? -eq 1 ]; then
+                    echo "Failed: Return value for $function_name does not match snapshot:"
+                    echo "$diff_output"
+                    mismatch_found=true
                 else
-                    # Compare new return value to snapshot
-                    diff_output=$(echo "$return_value" | diff - $snapshot_path)
-                    if [ $? -eq 1 ]; then
-                        echo "Failed: Return value for $function_name does not match snapshot:"
-                        echo "$diff_output"
-                        mismatch_found=true
-                    else
-                        echo "Ok: Return value for $function_name with $input_event_name event matches snapshot"
-                    fi
+                    echo "Ok: Return value for $function_name with $input_event_name event matches snapshot"
                 fi
-            done
+            fi
         done
     done
 done
@@ -125,75 +115,88 @@ set -e
 echo "Sleeping $LOGS_WAIT_SECONDS seconds to wait for logs to appear in CloudWatch..."
 sleep $LOGS_WAIT_SECONDS
 
+set +e # Don't exit this script if there is a diff or the logs endpoint fails
 echo "Fetching logs for invocations and comparing to snapshots"
-for _sls_type in "${CONFIGS[@]}"; do
-    for handler_name in "${LAMBDA_HANDLERS[@]}"; do
-        for runtime in "${RUNTIMES[@]}"; do
-            if [ "$_sls_type" = "with-plugin" ]; then
-                function_name="${handler_name}_${runtime}_with_plugin"
-            else
-                function_name="${handler_name}_${runtime}"
-            fi
-
-            function_snapshot_path="./snapshots/logs/${function_name}.log"
-
-            # Fetch logs with serverless cli
-            if [ "$_sls_type" = "with-plugin" ]; then
-                raw_logs=$(serverless logs -f "$function_name" --startTime $script_start_time -c "./serverless-plugin.yml")
-                # serverless logs -f "http-requests_node10_with_plugin" --startTime 2020-08-17T17:30:51Z -c "./serverless-plugin.yml"
-            else
-                raw_logs=$(serverless logs -f "$function_name" --startTime $script_start_time)
+for handler_name in "${LAMBDA_HANDLERS[@]}"; do
+    for runtime in "${RUNTIMES[@]}"; do
+        function_name="${handler_name}_${runtime}"
+        function_snapshot_path="./snapshots/logs/${function_name}.log"
+
+        # Fetch logs with serverless cli, retrying to avoid AWS account-wide rate limit error
+        retry_counter=0
+        while [ $retry_counter -lt 10 ]; do
+            raw_logs=$(serverless logs --stage $run_id -f $function_name --startTime $script_utc_start_time)
+            fetch_logs_exit_code=$?
+            if [ $fetch_logs_exit_code -eq 1 ]; then
+                echo "Retrying fetch logs for $function_name..."
+                retry_counter=$(($retry_counter + 1))
+                sleep 10
+                continue
             fi
+            break
+        done
 
-            # Replace invocation-specific data like timestamps and IDs with XXXX to normalize logs across executions
-            logs=$(
-                echo "$raw_logs" |
-                    # Filter serverless cli errors
-                    sed '/Serverless: Recoverable error occurred/d' |
-                    # Normalize Lambda runtime report logs
-                    sed -E 's/(RequestId|TraceId|SegmentId|Duration|Memory Used|"e"):( )?[a-z0-9\.\-]+/\1:\2XXXX/g' |
-                    # Normalize DD APM headers and AWS account ID
-                    sed -E "s/(x-datadog-parent-id:|x-datadog-trace-id:|account_id:)[0-9]+/\1XXXX/g" |
-                    # Strip API key from logged requests
-                    sed -E "s/(api_key=|'api_key': ')[a-z0-9\.\-]+/\1XXXX/g" |
-                    # Normalize log timestamps
-                    sed -E "s/[0-9]{4}\-[0-9]{2}\-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]+( \(\-?[0-9:]+\))?/XXXX-XX-XX XX:XX:XX.XXX/" |
-                    # Normalize DD trace ID injection
-                    sed -E "s/(dd\.trace_id=)[0-9]+ (dd\.span_id=)[0-9]+/\1XXXX \2XXXX/" |
-                    # Normalize execution ID in logs prefix
-                    sed -E $'s/[0-9a-z]+\-[0-9a-z]+\-[0-9a-z]+\-[0-9a-z]+\-[0-9a-z]+\t/XXXX-XXXX-XXXX-XXXX-XXXX\t/' |
-                    # Normalize minor package version tag so that these snapshots aren't broken on version bumps
-                    sed -E "s/(dd_lambda_layer:datadog-nodev[0-9]+\.)[0-9]+\.[0-9]+/\1XX\.X/g" |
-                    sed -E 's/"(span_id|parent_id|trace_id|start|duration|tcp\.local\.address|tcp\.local\.port|dns\.address|request_id|function_arn|x-datadog-trace-id|x-datadog-parent-id|datadog_lambda|dd_trace)":("?)[a-zA-Z0-9\.:\-]+("?)/"\1":\2XXXX\3/g' |
-                    # Normalize enhanced metric datadog_lambda tag
-                    sed -E "s/(datadog_lambda:v)[0-9\.]+/\1X.X.X/g"
-            )
-
-            if [ ! -f $function_snapshot_path ]; then
-                # 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
-                # 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
+        if [ $retry_counter -eq 9 ]; then
+            echo "FAILURE: Could not retrieve logs for $function_name"
+            echo "Error from final attempt to retrieve logs:"
+            echo $raw_logs
+
+            exit 1
+        fi
+
+
+        # Replace invocation-specific data like timestamps and IDs with XXXX to normalize logs across executions
+        logs=$(
+            echo "$raw_logs" |
+                # Filter serverless cli errors
+                sed '/Serverless: Recoverable error occurred/d' |
+                # Normalize Lambda runtime report logs
+                perl -p -e 's/(RequestId|TraceId|SegmentId|Duration|Memory Used|"e"):( )?[a-z0-9\.\-]+/\1:\2XXXX/g' |
+                # Normalize DD APM headers and AWS account ID
+                perl -p -e "s/(x-datadog-parent-id:|x-datadog-trace-id:|account_id:)[0-9]+/\1XXXX/g" |
+                # Strip API key from logged requests
+                perl -p -e "s/(api_key=|'api_key': ')[a-z0-9\.\-]+/\1XXXX/g" |
+                # Normalize log timestamps
+                perl -p -e "s/[0-9]{4}\-[0-9]{2}\-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]+( \(\-?\+?[0-9:]+\))?/XXXX-XX-XX XX:XX:XX.XXX/" |
+                # Normalize DD trace ID injection
+                perl -p -e "s/(dd\.trace_id=)[0-9]+ (dd\.span_id=)[0-9]+/\1XXXX \2XXXX/" |
+                # Normalize execution ID in logs prefix
+                perl -p -e $'s/[0-9a-z]+\-[0-9a-z]+\-[0-9a-z]+\-[0-9a-z]+\-[0-9a-z]+\t/XXXX-XXXX-XXXX-XXXX-XXXX\t/' |
+                # Normalize minor package version tag so that these snapshots aren't broken on version bumps
+                perl -p -e "s/(dd_lambda_layer:datadog-nodev[0-9]+\.)[0-9]+\.[0-9]+/\1XX\.X/g" |
+                perl -p -e 's/"(span_id|parent_id|trace_id|start|duration|tcp\.local\.address|tcp\.local\.port|dns\.address|request_id|function_arn|x-datadog-trace-id|x-datadog-parent-id|datadog_lambda|dd_trace)":("?)[a-zA-Z0-9\.:\-]+("?)/"\1":\2XXXX\3/g' |
+                # Strip out run ID (from function name, resource, etc.)
+                perl -p -e "s/$run_id/XXXX/g" |
+                # Normalize line numbers in stack traces
+                perl -p -e 's/(.js:)[0-9]*:[0-9]*/\1XXX:XXX/g' |
+                # Remove metrics and metas in logged traces (their order is inconsistent)
+                perl -p -e 's/"(meta|metrics)":{(.*?)}/"\1":{"XXXX": "XXXX"}/g' |
+                # Normalize enhanced metric datadog_lambda tag
+                perl -p -e "s/(datadog_lambda:v)[0-9\.]+/\1X.X.X/g"
+        )
+
+        if [ ! -f $function_snapshot_path ]; then
+            # 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
+            # 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
+        else
+            # Compare new logs to snapshots
+            diff_output=$(echo "$logs" | sort | diff -w - <(sort $function_snapshot_path))
+            if [ $? -eq 1 ]; then
+                echo "Failed: Mismatch found between new $function_name logs (first) and snapshot (second):"
+                echo "$diff_output"
+                mismatch_found=true
             else
-                # Compare new logs to snapshots
-                set +e # Don't exit this script if there is a diff
-
-                diff_output=$(echo "$logs" | sort | diff -w - <(sort $function_snapshot_path))
-                if [ $? -eq 1 ]; then
-                    echo "Failed: Mismatch found between new $function_name logs (first) and snapshot (second):"
-                    echo "$diff_output"
-                    mismatch_found=true
-                else
-                    echo "Ok: New logs for $function_name match snapshot"
-                fi
-                set -e
+                echo "Ok: New logs for $function_name match snapshot"
             fi
-        done
+        fi
     done
 done
+set -e
 
 if [ "$mismatch_found" = true ]; then
     echo "FAILURE: A mismatch between new data and a snapshot was found and printed above."