diff --git a/integration_tests/snapshots/logs/esm_node12.log b/integration_tests/snapshots/logs/esm_node12.log
index 527fd570..0cc84323 100644
--- a/integration_tests/snapshots/logs/esm_node12.log
+++ b/integration_tests/snapshots/logs/esm_node12.log
@@ -3,6 +3,37 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
 {
   "traces": [
     [
+      {
+        "trace_id":"XXXX",
+        "span_id":"XXXX",
+        "parent_id":"XXXX",
+        "name": "http.request",
+        "resource": "POST",
+        "error": 0,
+        "meta": {
+          "_dd.p.dm": "-0",
+          "_dd.origin": "lambda",
+          "service": "integration-tests-js-XXXX-esm_node12",
+          "runtime-id":"XXXX",
+          "component": "http",
+          "span.kind": "client",
+          "http.method": "POST",
+          "http.url": "http://127.0.0.1:9001/2018-06-01/runtime/init/error",
+          "http.status_code": "202",
+          "language": "javascript"
+        },
+        "metrics": {
+          "_dd.agent_psr": 1,
+          "_dd.top_level": 1,
+          "_dd.measured": 1,
+          "process_id":XXXX,
+          "_sampling_priority_v1": 1
+        },
+        "start":XXXX,
+        "duration":XXXX,
+        "service": "integration-tests-js-XXXX-esm_node12-http-client",
+        "type": "http"
+      },
       {
         "trace_id":"XXXX",
         "span_id":"XXXX",
@@ -11,10 +42,10 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
         "resource": "127.0.0.1:9001",
         "error": 0,
         "meta": {
-          "_dd.p.dm": "-0",
           "_dd.origin": "lambda",
           "service": "integration-tests-js-XXXX-esm_node12",
           "runtime-id":"XXXX",
+          "component": "net",
           "tcp.remote.host": "127.0.0.1",
           "tcp.family": "IPv4",
           "out.host": "127.0.0.1",
@@ -23,12 +54,11 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
           "language": "javascript"
         },
         "metrics": {
-          "_dd.agent_psr": 1,
-          "_dd.top_level": 1,
           "_dd.measured": 1,
           "tcp.remote.port": 9001,
           "out.port": 9001,
           "tcp.local.port":XXXX,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -42,6 +72,37 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
 {
   "traces": [
     [
+      {
+        "trace_id":"XXXX",
+        "span_id":"XXXX",
+        "parent_id":"XXXX",
+        "name": "http.request",
+        "resource": "POST",
+        "error": 0,
+        "meta": {
+          "_dd.p.dm": "-0",
+          "_dd.origin": "lambda",
+          "service": "integration-tests-js-XXXX-esm_node12",
+          "runtime-id":"XXXX",
+          "component": "http",
+          "span.kind": "client",
+          "http.method": "POST",
+          "http.url": "http://127.0.0.1:9001/2018-06-01/runtime/init/error",
+          "http.status_code": "202",
+          "language": "javascript"
+        },
+        "metrics": {
+          "_dd.agent_psr": 1,
+          "_dd.top_level": 1,
+          "_dd.measured": 1,
+          "process_id":XXXX,
+          "_sampling_priority_v1": 1
+        },
+        "start":XXXX,
+        "duration":XXXX,
+        "service": "integration-tests-js-XXXX-esm_node12-http-client",
+        "type": "http"
+      },
       {
         "trace_id":"XXXX",
         "span_id":"XXXX",
@@ -50,10 +111,10 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
         "resource": "127.0.0.1:9001",
         "error": 0,
         "meta": {
-          "_dd.p.dm": "-0",
           "_dd.origin": "lambda",
           "service": "integration-tests-js-XXXX-esm_node12",
           "runtime-id":"XXXX",
+          "component": "net",
           "tcp.remote.host": "127.0.0.1",
           "tcp.family": "IPv4",
           "out.host": "127.0.0.1",
@@ -62,12 +123,11 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
           "language": "javascript"
         },
         "metrics": {
-          "_dd.agent_psr": 1,
-          "_dd.top_level": 1,
           "_dd.measured": 1,
           "tcp.remote.port": 9001,
           "out.port": 9001,
           "tcp.local.port":XXXX,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -85,6 +145,37 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
 {
   "traces": [
     [
+      {
+        "trace_id":"XXXX",
+        "span_id":"XXXX",
+        "parent_id":"XXXX",
+        "name": "http.request",
+        "resource": "POST",
+        "error": 0,
+        "meta": {
+          "_dd.p.dm": "-0",
+          "_dd.origin": "lambda",
+          "service": "integration-tests-js-XXXX-esm_node12",
+          "runtime-id":"XXXX",
+          "component": "http",
+          "span.kind": "client",
+          "http.method": "POST",
+          "http.url": "http://127.0.0.1:9001/2018-06-01/runtime/init/error",
+          "http.status_code": "202",
+          "language": "javascript"
+        },
+        "metrics": {
+          "_dd.agent_psr": 1,
+          "_dd.top_level": 1,
+          "_dd.measured": 1,
+          "process_id":XXXX,
+          "_sampling_priority_v1": 1
+        },
+        "start":XXXX,
+        "duration":XXXX,
+        "service": "integration-tests-js-XXXX-esm_node12-http-client",
+        "type": "http"
+      },
       {
         "trace_id":"XXXX",
         "span_id":"XXXX",
@@ -93,10 +184,10 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
         "resource": "127.0.0.1:9001",
         "error": 0,
         "meta": {
-          "_dd.p.dm": "-0",
           "_dd.origin": "lambda",
           "service": "integration-tests-js-XXXX-esm_node12",
           "runtime-id":"XXXX",
+          "component": "net",
           "tcp.remote.host": "127.0.0.1",
           "tcp.family": "IPv4",
           "out.host": "127.0.0.1",
@@ -105,12 +196,11 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
           "language": "javascript"
         },
         "metrics": {
-          "_dd.agent_psr": 1,
-          "_dd.top_level": 1,
           "_dd.measured": 1,
           "tcp.remote.port": 9001,
           "out.port": 9001,
           "tcp.local.port":XXXX,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -129,6 +219,37 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
 {
   "traces": [
     [
+      {
+        "trace_id":"XXXX",
+        "span_id":"XXXX",
+        "parent_id":"XXXX",
+        "name": "http.request",
+        "resource": "POST",
+        "error": 0,
+        "meta": {
+          "_dd.p.dm": "-0",
+          "_dd.origin": "lambda",
+          "service": "integration-tests-js-XXXX-esm_node12",
+          "runtime-id":"XXXX",
+          "component": "http",
+          "span.kind": "client",
+          "http.method": "POST",
+          "http.url": "http://127.0.0.1:9001/2018-06-01/runtime/init/error",
+          "http.status_code": "202",
+          "language": "javascript"
+        },
+        "metrics": {
+          "_dd.agent_psr": 1,
+          "_dd.top_level": 1,
+          "_dd.measured": 1,
+          "process_id":XXXX,
+          "_sampling_priority_v1": 1
+        },
+        "start":XXXX,
+        "duration":XXXX,
+        "service": "integration-tests-js-XXXX-esm_node12-http-client",
+        "type": "http"
+      },
       {
         "trace_id":"XXXX",
         "span_id":"XXXX",
@@ -137,10 +258,10 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
         "resource": "127.0.0.1:9001",
         "error": 0,
         "meta": {
-          "_dd.p.dm": "-0",
           "_dd.origin": "lambda",
           "service": "integration-tests-js-XXXX-esm_node12",
           "runtime-id":"XXXX",
+          "component": "net",
           "tcp.remote.host": "127.0.0.1",
           "tcp.family": "IPv4",
           "out.host": "127.0.0.1",
@@ -149,12 +270,11 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
           "language": "javascript"
         },
         "metrics": {
-          "_dd.agent_psr": 1,
-          "_dd.top_level": 1,
           "_dd.measured": 1,
           "tcp.remote.port": 9001,
           "out.port": 9001,
           "tcp.local.port":XXXX,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -168,6 +288,37 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
 {
   "traces": [
     [
+      {
+        "trace_id":"XXXX",
+        "span_id":"XXXX",
+        "parent_id":"XXXX",
+        "name": "http.request",
+        "resource": "POST",
+        "error": 0,
+        "meta": {
+          "_dd.p.dm": "-0",
+          "_dd.origin": "lambda",
+          "service": "integration-tests-js-XXXX-esm_node12",
+          "runtime-id":"XXXX",
+          "component": "http",
+          "span.kind": "client",
+          "http.method": "POST",
+          "http.url": "http://127.0.0.1:9001/2018-06-01/runtime/init/error",
+          "http.status_code": "202",
+          "language": "javascript"
+        },
+        "metrics": {
+          "_dd.agent_psr": 1,
+          "_dd.top_level": 1,
+          "_dd.measured": 1,
+          "process_id":XXXX,
+          "_sampling_priority_v1": 1
+        },
+        "start":XXXX,
+        "duration":XXXX,
+        "service": "integration-tests-js-XXXX-esm_node12-http-client",
+        "type": "http"
+      },
       {
         "trace_id":"XXXX",
         "span_id":"XXXX",
@@ -176,10 +327,10 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
         "resource": "127.0.0.1:9001",
         "error": 0,
         "meta": {
-          "_dd.p.dm": "-0",
           "_dd.origin": "lambda",
           "service": "integration-tests-js-XXXX-esm_node12",
           "runtime-id":"XXXX",
+          "component": "net",
           "tcp.remote.host": "127.0.0.1",
           "tcp.family": "IPv4",
           "out.host": "127.0.0.1",
@@ -188,12 +339,11 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
           "language": "javascript"
         },
         "metrics": {
-          "_dd.agent_psr": 1,
-          "_dd.top_level": 1,
           "_dd.measured": 1,
           "tcp.remote.port": 9001,
           "out.port": 9001,
           "tcp.local.port":XXXX,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -212,6 +362,37 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
 {
   "traces": [
     [
+      {
+        "trace_id":"XXXX",
+        "span_id":"XXXX",
+        "parent_id":"XXXX",
+        "name": "http.request",
+        "resource": "POST",
+        "error": 0,
+        "meta": {
+          "_dd.p.dm": "-0",
+          "_dd.origin": "lambda",
+          "service": "integration-tests-js-XXXX-esm_node12",
+          "runtime-id":"XXXX",
+          "component": "http",
+          "span.kind": "client",
+          "http.method": "POST",
+          "http.url": "http://127.0.0.1:9001/2018-06-01/runtime/init/error",
+          "http.status_code": "202",
+          "language": "javascript"
+        },
+        "metrics": {
+          "_dd.agent_psr": 1,
+          "_dd.top_level": 1,
+          "_dd.measured": 1,
+          "process_id":XXXX,
+          "_sampling_priority_v1": 1
+        },
+        "start":XXXX,
+        "duration":XXXX,
+        "service": "integration-tests-js-XXXX-esm_node12-http-client",
+        "type": "http"
+      },
       {
         "trace_id":"XXXX",
         "span_id":"XXXX",
@@ -220,10 +401,10 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
         "resource": "127.0.0.1:9001",
         "error": 0,
         "meta": {
-          "_dd.p.dm": "-0",
           "_dd.origin": "lambda",
           "service": "integration-tests-js-XXXX-esm_node12",
           "runtime-id":"XXXX",
+          "component": "net",
           "tcp.remote.host": "127.0.0.1",
           "tcp.family": "IPv4",
           "out.host": "127.0.0.1",
@@ -232,12 +413,11 @@ XXXX-XX-XX XX:XX:XX.XXX	ERROR	Uncaught Exception 	{"errorType":"Runtime.ImportMo
           "language": "javascript"
         },
         "metrics": {
-          "_dd.agent_psr": 1,
-          "_dd.top_level": 1,
           "_dd.measured": 1,
           "tcp.remote.port": 9001,
           "out.port": 9001,
           "tcp.local.port":XXXX,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
diff --git a/integration_tests/snapshots/logs/process-input-traced_node12.log b/integration_tests/snapshots/logs/process-input-traced_node12.log
index fe931c06..42620e57 100644
--- a/integration_tests/snapshots/logs/process-input-traced_node12.log
+++ b/integration_tests/snapshots/logs/process-input-traced_node12.log
@@ -45,11 +45,13 @@ START
           "_inferred_span.synchronicity": "sync",
           "http.method": "GET",
           "stage": "test",
-          "http.status_code": "200"
+          "http.status_code": "200",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -77,11 +79,13 @@ START
           "http.method": "GET",
           "api_gateway_request_id": "41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9",
           "event_type": "APIGateway",
-          "http.status_code": "200"
+          "http.status_code": "200",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 1,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -103,6 +107,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -125,6 +130,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -190,6 +196,7 @@ START
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -215,11 +222,13 @@ START
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sns",
           "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda",
-          "event_type": "SNS"
+          "event_type": "SNS",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -243,6 +252,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -300,12 +310,14 @@ START
           "queuename": "my-queue",
           "event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
           "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
-          "sender_id": "AIDAIENQZJOLO23YVJ4VO"
+          "sender_id": "AIDAIENQZJOLO23YVJ4VO",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
           "retry_count": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -331,11 +343,13 @@ START
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sqs",
           "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
-          "event_type": "SQS"
+          "event_type": "SQS",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -359,6 +373,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
diff --git a/integration_tests/snapshots/logs/process-input-traced_node14.log b/integration_tests/snapshots/logs/process-input-traced_node14.log
index 777ef1bb..78b7a925 100644
--- a/integration_tests/snapshots/logs/process-input-traced_node14.log
+++ b/integration_tests/snapshots/logs/process-input-traced_node14.log
@@ -45,11 +45,13 @@ START
           "_inferred_span.synchronicity": "sync",
           "http.method": "GET",
           "stage": "test",
-          "http.status_code": "200"
+          "http.status_code": "200",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -77,11 +79,13 @@ START
           "http.method": "GET",
           "api_gateway_request_id": "41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9",
           "event_type": "APIGateway",
-          "http.status_code": "200"
+          "http.status_code": "200",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 1,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -103,6 +107,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -125,6 +130,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -190,6 +196,7 @@ START
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -215,11 +222,13 @@ START
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sns",
           "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda",
-          "event_type": "SNS"
+          "event_type": "SNS",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -243,6 +252,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -300,12 +310,14 @@ START
           "queuename": "my-queue",
           "event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
           "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
-          "sender_id": "AIDAIENQZJOLO23YVJ4VO"
+          "sender_id": "AIDAIENQZJOLO23YVJ4VO",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
           "retry_count": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -331,11 +343,13 @@ START
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sqs",
           "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
-          "event_type": "SQS"
+          "event_type": "SQS",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -359,6 +373,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
diff --git a/integration_tests/snapshots/logs/process-input-traced_node16.log b/integration_tests/snapshots/logs/process-input-traced_node16.log
index c0693bb8..90ebc44f 100644
--- a/integration_tests/snapshots/logs/process-input-traced_node16.log
+++ b/integration_tests/snapshots/logs/process-input-traced_node16.log
@@ -46,11 +46,13 @@ START
           "_inferred_span.synchronicity": "sync",
           "http.method": "GET",
           "stage": "test",
-          "http.status_code": "200"
+          "http.status_code": "200",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -79,11 +81,13 @@ START
           "http.method": "GET",
           "api_gateway_request_id": "41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9",
           "event_type": "APIGateway",
-          "http.status_code": "200"
+          "http.status_code": "200",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 1,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -106,6 +110,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -129,6 +134,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -195,6 +201,7 @@ START
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -221,11 +228,13 @@ START
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sns",
           "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda",
-          "event_type": "SNS"
+          "event_type": "SNS",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -250,6 +259,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -308,12 +318,14 @@ START
           "queuename": "my-queue",
           "event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
           "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
-          "sender_id": "AIDAIENQZJOLO23YVJ4VO"
+          "sender_id": "AIDAIENQZJOLO23YVJ4VO",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
           "retry_count": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -340,11 +352,13 @@ START
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sqs",
           "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
-          "event_type": "SQS"
+          "event_type": "SQS",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -369,6 +383,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
diff --git a/integration_tests/snapshots/logs/process-input-traced_node18.log b/integration_tests/snapshots/logs/process-input-traced_node18.log
index ed8d1a9d..1854ad66 100644
--- a/integration_tests/snapshots/logs/process-input-traced_node18.log
+++ b/integration_tests/snapshots/logs/process-input-traced_node18.log
@@ -46,11 +46,13 @@ START
           "_inferred_span.synchronicity": "sync",
           "http.method": "GET",
           "stage": "test",
-          "http.status_code": "200"
+          "http.status_code": "200",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -79,11 +81,13 @@ START
           "http.method": "GET",
           "api_gateway_request_id": "41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9",
           "event_type": "APIGateway",
-          "http.status_code": "200"
+          "http.status_code": "200",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 1,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -106,6 +110,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -129,6 +134,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -195,6 +201,7 @@ START
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -221,11 +228,13 @@ START
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sns",
           "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda",
-          "event_type": "SNS"
+          "event_type": "SNS",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -250,6 +259,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -308,12 +318,14 @@ START
           "queuename": "my-queue",
           "event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
           "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
-          "sender_id": "AIDAIENQZJOLO23YVJ4VO"
+          "sender_id": "AIDAIENQZJOLO23YVJ4VO",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
           "retry_count": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -340,11 +352,13 @@ START
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sqs",
           "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
-          "event_type": "SQS"
+          "event_type": "SQS",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -369,6 +383,7 @@ START
         },
         "metrics": {
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
diff --git a/integration_tests/snapshots/logs/status-code-500s_node12.log b/integration_tests/snapshots/logs/status-code-500s_node12.log
index 7a7fe9d9..4cefd8e0 100644
--- a/integration_tests/snapshots/logs/status-code-500s_node12.log
+++ b/integration_tests/snapshots/logs/status-code-500s_node12.log
@@ -51,11 +51,13 @@ START
           "_inferred_span.synchronicity": "sync",
           "http.method": "GET",
           "stage": "test",
-          "http.status_code": "500"
+          "http.status_code": "500",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -81,11 +83,13 @@ START
           "function_trigger.event_source": "api-gateway",
           "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test",
           "http.method": "GET",
-          "http.status_code": "500"
+          "http.status_code": "500",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 1,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -143,6 +147,7 @@ START
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -167,11 +172,13 @@ START
           "functionname": "integration-tests-js-XXXX-status-code-500s_node12",
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sns",
-          "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda"
+          "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -221,12 +228,14 @@ START
           "queuename": "my-queue",
           "event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
           "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
-          "sender_id": "AIDAIENQZJOLO23YVJ4VO"
+          "sender_id": "AIDAIENQZJOLO23YVJ4VO",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
           "retry_count": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -251,11 +260,13 @@ START
           "functionname": "integration-tests-js-XXXX-status-code-500s_node12",
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sqs",
-          "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue"
+          "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
diff --git a/integration_tests/snapshots/logs/status-code-500s_node14.log b/integration_tests/snapshots/logs/status-code-500s_node14.log
index ef4dc26c..5d7e51e5 100644
--- a/integration_tests/snapshots/logs/status-code-500s_node14.log
+++ b/integration_tests/snapshots/logs/status-code-500s_node14.log
@@ -51,11 +51,13 @@ START
           "_inferred_span.synchronicity": "sync",
           "http.method": "GET",
           "stage": "test",
-          "http.status_code": "500"
+          "http.status_code": "500",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -81,11 +83,13 @@ START
           "function_trigger.event_source": "api-gateway",
           "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test",
           "http.method": "GET",
-          "http.status_code": "500"
+          "http.status_code": "500",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 1,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -143,6 +147,7 @@ START
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -167,11 +172,13 @@ START
           "functionname": "integration-tests-js-XXXX-status-code-500s_node14",
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sns",
-          "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda"
+          "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -221,12 +228,14 @@ START
           "queuename": "my-queue",
           "event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
           "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
-          "sender_id": "AIDAIENQZJOLO23YVJ4VO"
+          "sender_id": "AIDAIENQZJOLO23YVJ4VO",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
           "retry_count": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -251,11 +260,13 @@ START
           "functionname": "integration-tests-js-XXXX-status-code-500s_node14",
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sqs",
-          "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue"
+          "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
diff --git a/integration_tests/snapshots/logs/status-code-500s_node16.log b/integration_tests/snapshots/logs/status-code-500s_node16.log
index 3f29f026..0c4cb637 100644
--- a/integration_tests/snapshots/logs/status-code-500s_node16.log
+++ b/integration_tests/snapshots/logs/status-code-500s_node16.log
@@ -52,11 +52,13 @@ START
           "_inferred_span.synchronicity": "sync",
           "http.method": "GET",
           "stage": "test",
-          "http.status_code": "500"
+          "http.status_code": "500",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -83,11 +85,13 @@ START
           "function_trigger.event_source": "api-gateway",
           "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test",
           "http.method": "GET",
-          "http.status_code": "500"
+          "http.status_code": "500",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 1,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -146,6 +150,7 @@ START
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -171,11 +176,13 @@ START
           "functionname": "integration-tests-js-XXXX-status-code-500s_node16",
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sns",
-          "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda"
+          "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -226,12 +233,14 @@ START
           "queuename": "my-queue",
           "event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
           "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
-          "sender_id": "AIDAIENQZJOLO23YVJ4VO"
+          "sender_id": "AIDAIENQZJOLO23YVJ4VO",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
           "retry_count": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -257,11 +266,13 @@ START
           "functionname": "integration-tests-js-XXXX-status-code-500s_node16",
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sqs",
-          "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue"
+          "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
diff --git a/integration_tests/snapshots/logs/status-code-500s_node18.log b/integration_tests/snapshots/logs/status-code-500s_node18.log
index 8a42766f..916415c5 100644
--- a/integration_tests/snapshots/logs/status-code-500s_node18.log
+++ b/integration_tests/snapshots/logs/status-code-500s_node18.log
@@ -52,11 +52,13 @@ START
           "_inferred_span.synchronicity": "sync",
           "http.method": "GET",
           "stage": "test",
-          "http.status_code": "500"
+          "http.status_code": "500",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -83,11 +85,13 @@ START
           "function_trigger.event_source": "api-gateway",
           "function_trigger.event_source_arn": "arn:aws:apigateway:eu-west-1::/restapis/wt6mne2s9k/stages/test",
           "http.method": "GET",
-          "http.status_code": "500"
+          "http.status_code": "500",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 1,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -146,6 +150,7 @@ START
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -171,11 +176,13 @@ START
           "functionname": "integration-tests-js-XXXX-status-code-500s_node18",
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sns",
-          "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda"
+          "function_trigger.event_source_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -226,12 +233,14 @@ START
           "queuename": "my-queue",
           "event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
           "receipt_handle": "AQEBwJnKyrHigUMZj6rYigCgxlaS3SLy0a...",
-          "sender_id": "AIDAIENQZJOLO23YVJ4VO"
+          "sender_id": "AIDAIENQZJOLO23YVJ4VO",
+          "language": "javascript"
         },
         "metrics": {
           "_dd.agent_psr": 1,
           "_dd.top_level": 1,
           "retry_count": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
@@ -257,11 +266,13 @@ START
           "functionname": "integration-tests-js-XXXX-status-code-500s_node18",
           "datadog_lambda":"XXXX",
           "function_trigger.event_source": "sqs",
-          "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue"
+          "function_trigger.event_source_arn": "arn:aws:sqs:us-east-2:123456789012:my-queue",
+          "language": "javascript"
         },
         "metrics": {
           "cold_start": 0,
           "_dd.measured": 1,
+          "process_id":XXXX,
           "_sampling_priority_v1": 1
         },
         "start":XXXX,
diff --git a/package.json b/package.json
index 5945096d..79573617 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@types/node": "^15.6.1",
     "@types/promise-retry": "^1.1.3",
     "@types/shimmer": "^1.0.1",
-    "dd-trace": "^2.14.0",
+    "dd-trace": "^2.25.1",
     "jest": "^27.0.1",
     "mock-fs": "4.14.0",
     "nock": "13.0.11",
diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh
index 43e0a098..8add44a7 100755
--- a/scripts/run_integration_tests.sh
+++ b/scripts/run_integration_tests.sh
@@ -207,7 +207,7 @@ for handler_name in "${LAMBDA_HANDLERS[@]}"; do
                 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|apiid|runtime-id|record_ids|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' |
+                perl -p -e 's/"(span_id|apiid|runtime-id|record_ids|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|process_id)":\ ("?)[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
@@ -228,17 +228,19 @@ for handler_name in "${LAMBDA_HANDLERS[@]}"; do
             # If no snapshot file exists yet, we create one
             echo "Writing logs to $function_snapshot_path because no snapshot exists yet"
             echo "$logs" >$function_snapshot_path
-        elif [ -n "$UPDATE_SNAPSHOTS" ]; then
-            # 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
+                if [ -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
+                    echo "Failed: Mismatch found between new $function_name logs (first) and snapshot (second):"
+                    echo "$diff_output"
+                    mismatch_found=true
+                fi
             else
                 echo "Ok: New logs for $function_name match snapshot"
             fi