From b1f19292d46deef0cdf0b3c8890e964daec8fa9a Mon Sep 17 00:00:00 2001 From: wan <26727996+wantsui@users.noreply.github.com> Date: Fri, 27 Mar 2026 15:07:47 -0400 Subject: [PATCH 1/3] Enable process discovery tests for nodejs --- manifests/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml index bba7065f015..13a553b27e5 100644 --- a/manifests/nodejs.yml +++ b/manifests/nodejs.yml @@ -2057,7 +2057,7 @@ manifest: tests/parametric/test_parametric_endpoints.py::Test_Parametric_Otel_Current_Span: incomplete_test_app (otel current_span endpoint is not supported) tests/parametric/test_parametric_endpoints.py::Test_Parametric_Write_Log: *ref_5_72_0 tests/parametric/test_partial_flushing.py::Test_Partial_Flushing: bug (APMLP-270) - tests/parametric/test_process_discovery.py: missing_feature + tests/parametric/test_process_discovery.py::Test_ProcessDiscovery: v5.93.0 tests/parametric/test_sampling_manual.py::Test_Manual_Sampling: bug (APMAPI-1720) # Manual keep did not override the upstream drop decision tests/parametric/test_sampling_span_tags.py::Test_Knuth_Sample_Rate: missing_feature tests/parametric/test_sampling_span_tags.py::Test_Sampling_Span_Tags::test_tags_appsec_enabled_sst011: bug (APMAPI-737) From 5110575841d943ea52ae590a55324df89c94ed99 Mon Sep 17 00:00:00 2001 From: Thomas Hunter II Date: Fri, 27 Mar 2026 13:46:21 -0700 Subject: [PATCH 2/3] make node parametric process PID=1 to fix memfs failure --- utils/build/docker/nodejs/parametric/app.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build/docker/nodejs/parametric/app.sh b/utils/build/docker/nodejs/parametric/app.sh index 1e166628d24..19ca657a0f4 100755 --- a/utils/build/docker/nodejs/parametric/app.sh +++ b/utils/build/docker/nodejs/parametric/app.sh @@ -14,4 +14,4 @@ if [ -e /volumes/dd-trace-js ]; then fi # shellcheck disable=SC2086 -node server.js ${SYSTEM_TESTS_EXTRA_COMMAND_ARGUMENTS:-} \ No newline at end of file +exec node server.js ${SYSTEM_TESTS_EXTRA_COMMAND_ARGUMENTS:-} \ No newline at end of file From c8ac1a3beb9e28670034a615feb0d585dea986d4 Mon Sep 17 00:00:00 2001 From: Thomas Hunter II Date: Fri, 27 Mar 2026 14:28:05 -0700 Subject: [PATCH 3/3] no longer use node as pid=1 since it might break crashtracking --- tests/parametric/test_process_discovery.py | 4 ++++ utils/build/docker/nodejs/parametric/app.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/parametric/test_process_discovery.py b/tests/parametric/test_process_discovery.py index d8a3db0440e..423e64edaf3 100644 --- a/tests/parametric/test_process_discovery.py +++ b/tests/parametric/test_process_discovery.py @@ -86,6 +86,10 @@ def assert_metadata_content(test_library: APMLibrary, library_env: dict[str, str rc, out = test_library.container_exec_run("pidof java") assert rc pid = int(out) + elif context.library.name == "nodejs": + rc, out = test_library.container_exec_run("pidof node") + assert rc + pid = int(out) memfds = find_dd_memfds(test_library, pid) assert len(memfds) == 1 rc, tracer_metadata = read_memfd(test_library, memfds[0]) diff --git a/utils/build/docker/nodejs/parametric/app.sh b/utils/build/docker/nodejs/parametric/app.sh index 19ca657a0f4..1e166628d24 100755 --- a/utils/build/docker/nodejs/parametric/app.sh +++ b/utils/build/docker/nodejs/parametric/app.sh @@ -14,4 +14,4 @@ if [ -e /volumes/dd-trace-js ]; then fi # shellcheck disable=SC2086 -exec node server.js ${SYSTEM_TESTS_EXTRA_COMMAND_ARGUMENTS:-} \ No newline at end of file +node server.js ${SYSTEM_TESTS_EXTRA_COMMAND_ARGUMENTS:-} \ No newline at end of file