Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions manifests/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1867,9 +1867,18 @@ manifest:
- weblog_declaration:
"*": incomplete_test_app
express5: *ref_5_77_0
tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Direct: missing_feature (dd-trace-js#9527)
tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Direct_Shutdown: missing_feature (dd-trace-js#9527)
tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Sidecar: missing_feature (dd-trace-js#9527)
tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Direct:
- weblog_declaration:
"*": irrelevant
express5: '>=6.18.0 || ^5.129.0'
tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Direct_Shutdown:
- weblog_declaration:
"*": irrelevant
express5: '>=6.18.0 || ^5.129.0'
tests/ffe/test_exposure_egress.py::Test_FFE_Exposure_Egress_Agentless_Sidecar:
- weblog_declaration:
"*": irrelevant
express5: '>=6.18.0 || ^5.129.0'
tests/ffe/test_exposures_datadog_agent.py:
- weblog_declaration:
"*": incomplete_test_app
Expand Down
8 changes: 8 additions & 0 deletions mirror_images.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,10 @@ images:
digest: sha256:4c1359af1571b63dfcb95471fb9fa6a368329368ab5b51d755f35a347161e388
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:express4-typescript.base-eb800c09d602
tag: express4-typescript.base-eb800c09d602
datadog/system-tests:express4.base-0ac992d97c05:
digest: sha256:d4aa357d4c3076d408a52b06628113804182bca9a30a9560762d1cd265fd8e68
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:express4.base-0ac992d97c05
tag: express4.base-0ac992d97c05
datadog/system-tests:express4.base-cb2b80abf6d1:
digest: sha256:06f818aebeadbcaf9614e5f9b75f388b98afe0903b458be96ee1aa7c47aae9b3
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:express4.base-cb2b80abf6d1
Expand All @@ -250,6 +254,10 @@ images:
digest: sha256:bdb975b8d63efe446a17d77a67e0c3d4c5ce1f11b55264e9ae49dae31b6c7c85
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:express5.base-6eecdb28aed2
tag: express5.base-6eecdb28aed2
datadog/system-tests:express5.base-eaeb3b843bbd:
digest: sha256:4a14f2ce05ca199e1b634426ca8f10b3946d7bcf7be0a831c280c3c6437ea4a2
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:express5.base-eaeb3b843bbd
tag: express5.base-eaeb3b843bbd
datadog/system-tests:fastapi.base-1795d4d88178:
digest: sha256:bf65195d25f6e0d663c0f414590471fba7f18b1a0e3d284dda0cbd1896bea9a0
target: registry.ddbuild.io/system-tests/mirror/datadog/system-tests:fastapi.base-1795d4d88178
Expand Down
2 changes: 2 additions & 0 deletions mirror_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,12 @@
- "datadog/system-tests:django-poc.base-78e2159815b1"
- "datadog/system-tests:django-py3.13.base-d8262a2c816c"
- "datadog/system-tests:express4-typescript.base-eb800c09d602"
- "datadog/system-tests:express4.base-0ac992d97c05"
- "datadog/system-tests:express4.base-cb2b80abf6d1"
- "datadog/system-tests:express4.base-fca783fc392c"
- "datadog/system-tests:express5.base-3ef9e2c68c47"
- "datadog/system-tests:express5.base-6eecdb28aed2"
- "datadog/system-tests:express5.base-eaeb3b843bbd"
- "datadog/system-tests:fastapi.base-1795d4d88178"
- "datadog/system-tests:fastapi.base-2917769b3665"
- "datadog/system-tests:fastify.base-bce27c61b3f5"
Expand Down
4 changes: 2 additions & 2 deletions utils/build/docker/base-images.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"version": 1,
"images": {
"system_tests_base_java_lambda_java_lambda_runtime": "datadog/system-tests:java-lambda-runtime.base-e849230b09df",
"system_tests_base_nodejs_express4": "datadog/system-tests:express4.base-fca783fc392c",
"system_tests_base_nodejs_express4": "datadog/system-tests:express4.base-0ac992d97c05",
"system_tests_base_nodejs_express4_typescript": "datadog/system-tests:express4-typescript.base-eb800c09d602",
"system_tests_base_nodejs_express5": "datadog/system-tests:express5.base-6eecdb28aed2",
"system_tests_base_nodejs_express5": "datadog/system-tests:express5.base-eaeb3b843bbd",
"system_tests_base_nodejs_fastify": "datadog/system-tests:fastify.base-bce27c61b3f5",
"system_tests_base_nodejs_nextjs": "datadog/system-tests:nextjs.base-95582a903467",
"system_tests_base_php_apache_mod_7_0": "datadog/system-tests:apache-mod-7.0.base-d171f9d9cd49",
Expand Down
19 changes: 19 additions & 0 deletions utils/build/docker/nodejs/express/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -975,6 +975,25 @@ const startServer = () => {
}
})

// Direct-EVP shutdown coverage needs Docker's SIGTERM to reach the ordinary Node
// process and let dd-trace's beforeExit hooks flush. Keep this opt-in so other
// scenarios retain the weblog's historical signal behavior.
if (process.env.SYSTEM_TESTS_FFE_SHUTDOWN_FLUSH_ENABLED === 'true') {
process.once('SIGTERM', () => {
server.close(error => {
if (error) {
console.error('Failed to close server during SIGTERM:', error)
process.exitCode = 1
return
}
console.log(JSON.stringify({
event: 'system_tests.ffe.shutdown.server_closed',
timestamp: new Date().toISOString()
}))
})
})
}

server.listen(7777, '0.0.0.0', () => {
tracer.trace('init.service', () => {})
console.log('listening')
Expand Down
7 changes: 5 additions & 2 deletions utils/build/docker/nodejs/express5.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ ENV PGPORT=5433

ENV DD_DATA_STREAMS_ENABLED=true

# Allow Node.js to trust the CA bundle mounted by direct-intake test scenarios.
ENV NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt

# docker startup
COPY utils/build/docker/nodejs/app.sh app.sh
RUN chmod +x app.sh
RUN printf 'node app.js' >> app.sh
CMD ./app.sh
RUN printf 'exec node app.js\n' >> app.sh
CMD ["./app.sh"]

COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
RUN /binaries/install_ddtrace.sh && rm -rf /root/.bun
Expand Down
Loading