Skip to content

Commit f14d8d2

Browse files
lym953lym953
authored
Merge branch 'main' into yiming.luo/rename-durable-tag
2 parents bd2d002 + eda0f53 commit f14d8d2

17 files changed

Lines changed: 313 additions & 143 deletions

‎.github/workflows/build_layer.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Build Layers for System Tests
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "main"
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
node_version: ["18.12", "20.19", "22.11", "24.11"]
17+
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
21+
22+
- name: Build layer for Node ${{ matrix.node_version }}
23+
run: |
24+
NODE_MAJOR=$(echo "${{ matrix.node_version }}" | cut -d '.' -f 1)
25+
temp_dir=$(mktemp -d)
26+
docker buildx build -t datadog-lambda-layer-node:${{ matrix.node_version }} . --no-cache \
27+
--build-arg image=node:${NODE_MAJOR}-bullseye --progress=plain -o $temp_dir/nodejs
28+
mkdir -p .layers
29+
(cd $temp_dir && zip -q -r $GITHUB_WORKSPACE/.layers/datadog_lambda_node${{ matrix.node_version }}.zip ./)
30+
rm -rf $temp_dir
31+
32+
- name: Upload layer artifact
33+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
34+
with:
35+
path: .layers/datadog_lambda_node${{ matrix.node_version }}.zip
36+
name: datadog_lambda_node${{ matrix.node_version }}

