Skip to content

Commit 90acbc0

Browse files
duncanistajoeyzhao2018
duncanista
and
joeyzhao2018
authored
Add support for Node 18 (#321)
* update scripts to support `node18.x` * fix formatting * update integration tests * update size checker for `node18.x` * add snapshots for `node18.x` * fixing the integration tests Co-authored-by: Joey Zhao <[email protected]>
1 parent 95b00f0 commit 90acbc0

40 files changed

+1150
-14
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
strategy:
4646
max-parallel: 4
4747
matrix:
48-
node-version: [12.13, 14.15, 16.14]
48+
node-version: [12.13, 14.15, 16.14, 18.12]
4949
steps:
5050
- name: Checkout
5151
uses: actions/checkout@v3
@@ -84,7 +84,7 @@ jobs:
8484
runs-on: ubuntu-latest
8585
strategy:
8686
matrix:
87-
runtime-param: [12, 14, 16]
87+
runtime-param: [12, 14, 16, 18]
8888
steps:
8989
- name: Checkout
9090
uses: actions/checkout@v3

‎.github/workflows/check-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
node-version: [12.13, 14.15, 16.14]
10+
node-version: [12.13, 14.15, 16.14, 18.12]
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@v3

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Slack](https://chat.datadoghq.com/badge.svg?bg=632CA6)](https://chat.datadoghq.com/)
77
[![License](https://img.shields.io/badge/license-Apache--2.0-blue)](https://github.com/DataDog/datadog-lambda-js/blob/main/LICENSE)
88

9-
Datadog Lambda Library for Node.js (12.x, 14.x and 16.x) enables enhanced Lambda metrics, distributed tracing, and custom metric submission from AWS Lambda functions.
9+
Datadog Lambda Library for Node.js (12.x, 14.x, 16.x, and 18.x) enables enhanced Lambda metrics, distributed tracing, and custom metric submission from AWS Lambda functions.
1010

1111
## Installation
1212

‎integration_tests/snapshots/logs/async-metrics_node18.log

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
START
2+
{
3+
"e": XXXX,
4+
"m": "aws.lambda.enhanced.invocations",
5+
"t": [
6+
"region:sa-east-1",
7+
"account_id:XXXX",
8+
"functionname:integration-tests-js-XXXX-async-metrics_node18",
9+
"resource:integration-tests-js-XXXX-async-metrics_node18",
10+
"cold_start:true",
11+
"memorysize:1024",
12+
"datadog_lambda:vX.X.X",
13+
"runtime:nodejs18.x"
14+
],
15+
"v": 1
16+
}
17+
{
18+
"e": XXXX,
19+
"m": "serverless.integration_test.execution",
20+
"t": [
21+
"tagkey:tagvalue",
22+
"eventsource:APIGateway",
23+
"dd_lambda_layer:datadog-nodev18.XX.X"
24+
],
25+
"v": 1
26+
}
27+
XXXX-XX-XX XX:XX:XX.XXX INFO [dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
28+
END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB
29+
START
30+
{
31+
"e": XXXX,
32+
"m": "aws.lambda.enhanced.invocations",
33+
"t": [
34+
"region:sa-east-1",
35+
"account_id:XXXX",
36+
"functionname:integration-tests-js-XXXX-async-metrics_node18",
37+
"resource:integration-tests-js-XXXX-async-metrics_node18",
38+
"cold_start:false",
39+
"memorysize:1024",
40+
"datadog_lambda:vX.X.X",
41+
"runtime:nodejs18.x"
42+
],
43+
"v": 1
44+
}
45+
{
46+
"e": XXXX,
47+
"m": "serverless.integration_test.records_processed",
48+
"t": [
49+
"tagkey:tagvalue",
50+
"eventsource:SNS",
51+
"dd_lambda_layer:datadog-nodev18.XX.X"
52+
],
53+
"v": 1
54+
}
55+
{
56+
"e": XXXX,
57+
"m": "serverless.integration_test.execution",
58+
"t": [
59+
"tagkey:tagvalue",
60+
"eventsource:SNS",
61+
"dd_lambda_layer:datadog-nodev18.XX.X"
62+
],
63+
"v": 1
64+
}
65+
XXXX-XX-XX XX:XX:XX.XXX INFO [dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
66+
END Duration: XXXX ms Memory Used: XXXX MB
67+
START
68+
{
69+
"e": XXXX,
70+
"m": "aws.lambda.enhanced.invocations",
71+
"t": [
72+
"region:sa-east-1",
73+
"account_id:XXXX",
74+
"functionname:integration-tests-js-XXXX-async-metrics_node18",
75+
"resource:integration-tests-js-XXXX-async-metrics_node18",
76+
"cold_start:false",
77+
"memorysize:1024",
78+
"datadog_lambda:vX.X.X",
79+
"runtime:nodejs18.x"
80+
],
81+
"v": 1
82+
}
83+
{
84+
"e": XXXX,
85+
"m": "serverless.integration_test.records_processed",
86+
"t": [
87+
"tagkey:tagvalue",
88+
"eventsource:SQS",
89+
"dd_lambda_layer:datadog-nodev18.XX.X"
90+
],
91+
"v": 1
92+
}
93+
{
94+
"e": XXXX,
95+
"m": "serverless.integration_test.records_processed",
96+
"t": [
97+
"tagkey:tagvalue",
98+
"eventsource:SQS",
99+
"dd_lambda_layer:datadog-nodev18.XX.X"
100+
],
101+
"v": 1
102+
}
103+
{
104+
"e": XXXX,
105+
"m": "serverless.integration_test.execution",
106+
"t": [
107+
"tagkey:tagvalue",
108+
"eventsource:SQS",
109+
"dd_lambda_layer:datadog-nodev18.XX.X"
110+
],
111+
"v": 1
112+
}
113+
XXXX-XX-XX XX:XX:XX.XXX INFO [dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
114+
END Duration: XXXX ms Memory Used: XXXX MB

‎integration_tests/snapshots/logs/esm_node18.log

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
START
2+
{
3+
"e": XXXX,
4+
"m": "aws.lambda.enhanced.invocations",
5+
"t": [
6+
"region:sa-east-1",
7+
"account_id:XXXX",
8+
"functionname:integration-tests-js-XXXX-esm_node18",
9+
"resource:integration-tests-js-XXXX-esm_node18",
10+
"cold_start:true",
11+
"memorysize:1024",
12+
"datadog_lambda:vX.X.X",
13+
"runtime:nodejs18.x"
14+
],
15+
"v": 1
16+
}
17+
END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB
18+
START
19+
{
20+
"e": XXXX,
21+
"m": "aws.lambda.enhanced.invocations",
22+
"t": [
23+
"region:sa-east-1",
24+
"account_id:XXXX",
25+
"functionname:integration-tests-js-XXXX-esm_node18",
26+
"resource:integration-tests-js-XXXX-esm_node18",
27+
"cold_start:false",
28+
"memorysize:1024",
29+
"datadog_lambda:vX.X.X",
30+
"runtime:nodejs18.x"
31+
],
32+
"v": 1
33+
}
34+
END Duration: XXXX ms Memory Used: XXXX MB
35+
START
36+
{
37+
"e": XXXX,
38+
"m": "aws.lambda.enhanced.invocations",
39+
"t": [
40+
"region:sa-east-1",
41+
"account_id:XXXX",
42+
"functionname:integration-tests-js-XXXX-esm_node18",
43+
"resource:integration-tests-js-XXXX-esm_node18",
44+
"cold_start:false",
45+
"memorysize:1024",
46+
"datadog_lambda:vX.X.X",
47+
"runtime:nodejs18.x"
48+
],
49+
"v": 1
50+
}
51+
END Duration: XXXX ms Memory Used: XXXX MB

‎integration_tests/snapshots/logs/http-requests_node18.log

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
START
2+
{
3+
"e": XXXX,
4+
"m": "aws.lambda.enhanced.invocations",
5+
"t": [
6+
"region:sa-east-1",
7+
"account_id:XXXX",
8+
"functionname:integration-tests-js-XXXX-http-requests_node18",
9+
"resource:integration-tests-js-XXXX-http-requests_node18",
10+
"cold_start:true",
11+
"memorysize:1024",
12+
"datadog_lambda:vX.X.X",
13+
"runtime:nodejs18.x"
14+
],
15+
"v": 1
16+
}
17+
HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
18+
HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
19+
XXXX-XX-XX XX:XX:XX.XXX 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
20+
HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
21+
END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB
22+
START
23+
{
24+
"e": XXXX,
25+
"m": "aws.lambda.enhanced.invocations",
26+
"t": [
27+
"region:sa-east-1",
28+
"account_id:XXXX",
29+
"functionname:integration-tests-js-XXXX-http-requests_node18",
30+
"resource:integration-tests-js-XXXX-http-requests_node18",
31+
"cold_start:false",
32+
"memorysize:1024",
33+
"datadog_lambda:vX.X.X",
34+
"runtime:nodejs18.x"
35+
],
36+
"v": 1
37+
}
38+
HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
39+
HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
40+
XXXX-XX-XX XX:XX:XX.XXX 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
41+
HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
42+
END Duration: XXXX ms Memory Used: XXXX MB
43+
START
44+
{
45+
"e": XXXX,
46+
"m": "aws.lambda.enhanced.invocations",
47+
"t": [
48+
"region:sa-east-1",
49+
"account_id:XXXX",
50+
"functionname:integration-tests-js-XXXX-http-requests_node18",
51+
"resource:integration-tests-js-XXXX-http-requests_node18",
52+
"cold_start:false",
53+
"memorysize:1024",
54+
"datadog_lambda:vX.X.X",
55+
"runtime:nodejs18.x"
56+
],
57+
"v": 1
58+
}
59+
HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
60+
HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
61+
XXXX-XX-XX XX:XX:XX.XXX 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
62+
HTTP POST https://api.datadoghq.com/api/v1/distribution_points?api_key=XXXX TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
63+
END Duration: XXXX ms Memory Used: XXXX MB

0 commit comments

Comments
 (0)