From 7bbd4f9dff6285a33aaf8cfe9d12114bf7d5a95e Mon Sep 17 00:00:00 2001 From: Brian Marks Date: Mon, 16 Mar 2026 21:08:53 -0400 Subject: [PATCH 1/6] System tests no longer require Node.js specific handling --- tests/parametric/test_startup_logs.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tests/parametric/test_startup_logs.py b/tests/parametric/test_startup_logs.py index 5d2ce15d1bc..e50399b3e73 100644 --- a/tests/parametric/test_startup_logs.py +++ b/tests/parametric/test_startup_logs.py @@ -70,12 +70,6 @@ class Test_Startup_Logs: def test_startup_logs_default(self, test_library: APMLibrary): """Verify default startup log behavior when DD_TRACE_STARTUP_LOGS is not set.""" with test_library: - # For Node.js, startup logs are emitted when the tracer tries to send its first trace - if context.library == "nodejs": - with test_library.dd_start_span("test_operation", service="test_service"): - pass - test_library.dd_flush() - logs = _get_startup_logs(test_library, required=True) assert logs is not None @@ -93,12 +87,6 @@ def test_startup_logs_default(self, test_library: APMLibrary): def test_startup_logs_enabled(self, test_library: APMLibrary): """Verify startup logs are emitted when DD_TRACE_STARTUP_LOGS=true.""" with test_library: - # For Node.js, startup logs are emitted when the tracer tries to send its first trace - if context.library == "nodejs": - with test_library.dd_start_span("test_operation", service="test_service"): - pass - test_library.dd_flush() - logs = _get_startup_logs(test_library, required=True) assert logs is not None @@ -121,12 +109,6 @@ def test_startup_logs_enabled(self, test_library: APMLibrary): def test_startup_logs_disabled(self, test_library: APMLibrary): """Verify startup logs are suppressed when DD_TRACE_STARTUP_LOGS=false.""" with test_library: - # For Node.js, trigger a trace to ensure startup logs would be emitted if enabled - if context.library == "nodejs": - with test_library.dd_start_span("test_operation", service="test_service"): - pass - test_library.dd_flush() - logs = _get_startup_logs(test_library, required=False) if logs is not None: match = re.search(STARTUP_LOG_PATTERN, logs, re.IGNORECASE) From 327818d5edf101a6e945a8abe168fd5ff2328a62 Mon Sep 17 00:00:00 2001 From: bm1549 Date: Wed, 18 Mar 2026 13:41:21 -0400 Subject: [PATCH 2/6] [node] enabled by default in 6.0.0 --- manifests/nodejs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml index 53bcd305645..1f5d35610b1 100644 --- a/manifests/nodejs.yml +++ b/manifests/nodejs.yml @@ -84,6 +84,7 @@ refs: - &ref_5_87_0 '>=5.87.0' # Debugger: Capture expressions support - &ref_5_89_0 '>=5.89.0' - &ref_5_90_0 '>=5.90.0' + - &ref_6_0_0 '>=6.0.0' manifest: tests/ai_guard/test_ai_guard_sdk.py::Test_ContentParts: - weblog_declaration: @@ -2076,7 +2077,7 @@ manifest: tests/parametric/test_span_sampling.py::Test_Span_Sampling::test_keep_span_with_stats_computation_sss010: missing_feature (this has to be implemented by a lot of the tracers and we need to do a bit of work on the assert) ? tests/parametric/test_span_sampling.py::Test_Span_Sampling::test_root_span_selected_and_child_dropped_by_sss_when_dropping_policy_is_active016 : missing_feature (Not implemented) - tests/parametric/test_startup_logs.py::Test_Startup_Logs::test_startup_logs_default: missing_feature (Startup configuration log not emitted by default when DD_TRACE_STARTUP_LOGS is unset) + tests/parametric/test_startup_logs.py::Test_Startup_Logs::test_startup_logs_default: *ref_6_0_0 tests/parametric/test_startup_logs.py::Test_Startup_Logs::test_startup_logs_diagnostic_agent_unreachable: missing_feature (Diagnostic messages not emitted when agent is unreachable) tests/parametric/test_telemetry.py::Test_Consistent_Configs: *ref_5_25_0 tests/parametric/test_telemetry.py::Test_Consistent_Configs::test_library_settings_2: missing_feature (Not implemented) From 3c2ee48924c424f20e521aad5e496b71e6f1488f Mon Sep 17 00:00:00 2001 From: bm1549 Date: Fri, 20 Mar 2026 10:12:57 -0400 Subject: [PATCH 3/6] fix(nodejs): use >=6.0.0-0 to include prerelease versions in CI Co-Authored-By: Claude Sonnet 4.6 (1M context) --- manifests/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml index 1f5d35610b1..72475f9e37e 100644 --- a/manifests/nodejs.yml +++ b/manifests/nodejs.yml @@ -84,7 +84,7 @@ refs: - &ref_5_87_0 '>=5.87.0' # Debugger: Capture expressions support - &ref_5_89_0 '>=5.89.0' - &ref_5_90_0 '>=5.90.0' - - &ref_6_0_0 '>=6.0.0' + - &ref_6_0_0 '>=6.0.0-0' manifest: tests/ai_guard/test_ai_guard_sdk.py::Test_ContentParts: - weblog_declaration: From c2deea867e002376dd1aca84c687e7792d7c08d5 Mon Sep 17 00:00:00 2001 From: bm1549 Date: Fri, 20 Mar 2026 11:38:27 -0400 Subject: [PATCH 4/6] fix(nodejs): use >5.90.0 for readability per review feedback Change from >=6.0.0-0 to >5.90.0 which is equivalent (includes all 6.0.0 prereleases) but more readable per nccatoni's review suggestion. Co-Authored-By: Claude Opus 4.6 (1M context) --- manifests/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml index 72475f9e37e..d0b47d63103 100644 --- a/manifests/nodejs.yml +++ b/manifests/nodejs.yml @@ -84,7 +84,7 @@ refs: - &ref_5_87_0 '>=5.87.0' # Debugger: Capture expressions support - &ref_5_89_0 '>=5.89.0' - &ref_5_90_0 '>=5.90.0' - - &ref_6_0_0 '>=6.0.0-0' + - &ref_6_0_0 '>5.90.0' manifest: tests/ai_guard/test_ai_guard_sdk.py::Test_ContentParts: - weblog_declaration: From bceaa8d38420e9f525cb2e065542f8ca637cfc1f Mon Sep 17 00:00:00 2001 From: bm1549 Date: Fri, 20 Mar 2026 11:43:22 -0400 Subject: [PATCH 5/6] Revert to >=6.0.0-0: >5.90.0 is wrong since future 5.x versions are unknown Co-Authored-By: Claude Opus 4.6 (1M context) --- manifests/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml index d0b47d63103..72475f9e37e 100644 --- a/manifests/nodejs.yml +++ b/manifests/nodejs.yml @@ -84,7 +84,7 @@ refs: - &ref_5_87_0 '>=5.87.0' # Debugger: Capture expressions support - &ref_5_89_0 '>=5.89.0' - &ref_5_90_0 '>=5.90.0' - - &ref_6_0_0 '>5.90.0' + - &ref_6_0_0 '>=6.0.0-0' manifest: tests/ai_guard/test_ai_guard_sdk.py::Test_ContentParts: - weblog_declaration: From 50dd3786f142201aff9ee96391dc6431ef36eae4 Mon Sep 17 00:00:00 2001 From: bm1549 Date: Fri, 20 Mar 2026 12:53:49 -0400 Subject: [PATCH 6/6] fix(nodejs): use >=6.0.0-pre for startup logs test Co-Authored-By: Claude Opus 4.6 (1M context) --- manifests/nodejs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml index 72475f9e37e..fba8067e213 100644 --- a/manifests/nodejs.yml +++ b/manifests/nodejs.yml @@ -84,7 +84,7 @@ refs: - &ref_5_87_0 '>=5.87.0' # Debugger: Capture expressions support - &ref_5_89_0 '>=5.89.0' - &ref_5_90_0 '>=5.90.0' - - &ref_6_0_0 '>=6.0.0-0' + - &ref_6_0_0 '>=6.0.0-pre' manifest: tests/ai_guard/test_ai_guard_sdk.py::Test_ContentParts: - weblog_declaration: