Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitlab/generate-appsec.php
Original file line number Diff line number Diff line change
Expand Up @@ -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:
<?php echo $ecrLoginSnippet, "\n"; ?>
<?php dockerhub_login() ?>
Expand Down Expand Up @@ -295,6 +296,7 @@
KUBERNETES_MEMORY_REQUEST: 24Gi
KUBERNETES_MEMORY_LIMIT: 30Gi
ARCH: amd64
DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED: "0"
before_script:
<?php echo $ecrLoginSnippet, "\n"; ?>
<?php dockerhub_login() ?>
Expand Down
4 changes: 2 additions & 2 deletions .gitlab/generate-package.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \;
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion appsec/cmake/run_tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}" "$<TARGET_FILE:mock_helper>" "${DD_APPSEC_TRACER_EXT_FILE}"
"${PhpConfig_PHP_BINARY}" -n -d variables_order=EGPCS
Expand Down
2 changes: 1 addition & 1 deletion ext/configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions metadata/supported-configurations.json
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,9 @@
],
"DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": [
{
"implementation": "A",
"implementation": "B",
"type": "boolean",
"default": "false"
"default": "true"
}
],
"DD_GIT_COMMIT_SHA": [
Expand Down
10 changes: 10 additions & 0 deletions tests/ext/telemetry/config.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -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--
Expand Down Expand Up @@ -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
Expand Down
Loading