‎integration_tests/snapshots/logs/esm_node18.log‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ START
4545
"http.status_code": "200",
4646
"_dd.integration": "opentracing",
4747
"_dd.base_service": "integration-tests-js-XXXX-esm_node18",
48+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node18",
4849
"language": "javascript"
4950
},
5051
"metrics": {
@@ -151,6 +152,7 @@ START
151152
"stream_view_type": "KEYS_ONLY",
152153
"_dd.integration": "opentracing",
153154
"_dd.base_service": "integration-tests-js-XXXX-esm_node18",
155+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node18",
154156
"language": "javascript"
155157
},
156158
"metrics": {
@@ -255,6 +257,7 @@ START
255257
"stream_view_type": "KEYS_ONLY",
256258
"_dd.integration": "opentracing",
257259
"_dd.base_service": "integration-tests-js-XXXX-esm_node18",
260+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node18",
258261
"language": "javascript"
259262
},
260263
"metrics": {
@@ -359,6 +362,7 @@ START
359362
"stream_view_type": "KEYS_ONLY",
360363
"_dd.integration": "opentracing",
361364
"_dd.base_service": "integration-tests-js-XXXX-esm_node18",
365+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node18",
362366
"language": "javascript"
363367
},
364368
"metrics": {
@@ -462,6 +466,7 @@ START
462466
"object_etag": "09876543210987654321098765432109-2",
463467
"_dd.integration": "opentracing",
464468
"_dd.base_service": "integration-tests-js-XXXX-esm_node18",
469+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node18",
465470
"language": "javascript"
466471
},
467472
"metrics": {
@@ -565,6 +570,7 @@ START
565570
"object_etag": "01234567890123456789012345678901",
566571
"_dd.integration": "opentracing",
567572
"_dd.base_service": "integration-tests-js-XXXX-esm_node18",
573+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node18",
568574
"language": "javascript"
569575
},
570576
"metrics": {
@@ -668,6 +674,7 @@ START
668674
"object_etag": "abcdef0123456789abcdef01234567890",
669675
"_dd.integration": "opentracing",
670676
"_dd.base_service": "integration-tests-js-XXXX-esm_node18",
677+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node18",
671678
"language": "javascript"
672679
},
673680
"metrics": {
@@ -771,6 +778,7 @@ START
771778
"event_subscription_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda:21be56ed-a058-49f5-8c98-aedd2564c486",
772779
"_dd.integration": "opentracing",
773780
"_dd.base_service": "integration-tests-js-XXXX-esm_node18",
781+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node18",
774782
"language": "javascript"
775783
},
776784
"metrics": {
@@ -871,6 +879,7 @@ START
871879
"sender_id": "AIDAIENQZJOLO23YVJ4VO",
872880
"_dd.integration": "opentracing",
873881
"_dd.base_service": "integration-tests-js-XXXX-esm_node18",
882+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node18",
874883
"language": "javascript"
875884
},
876885
"metrics": {

‎integration_tests/snapshots/logs/esm_node20.log‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ START
4545
"http.status_code": "200",
4646
"_dd.integration": "opentracing",
4747
"_dd.base_service": "integration-tests-js-XXXX-esm_node20",
48+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node20",
4849
"language": "javascript"
4950
},
5051
"metrics": {
@@ -151,6 +152,7 @@ START
151152
"stream_view_type": "KEYS_ONLY",
152153
"_dd.integration": "opentracing",
153154
"_dd.base_service": "integration-tests-js-XXXX-esm_node20",
155+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node20",
154156
"language": "javascript"
155157
},
156158
"metrics": {
@@ -255,6 +257,7 @@ START
255257
"stream_view_type": "KEYS_ONLY",
256258
"_dd.integration": "opentracing",
257259
"_dd.base_service": "integration-tests-js-XXXX-esm_node20",
260+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node20",
258261
"language": "javascript"
259262
},
260263
"metrics": {
@@ -359,6 +362,7 @@ START
359362
"stream_view_type": "KEYS_ONLY",
360363
"_dd.integration": "opentracing",
361364
"_dd.base_service": "integration-tests-js-XXXX-esm_node20",
365+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node20",
362366
"language": "javascript"
363367
},
364368
"metrics": {
@@ -462,6 +466,7 @@ START
462466
"object_etag": "09876543210987654321098765432109-2",
463467
"_dd.integration": "opentracing",
464468
"_dd.base_service": "integration-tests-js-XXXX-esm_node20",
469+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node20",
465470
"language": "javascript"
466471
},
467472
"metrics": {
@@ -565,6 +570,7 @@ START
565570
"object_etag": "01234567890123456789012345678901",
566571
"_dd.integration": "opentracing",
567572
"_dd.base_service": "integration-tests-js-XXXX-esm_node20",
573+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node20",
568574
"language": "javascript"
569575
},
570576
"metrics": {
@@ -668,6 +674,7 @@ START
668674
"object_etag": "abcdef0123456789abcdef01234567890",
669675
"_dd.integration": "opentracing",
670676
"_dd.base_service": "integration-tests-js-XXXX-esm_node20",
677+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node20",
671678
"language": "javascript"
672679
},
673680
"metrics": {
@@ -771,6 +778,7 @@ START
771778
"event_subscription_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda:21be56ed-a058-49f5-8c98-aedd2564c486",
772779
"_dd.integration": "opentracing",
773780
"_dd.base_service": "integration-tests-js-XXXX-esm_node20",
781+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node20",
774782
"language": "javascript"
775783
},
776784
"metrics": {
@@ -871,6 +879,7 @@ START
871879
"sender_id": "AIDAIENQZJOLO23YVJ4VO",
872880
"_dd.integration": "opentracing",
873881
"_dd.base_service": "integration-tests-js-XXXX-esm_node20",
882+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node20",
874883
"language": "javascript"
875884
},
876885
"metrics": {

‎integration_tests/snapshots/logs/esm_node22.log‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ START
4545
"http.status_code": "200",
4646
"_dd.integration": "opentracing",
4747
"_dd.base_service": "integration-tests-js-XXXX-esm_node22",
48+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node22",
4849
"language": "javascript"
4950
},
5051
"metrics": {
@@ -151,6 +152,7 @@ START
151152
"stream_view_type": "KEYS_ONLY",
152153
"_dd.integration": "opentracing",
153154
"_dd.base_service": "integration-tests-js-XXXX-esm_node22",
155+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node22",
154156
"language": "javascript"
155157
},
156158
"metrics": {
@@ -255,6 +257,7 @@ START
255257
"stream_view_type": "KEYS_ONLY",
256258
"_dd.integration": "opentracing",
257259
"_dd.base_service": "integration-tests-js-XXXX-esm_node22",
260+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node22",
258261
"language": "javascript"
259262
},
260263
"metrics": {
@@ -359,6 +362,7 @@ START
359362
"stream_view_type": "KEYS_ONLY",
360363
"_dd.integration": "opentracing",
361364
"_dd.base_service": "integration-tests-js-XXXX-esm_node22",
365+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node22",
362366
"language": "javascript"
363367
},
364368
"metrics": {
@@ -462,6 +466,7 @@ START
462466
"object_etag": "09876543210987654321098765432109-2",
463467
"_dd.integration": "opentracing",
464468
"_dd.base_service": "integration-tests-js-XXXX-esm_node22",
469+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node22",
465470
"language": "javascript"
466471
},
467472
"metrics": {
@@ -565,6 +570,7 @@ START
565570
"object_etag": "01234567890123456789012345678901",
566571
"_dd.integration": "opentracing",
567572
"_dd.base_service": "integration-tests-js-XXXX-esm_node22",
573+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node22",
568574
"language": "javascript"
569575
},
570576
"metrics": {
@@ -668,6 +674,7 @@ START
668674
"object_etag": "abcdef0123456789abcdef01234567890",
669675
"_dd.integration": "opentracing",
670676
"_dd.base_service": "integration-tests-js-XXXX-esm_node22",
677+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node22",
671678
"language": "javascript"
672679
},
673680
"metrics": {
@@ -771,6 +778,7 @@ START
771778
"event_subscription_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda:21be56ed-a058-49f5-8c98-aedd2564c486",
772779
"_dd.integration": "opentracing",
773780
"_dd.base_service": "integration-tests-js-XXXX-esm_node22",
781+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node22",
774782
"language": "javascript"
775783
},
776784
"metrics": {
@@ -871,6 +879,7 @@ START
871879
"sender_id": "AIDAIENQZJOLO23YVJ4VO",
872880
"_dd.integration": "opentracing",
873881
"_dd.base_service": "integration-tests-js-XXXX-esm_node22",
882+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node22",
874883
"language": "javascript"
875884
},
876885
"metrics": {

‎integration_tests/snapshots/logs/esm_node24.log‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ START
4545
"http.status_code": "200",
4646
"_dd.integration": "opentracing",
4747
"_dd.base_service": "integration-tests-js-XXXX-esm_node24",
48+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node24",
4849
"language": "javascript"
4950
},
5051
"metrics": {
@@ -151,6 +152,7 @@ START
151152
"stream_view_type": "KEYS_ONLY",
152153
"_dd.integration": "opentracing",
153154
"_dd.base_service": "integration-tests-js-XXXX-esm_node24",
155+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node24",
154156
"language": "javascript"
155157
},
156158
"metrics": {
@@ -255,6 +257,7 @@ START
255257
"stream_view_type": "KEYS_ONLY",
256258
"_dd.integration": "opentracing",
257259
"_dd.base_service": "integration-tests-js-XXXX-esm_node24",
260+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node24",
258261
"language": "javascript"
259262
},
260263
"metrics": {
@@ -359,6 +362,7 @@ START
359362
"stream_view_type": "KEYS_ONLY",
360363
"_dd.integration": "opentracing",
361364
"_dd.base_service": "integration-tests-js-XXXX-esm_node24",
365+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node24",
362366
"language": "javascript"
363367
},
364368
"metrics": {
@@ -462,6 +466,7 @@ START
462466
"object_etag": "09876543210987654321098765432109-2",
463467
"_dd.integration": "opentracing",
464468
"_dd.base_service": "integration-tests-js-XXXX-esm_node24",
469+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node24",
465470
"language": "javascript"
466471
},
467472
"metrics": {
@@ -565,6 +570,7 @@ START
565570
"object_etag": "01234567890123456789012345678901",
566571
"_dd.integration": "opentracing",
567572
"_dd.base_service": "integration-tests-js-XXXX-esm_node24",
573+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node24",
568574
"language": "javascript"
569575
},
570576
"metrics": {
@@ -668,6 +674,7 @@ START
668674
"object_etag": "abcdef0123456789abcdef01234567890",
669675
"_dd.integration": "opentracing",
670676
"_dd.base_service": "integration-tests-js-XXXX-esm_node24",
677+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node24",
671678
"language": "javascript"
672679
},
673680
"metrics": {
@@ -771,6 +778,7 @@ START
771778
"event_subscription_arn": "arn:aws:sns:us-east-2:123456789012:sns-lambda:21be56ed-a058-49f5-8c98-aedd2564c486",
772779
"_dd.integration": "opentracing",
773780
"_dd.base_service": "integration-tests-js-XXXX-esm_node24",
781+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node24",
774782
"language": "javascript"
775783
},
776784
"metrics": {
@@ -871,6 +879,7 @@ START
871879
"sender_id": "AIDAIENQZJOLO23YVJ4VO",
872880
"_dd.integration": "opentracing",
873881
"_dd.base_service": "integration-tests-js-XXXX-esm_node24",
882+
"_dd.tags.process": "entrypoint.type:script,entrypoint.workdir:task,package.json.name:integration_tests,svc.auto:integration-tests-js-XXXX-esm_node24",
874883
"language": "javascript"
875884
},
876885
"metrics": {

0 commit comments

Comments
 (0)