Skip to content

Commit a8ee11d

Browse files
authored
Enables process tags propagation by default (#3706)
* Enables process tags propagation by default * fix appsec tests * fix other test * fix pecl tests * fix tests
1 parent d442722 commit a8ee11d

File tree

7 files changed

+19
-7
lines changed

7 files changed

+19
-7
lines changed

.gitlab/generate-appsec.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
ARCH: amd64
107107
HELPER_RUST_FLAG: ""
108108
GRADLE_USER_HOME: "$CI_PROJECT_DIR/.gradle-home"
109+
DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED: "0"
109110
before_script:
110111
<?php echo $ecrLoginSnippet, "\n"; ?>
111112
<?php dockerhub_login() ?>
@@ -295,6 +296,7 @@
295296
KUBERNETES_MEMORY_REQUEST: 24Gi
296297
KUBERNETES_MEMORY_LIMIT: 30Gi
297298
ARCH: amd64
299+
DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED: "0"
298300
before_script:
299301
<?php echo $ecrLoginSnippet, "\n"; ?>
300302
<?php dockerhub_login() ?>

.gitlab/generate-package.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@
901901
script:
902902
- php datadog-setup.php --php-bin all --file $(ls packages/dd-library-php-*-x86_64-linux-gnu.tar.gz)
903903
- sed -i 's/datadog.trace.sources_path/\;datadog.trace.sources_path/' /etc/php/8.1/cli/conf.d/98-ddtrace.ini
904-
- DD_TRACE_GIT_METADATA_ENABLED=0 pecl run-tests --showdiff --ini=" -d datadog.trace.cli_enabled=1" $(find tests/ext -type d)
904+
- 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)
905905

906906
"framework test":
907907
stage: verify
@@ -1154,7 +1154,7 @@
11541154
- pecl install datadog_trace.tgz
11551155
- echo "extension=ddtrace.so" | sudo tee $(php -i | awk -F"=> " '/Scan this dir for additional .ini files/ {print $2}')/ddtrace.ini
11561156
- php --ri=ddtrace
1157-
- 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
1157+
- 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
11581158
after_script:
11591159
- mkdir artifacts
11601160
- find $(pecl config-get test_dir) -type f -name '*.diff' -exec cp --parents '{}' artifacts \;

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUST_DEBUG_BUILD ?= $(shell [ -n "${DD_TRACE_DOCKER_DEBUG}" ] && echo 1)
3333
EXTRA_CONFIGURE_OPTIONS ?=
3434
ASSUME_COMPILED := ${DD_TRACE_ASSUME_COMPILED}
3535
MAX_TEST_PARALLELISM ?= $(shell nproc)
36-
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
36+
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
3737

3838
VERSION := $(shell cat VERSION)
3939

appsec/cmake/run_tests.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ add_custom_target(xtest-prepare
1313
COMMAND mkdir -p /tmp/appsec-ext-test)
1414

1515
add_custom_target(xtest
16-
COMMAND ${CMAKE_COMMAND} -E env "DD_TRACE_GIT_METADATA_ENABLED=0" "LSAN_OPTIONS=fast_unwind_on_malloc=0"
16+
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"
1717
${CMAKE_SOURCE_DIR}/cmake/run-tests-wrapper.sh
1818
"${CMAKE_BINARY_DIR}" "$<TARGET_FILE:mock_helper>" "${DD_APPSEC_TRACER_EXT_FILE}"
1919
"${PhpConfig_PHP_BINARY}" -n -d variables_order=EGPCS

ext/configuration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ enum ddtrace_sidecar_connection_mode {
270270
CONFIG(INT, DD_CODE_ORIGIN_MAX_USER_FRAMES, "8") \
271271
CONFIG(BOOL, DD_TRACE_RESOURCE_RENAMING_ENABLED, "false") \
272272
CONFIG(BOOL, DD_TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT, "false") \
273-
CONFIG(BOOL, DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "false") \
273+
CONFIG(BOOL, DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true") \
274274
DD_INTEGRATIONS
275275

276276
#ifndef _WIN32

metadata/supported-configurations.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,9 @@
370370
],
371371
"DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": [
372372
{
373-
"implementation": "A",
373+
"implementation": "B",
374374
"type": "boolean",
375-
"default": "false"
375+
"default": "true"
376376
}
377377
],
378378
"DD_GIT_COMMIT_SHA": [

tests/ext/telemetry/config.phpt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ DD_AGENT_HOST=
2121
DD_AUTOLOAD_NO_COMPILE=
2222
DD_TRACE_GIT_METADATA_ENABLED=0
2323
DD_TRACE_IGNORE_AGENT_SAMPLING_RATES=1
24+
DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED=0
2425
--INI--
2526
datadog.trace.agent_url="file://{PWD}/config-telemetry.out"
2627
--FILE--
@@ -114,6 +115,15 @@ Array
114115
)
115116

116117
[5] => Array
118+
(
119+
[name] => experimental_propagate_process_tags_enabled
120+
[value] => 0
121+
[origin] => env_var
122+
[config_id] =>
123+
[seq_id] =>
124+
)
125+
126+
[6] => Array
117127
(
118128
[name] => ssi_forced_injection_enabled
119129
[value] => False

0 commit comments

Comments
 (0)