Skip to content

Commit 512ec2e

Browse files
apiarian-datadogapiarian-datadog
authored
chore: [SVLS-5989] add Node 22 support (#595)
1 parent 554ad98 commit 512ec2e

40 files changed

+1234
-16
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
strategy:
4545
max-parallel: 4
4646
matrix:
47-
node-version: [16.14, 18.12, 20.9]
47+
node-version: [16.14, 18.12, 20.9, 22.11]
4848
steps:
4949
- name: Checkout
5050
uses: actions/checkout@v3
@@ -67,7 +67,7 @@ jobs:
6767
restore-keys: |
6868
${{ runner.os }}-yarn-
6969
- name: Install NodeGYP
70-
if: matrix.node-version == '20.9'
70+
if: matrix.node-version == '20.9' || matrix.node-version == '22.11'
7171
run: yarn global add node-gyp
7272

7373
- name: Install dependencies

‎.gitlab/datasources/runtimes.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ runtimes:
88
- name: "node20"
99
node_version: "20.9"
1010
node_major_version: "20"
11+
- name: "node22"
12+
node_version: "22.11"
13+
node_major_version: "22"

‎.gitlab/scripts/publish_layers.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
set -e
1111

1212
# Available runtimes: https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html
13-
AWS_CLI_NODE_VERSIONS=("nodejs16.x" "nodejs18.x" "nodejs20.x")
14-
LAYER_PATHS=(".layers/datadog_lambda_node16.14.zip" ".layers/datadog_lambda_node18.12.zip" ".layers/datadog_lambda_node20.9.zip")
15-
LAYERS=("Datadog-Node16-x" "Datadog-Node18-x" "Datadog-Node20-x")
16-
NODE_VERSIONS=("16.14" "18.12" "20.9")
13+
AWS_CLI_NODE_VERSIONS=("nodejs16.x" "nodejs18.x" "nodejs20.x" "nodejs22.x")
14+
LAYER_PATHS=(".layers/datadog_lambda_node16.14.zip" ".layers/datadog_lambda_node18.12.zip" ".layers/datadog_lambda_node20.9.zip" ".layers/datadog_lambda_node22.11.zip")
15+
LAYERS=("Datadog-Node16-x" "Datadog-Node18-x" "Datadog-Node20-x" "Datadog-Node22-x")
16+
NODE_VERSIONS=("16.14" "18.12" "20.9" "22.11")
1717
STAGES=('prod', 'sandbox', 'staging')
1818

1919
printf "Starting script...\n\n"

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

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

‎integration_tests/snapshots/logs/esm_node22.log

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

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

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

0 commit comments

Comments
 (0)