From 7f548bb12d98475a67073c16cf1bf236d118d56c Mon Sep 17 00:00:00 2001 From: Ayan Khan Date: Wed, 8 Apr 2026 17:49:49 -0400 Subject: [PATCH 1/7] feat: seed root session ID from master-generated RuntimeID Set root_session_id from the RuntimeID generated in register_hooks (master process) so all forked worker Tracers share the same root. Co-Authored-By: Claude Opus 4.6 (1M context) --- deps/dd-trace-cpp | 2 +- mod_datadog/src/tracing/conf.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deps/dd-trace-cpp b/deps/dd-trace-cpp index 14280afb..8b810cc1 160000 --- a/deps/dd-trace-cpp +++ b/deps/dd-trace-cpp @@ -1 +1 @@ -Subproject commit 14280afb9960c052655601b2e7b0856f376f4b86 +Subproject commit 8b810cc1413460c0d26bcf8f3763cbc34914ebb1 diff --git a/mod_datadog/src/tracing/conf.cpp b/mod_datadog/src/tracing/conf.cpp index cee66609..557077f6 100644 --- a/mod_datadog/src/tracing/conf.cpp +++ b/mod_datadog/src/tracing/conf.cpp @@ -13,6 +13,7 @@ void init(TracerConfig& conf, RuntimeID& runtime_id, server_rec* s, conf.service_type = "server"; conf.logger = std::make_shared(s, datadog_module->module_index); conf.runtime_id = runtime_id; + conf.root_session_id = runtime_id.string(); conf.integration_name = "httpd"; conf.integration_version = common::utils::make_httpd_version(); } From 6ab57c4364353b3c05c2d03259f3c8f00a7c8974 Mon Sep 17 00:00:00 2001 From: Ayan Khan Date: Mon, 13 Apr 2026 11:13:49 -0400 Subject: [PATCH 2/7] fix: remove submodule pin, keep only conf.cpp change Co-Authored-By: Claude Opus 4.6 (1M context) --- deps/dd-trace-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/dd-trace-cpp b/deps/dd-trace-cpp index 8b810cc1..14280afb 160000 --- a/deps/dd-trace-cpp +++ b/deps/dd-trace-cpp @@ -1 +1 @@ -Subproject commit 8b810cc1413460c0d26bcf8f3763cbc34914ebb1 +Subproject commit 14280afb9960c052655601b2e7b0856f376f4b86 From 597043b8d4428a6460042a9bde6503fd399a2a30 Mon Sep 17 00:00:00 2001 From: Ayan Khan Date: Mon, 13 Apr 2026 11:30:02 -0400 Subject: [PATCH 3/7] chore: update dd-trace-cpp submodule to main (includes #295) Co-Authored-By: Claude Opus 4.6 (1M context) --- deps/dd-trace-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/dd-trace-cpp b/deps/dd-trace-cpp index 14280afb..92cdfe6f 160000 --- a/deps/dd-trace-cpp +++ b/deps/dd-trace-cpp @@ -1 +1 @@ -Subproject commit 14280afb9960c052655601b2e7b0856f376f4b86 +Subproject commit 92cdfe6fb5713f0caef02d1e749eff3bcd171baf From c70b5b644c2c210801482ffdb852e093d81bdf1d Mon Sep 17 00:00:00 2001 From: Ayan Khan Date: Wed, 15 Apr 2026 12:36:37 -0400 Subject: [PATCH 4/7] chore: merge main and update dd-trace-cpp submodule to latest Co-Authored-By: Claude Opus 4.6 (1M context) --- deps/dd-trace-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/dd-trace-cpp b/deps/dd-trace-cpp index 92cdfe6f..1f76c5cd 160000 --- a/deps/dd-trace-cpp +++ b/deps/dd-trace-cpp @@ -1 +1 @@ -Subproject commit 92cdfe6fb5713f0caef02d1e749eff3bcd171baf +Subproject commit 1f76c5cd2c8c9f8a472643b24f559b44be1fac12 From 24e8786479ff1bdead7214d69ca26f7d2fe2524e Mon Sep 17 00:00:00 2001 From: Ayan Khan Date: Tue, 21 Apr 2026 11:14:23 -0400 Subject: [PATCH 5/7] fix(test): pass vcr_json_body_normalizers to make_app ddapm-test-agent added vcr_json_body_normalizers as a required kwarg on make_app(); the fixture was constructed without it, which blew up the test-rum:amd64 / test-rum:arm64 GitLab jobs with: TypeError: make_app() missing 1 required positional argument: 'vcr_json_body_normalizers' Follow the existing vcr_* pattern and pass an empty string default. Co-Authored-By: Claude Opus 4 (1M context) --- test/integration-test/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration-test/conftest.py b/test/integration-test/conftest.py index 51c6d0be..1be935e2 100644 --- a/test/integration-test/conftest.py +++ b/test/integration-test/conftest.py @@ -187,6 +187,7 @@ def __init__(self, host: str, port: int) -> None: vcr_ci_mode=False, vcr_provider_map="", vcr_ignore_headers="", + vcr_json_body_normalizers="", dd_site="", dd_api_key="", disable_llmobs_data_forwarding=False, From 6cb1805fc5a9c2dce61267bb161703e36bd17c38 Mon Sep 17 00:00:00 2001 From: Ayan Khan Date: Wed, 22 Apr 2026 09:56:34 -0400 Subject: [PATCH 6/7] fix(test): bump ddapm-test-agent to v1.50.1 in requirements.txt The GitHub Actions 'test' job installs from requirements.txt (pinned to v1.40.0), while GitLab's test-rum job uses uv sync from pyproject.toml (which pulls latest). The prior commit added the new required kwarg vcr_json_body_normalizers to unblock GitLab, but that then broke the GitHub job because v1.40.0 doesn't accept the kwarg yet. Unify both envs on v1.50.1, which introduced vcr_json_body_normalizers in v1.47.0 (PR DataDog/dd-apm-test-agent#324, 2026-04-13). Co-Authored-By: Claude Opus 4 (1M context) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b406e895..dd205586 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ pytest==7.4.4 requests==2.32.2 flask==3.0.2 msgpack==1.0.8 -git+https://github.com/Datadog/dd-apm-test-agent@v1.40.0 +git+https://github.com/Datadog/dd-apm-test-agent@v1.50.1 From 37e05c22593d8a41d30896e3a3e65200bc73dfb5 Mon Sep 17 00:00:00 2001 From: Ayan Khan Date: Wed, 22 Apr 2026 09:57:17 -0400 Subject: [PATCH 7/7] chore: bump dd-trace-cpp submodule to latest main (5dfaf40) Picks up: - feat(c-binding): accept explicit span timestamps (#309) - unpin system-tests (back to @main) (#308) Co-Authored-By: Claude Opus 4 (1M context) --- deps/dd-trace-cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/dd-trace-cpp b/deps/dd-trace-cpp index 1f76c5cd..5dfaf408 160000 --- a/deps/dd-trace-cpp +++ b/deps/dd-trace-cpp @@ -1 +1 @@ -Subproject commit 1f76c5cd2c8c9f8a472643b24f559b44be1fac12 +Subproject commit 5dfaf408a95fcf7cbfce0eba5a40208b826b5720