Skip to content

Commit

Permalink
chore: [SVLS-5989] add Node 22 support (#595)
Browse files Browse the repository at this point in the history
  • Loading branch information
@apiarian-datadog
apiarian-datadog authored Nov 27, 2024
1 parent 554ad98 commit 512ec2e
Show file tree
Hide file tree
Showing 40 changed files with 1,234 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
node-version: [16.14, 18.12, 20.9]
node-version: [16.14, 18.12, 20.9, 22.11]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -67,7 +67,7 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-
- name: Install NodeGYP
if: matrix.node-version == '20.9'
if: matrix.node-version == '20.9' || matrix.node-version == '22.11'
run: yarn global add node-gyp

- name: Install dependencies
Expand Down
3 changes: 3 additions & 0 deletions .gitlab/datasources/runtimes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ runtimes:
- name: "node20"
node_version: "20.9"
node_major_version: "20"
- name: "node22"
node_version: "22.11"
node_major_version: "22"
8 changes: 4 additions & 4 deletions .gitlab/scripts/publish_layers.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
set -e

# Available runtimes: https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html
AWS_CLI_NODE_VERSIONS=("nodejs16.x" "nodejs18.x" "nodejs20.x")
LAYER_PATHS=(".layers/datadog_lambda_node16.14.zip" ".layers/datadog_lambda_node18.12.zip" ".layers/datadog_lambda_node20.9.zip")
LAYERS=("Datadog-Node16-x" "Datadog-Node18-x" "Datadog-Node20-x")
NODE_VERSIONS=("16.14" "18.12" "20.9")
AWS_CLI_NODE_VERSIONS=("nodejs16.x" "nodejs18.x" "nodejs20.x" "nodejs22.x")
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")
LAYERS=("Datadog-Node16-x" "Datadog-Node18-x" "Datadog-Node20-x" "Datadog-Node22-x")
NODE_VERSIONS=("16.14" "18.12" "20.9" "22.11")
STAGES=('prod', 'sandbox', 'staging')

printf "Starting script...\n\n"
Expand Down
125 changes: 125 additions & 0 deletions integration_tests/snapshots/logs/async-metrics_node22.log
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@

START
{
"e": XXXX,
"m": "aws.lambda.enhanced.invocations",
"t": [
"region:eu-west-1",
"account_id:XXXX",
"functionname:integration-tests-js-XXXX-async-metrics_node22",
"resource:integration-tests-js-XXXX-async-metrics_node22",
"memorysize:1024",
"cold_start:true",
"datadog_lambda:vX.X.X",
"runtime:nodejs22.x"
],
"v": 1
}
{
"e": XXXX,
"m": "serverless.integration_test.outside_handler",
"t": [
"tagkey:tagvalue",
"eventsource:outside_handler",
"dd_lambda_layer:datadog-nodev22.XX.X"
],
"v": 1
}
{
"e": XXXX,
"m": "serverless.integration_test.execution",
"t": [
"tagkey:tagvalue",
"eventsource:APIGateway",
"dd_lambda_layer:datadog-nodev22.XX.X"
],
"v": 1
}
XXXX-XX-XX XX:XX:XX.XXX INFO [dd.trace_id=XXXX dd.span_id=XXXX] Processed APIGateway request
END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB
START
{
"e": XXXX,
"m": "aws.lambda.enhanced.invocations",
"t": [
"region:eu-west-1",
"account_id:XXXX",
"functionname:integration-tests-js-XXXX-async-metrics_node22",
"resource:integration-tests-js-XXXX-async-metrics_node22",
"memorysize:1024",
"cold_start:false",
"datadog_lambda:vX.X.X",
"runtime:nodejs22.x"
],
"v": 1
}
XXXX-XX-XX XX:XX:XX.XXX INFO [dd.trace_id=XXXX dd.span_id=XXXX] Processed SNS request
{
"e": XXXX,
"m": "serverless.integration_test.records_processed",
"t": [
"tagkey:tagvalue",
"eventsource:SNS",
"dd_lambda_layer:datadog-nodev22.XX.X"
],
"v": 1
}
{
"e": XXXX,
"m": "serverless.integration_test.execution",
"t": [
"tagkey:tagvalue",
"eventsource:SNS",
"dd_lambda_layer:datadog-nodev22.XX.X"
],
"v": 1
}
END Duration: XXXX ms Memory Used: XXXX MB
START
{
"e": XXXX,
"m": "aws.lambda.enhanced.invocations",
"t": [
"region:eu-west-1",
"account_id:XXXX",
"functionname:integration-tests-js-XXXX-async-metrics_node22",
"resource:integration-tests-js-XXXX-async-metrics_node22",
"memorysize:1024",
"cold_start:false",
"datadog_lambda:vX.X.X",
"runtime:nodejs22.x"
],
"v": 1
}
{
"e": XXXX,
"m": "serverless.integration_test.records_processed",
"t": [
"tagkey:tagvalue",
"eventsource:SQS",
"dd_lambda_layer:datadog-nodev22.XX.X"
],
"v": 1
}
{
"e": XXXX,
"m": "serverless.integration_test.records_processed",
"t": [
"tagkey:tagvalue",
"eventsource:SQS",
"dd_lambda_layer:datadog-nodev22.XX.X"
],
"v": 1
}
XXXX-XX-XX XX:XX:XX.XXX INFO [dd.trace_id=XXXX dd.span_id=XXXX] Processed SQS request
{
"e": XXXX,
"m": "serverless.integration_test.execution",
"t": [
"tagkey:tagvalue",
"eventsource:SQS",
"dd_lambda_layer:datadog-nodev22.XX.X"
],
"v": 1
}
END Duration: XXXX ms Memory Used: XXXX MB
52 changes: 52 additions & 0 deletions integration_tests/snapshots/logs/esm_node22.log
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@

START
{
"e": XXXX,
"m": "aws.lambda.enhanced.invocations",
"t": [
"region:eu-west-1",
"account_id:XXXX",
"functionname:integration-tests-js-XXXX-esm_node22",
"resource:integration-tests-js-XXXX-esm_node22",
"memorysize:1024",
"cold_start:true",
"datadog_lambda:vX.X.X",
"runtime:nodejs22.x"
],
"v": 1
}
END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB
START
{
"e": XXXX,
"m": "aws.lambda.enhanced.invocations",
"t": [
"region:eu-west-1",
"account_id:XXXX",
"functionname:integration-tests-js-XXXX-esm_node22",
"resource:integration-tests-js-XXXX-esm_node22",
"memorysize:1024",
"cold_start:false",
"datadog_lambda:vX.X.X",
"runtime:nodejs22.x"
],
"v": 1
}
END Duration: XXXX ms Memory Used: XXXX MB
START
{
"e": XXXX,
"m": "aws.lambda.enhanced.invocations",
"t": [
"region:eu-west-1",
"account_id:XXXX",
"functionname:integration-tests-js-XXXX-esm_node22",
"resource:integration-tests-js-XXXX-esm_node22",
"memorysize:1024",
"cold_start:false",
"datadog_lambda:vX.X.X",
"runtime:nodejs22.x"
],
"v": 1
}
END Duration: XXXX ms Memory Used: XXXX MB
64 changes: 64 additions & 0 deletions integration_tests/snapshots/logs/http-requests_node22.log
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@

START
{
"e": XXXX,
"m": "aws.lambda.enhanced.invocations",
"t": [
"region:eu-west-1",
"account_id:XXXX",
"functionname:integration-tests-js-XXXX-http-requests_node22",
"resource:integration-tests-js-XXXX-http-requests_node22",
"memorysize:1024",
"cold_start:true",
"datadog_lambda:vX.X.X",
"runtime:nodejs22.x"
],
"v": 1
}
HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
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
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"]
END Duration: XXXX ms (init: XXXX ms) Memory Used: XXXX MB
START
{
"e": XXXX,
"m": "aws.lambda.enhanced.invocations",
"t": [
"region:eu-west-1",
"account_id:XXXX",
"functionname:integration-tests-js-XXXX-http-requests_node22",
"resource:integration-tests-js-XXXX-http-requests_node22",
"memorysize:1024",
"cold_start:false",
"datadog_lambda:vX.X.X",
"runtime:nodejs22.x"
],
"v": 1
}
HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
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
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"]
END Duration: XXXX ms Memory Used: XXXX MB
START
{
"e": XXXX,
"m": "aws.lambda.enhanced.invocations",
"t": [
"region:eu-west-1",
"account_id:XXXX",
"functionname:integration-tests-js-XXXX-http-requests_node22",
"resource:integration-tests-js-XXXX-http-requests_node22",
"memorysize:1024",
"cold_start:false",
"datadog_lambda:vX.X.X",
"runtime:nodejs22.x"
],
"v": 1
}
HTTP GET https://ip-ranges.datadoghq.com/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
HTTP GET https://ip-ranges.datadoghq.eu/ TraceHeaders: ["x-datadog-parent-id:XXXX","x-datadog-sampling-priority:-1","x-datadog-trace-id:XXXX"]
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
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"]
END Duration: XXXX ms Memory Used: XXXX MB
Loading

0 comments on commit 512ec2e

Please sign in to comment.