From 2cf33da5024d4d998835a34609e99f765f5691c3 Mon Sep 17 00:00:00 2001 From: Louis Tricot Date: Tue, 17 Mar 2026 17:29:24 +0100 Subject: [PATCH 1/5] Enables process tags propagation by default --- Makefile | 2 +- ext/configuration.h | 2 +- metadata/supported-configurations.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 988bbc87c37..ead58e7ac8f 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ RUST_DEBUG_BUILD ?= $(shell [ -n "${DD_TRACE_DOCKER_DEBUG}" ] && echo 1) EXTRA_CONFIGURE_OPTIONS ?= ASSUME_COMPILED := ${DD_TRACE_ASSUME_COMPILED} MAX_TEST_PARALLELISM ?= $(shell nproc) -ALL_TEST_ENV_OVERRIDE := $(shell [ -n "${DD_TRACE_DOCKER_DEBUG}" ] && echo DD_TRACE_IGNORE_AGENT_SAMPLING_RATES=1) DD_TRACE_GIT_METADATA_ENABLED=0 DD_CRASHTRACKER_RECEIVER_TIMEOUT_MS=15000 +ALL_TEST_ENV_OVERRIDE := $(shell [ -n "${DD_TRACE_DOCKER_DEBUG}" ] && echo DD_TRACE_IGNORE_AGENT_SAMPLING_RATES=1) DD_TRACE_GIT_METADATA_ENABLED=0 DD_CRASHTRACKER_RECEIVER_TIMEOUT_MS=15000 DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED=0 VERSION := $(shell cat VERSION) diff --git a/ext/configuration.h b/ext/configuration.h index 97b97875608..8b7d20962f8 100644 --- a/ext/configuration.h +++ b/ext/configuration.h @@ -263,7 +263,7 @@ enum ddtrace_sampling_rules_format { CONFIG(INT, DD_CODE_ORIGIN_MAX_USER_FRAMES, "8") \ CONFIG(BOOL, DD_TRACE_RESOURCE_RENAMING_ENABLED, "false") \ CONFIG(BOOL, DD_TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT, "false") \ - CONFIG(BOOL, DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false") \ + CONFIG(BOOL, DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true") \ DD_INTEGRATIONS #ifndef _WIN32 diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index b20c2bf5858..92872b7889d 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -370,9 +370,9 @@ ], "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": [ { - "implementation": "A", + "implementation": "B", "type": "boolean", - "default": "false" + "default": "true" } ], "DD_GIT_COMMIT_SHA": [ From 380613aa5d021bfd62bea138ec7e7c670232a9fb Mon Sep 17 00:00:00 2001 From: Louis Tricot Date: Wed, 18 Mar 2026 17:36:30 +0100 Subject: [PATCH 2/5] fix appsec tests --- appsec/cmake/run_tests.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appsec/cmake/run_tests.cmake b/appsec/cmake/run_tests.cmake index 7aa2ecb698a..3d7ef44640f 100644 --- a/appsec/cmake/run_tests.cmake +++ b/appsec/cmake/run_tests.cmake @@ -13,7 +13,7 @@ add_custom_target(xtest-prepare COMMAND mkdir -p /tmp/appsec-ext-test) add_custom_target(xtest - COMMAND ${CMAKE_COMMAND} -E env "DD_TRACE_GIT_METADATA_ENABLED=0" "LSAN_OPTIONS=fast_unwind_on_malloc=0" + COMMAND ${CMAKE_COMMAND} -E env "DD_TRACE_GIT_METADATA_ENABLED=0" "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED=0" "LSAN_OPTIONS=fast_unwind_on_malloc=0" ${CMAKE_SOURCE_DIR}/cmake/run-tests-wrapper.sh "${CMAKE_BINARY_DIR}" "$" "${DD_APPSEC_TRACER_EXT_FILE}" "${PhpConfig_PHP_BINARY}" -n -d variables_order=EGPCS From 32f108c26caea2dee0e8442b5d2f07231d6a563e Mon Sep 17 00:00:00 2001 From: Louis Tricot Date: Wed, 18 Mar 2026 17:38:55 +0100 Subject: [PATCH 3/5] fix other test --- tests/ext/telemetry/config.phpt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/ext/telemetry/config.phpt b/tests/ext/telemetry/config.phpt index 5987426ca13..a0a9df0e9c2 100644 --- a/tests/ext/telemetry/config.phpt +++ b/tests/ext/telemetry/config.phpt @@ -21,6 +21,7 @@ DD_AGENT_HOST= DD_AUTOLOAD_NO_COMPILE= DD_TRACE_GIT_METADATA_ENABLED=0 DD_TRACE_IGNORE_AGENT_SAMPLING_RATES=1 +DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED=0 --INI-- datadog.trace.agent_url="file://{PWD}/config-telemetry.out" --FILE-- @@ -114,6 +115,15 @@ Array ) [5] => Array + ( + [name] => experimental_propagate_process_tags_enabled + [value] => 0 + [origin] => env_var + [config_id] => + [seq_id] => + ) + + [6] => Array ( [name] => ssi_forced_injection_enabled [value] => False From d2b7ce667eeb8ed3e8615cf51368389d5ff5fad7 Mon Sep 17 00:00:00 2001 From: Louis Tricot Date: Fri, 20 Mar 2026 10:57:14 +0100 Subject: [PATCH 4/5] fix pecl tests --- .gitlab/generate-package.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/generate-package.php b/.gitlab/generate-package.php index 669ccb8d4b6..44abd0d60a1 100644 --- a/.gitlab/generate-package.php +++ b/.gitlab/generate-package.php @@ -1154,7 +1154,7 @@ - pecl install datadog_trace.tgz - echo "extension=ddtrace.so" | sudo tee $(php -i | awk -F"=> " '/Scan this dir for additional .ini files/ {print $2}')/ddtrace.ini - php --ri=ddtrace - - TERM=dumb HTTPBIN_HOSTNAME=httpbin-integration HTTPBIN_PORT=8080 DATADOG_HAVE_DEV_ENV=1 DD_TRACE_GIT_METADATA_ENABLED=0 pecl run-tests --showdiff --ini=" -d datadog.trace.sources_path=" -p datadog_trace + - TERM=dumb HTTPBIN_HOSTNAME=httpbin-integration HTTPBIN_PORT=8080 DATADOG_HAVE_DEV_ENV=1 DD_TRACE_GIT_METADATA_ENABLED=0 DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED=0 pecl run-tests --showdiff --ini=" -d datadog.trace.sources_path=" -p datadog_trace after_script: - mkdir artifacts - find $(pecl config-get test_dir) -type f -name '*.diff' -exec cp --parents '{}' artifacts \; From a5b9a97981846b50ca09ba5bff59ea3b989ca60c Mon Sep 17 00:00:00 2001 From: Louis Tricot Date: Fri, 20 Mar 2026 11:55:00 +0100 Subject: [PATCH 5/5] fix tests --- .gitlab/generate-appsec.php | 2 ++ .gitlab/generate-package.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab/generate-appsec.php b/.gitlab/generate-appsec.php index bf9b2de6344..4ade576d65e 100644 --- a/.gitlab/generate-appsec.php +++ b/.gitlab/generate-appsec.php @@ -106,6 +106,7 @@ ARCH: amd64 HELPER_RUST_FLAG: "" GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle-home" + DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED: "0" before_script: @@ -295,6 +296,7 @@ KUBERNETES_MEMORY_REQUEST: 24Gi KUBERNETES_MEMORY_LIMIT: 30Gi ARCH: amd64 + DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED: "0" before_script: diff --git a/.gitlab/generate-package.php b/.gitlab/generate-package.php index 44abd0d60a1..35e3370dc06 100644 --- a/.gitlab/generate-package.php +++ b/.gitlab/generate-package.php @@ -901,7 +901,7 @@ script: - php datadog-setup.php --php-bin all --file $(ls packages/dd-library-php-*-x86_64-linux-gnu.tar.gz) - sed -i 's/datadog.trace.sources_path/\;datadog.trace.sources_path/' /etc/php/8.1/cli/conf.d/98-ddtrace.ini - - DD_TRACE_GIT_METADATA_ENABLED=0 pecl run-tests --showdiff --ini=" -d datadog.trace.cli_enabled=1" $(find tests/ext -type d) + - DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED=0 DD_TRACE_GIT_METADATA_ENABLED=0 pecl run-tests --showdiff --ini=" -d datadog.trace.cli_enabled=1" $(find tests/ext -type d) "framework test": stage: verify