Skip to content

Commit 09494de

Browse files
LeiyksLeiyks
committed
feat: add DD_TRACE_RETRY_INTERVAL configuration
Adds the DD_TRACE_RETRY_INTERVAL setting (default 100ms) and forwards it to the sidecar session config as retry_interval_milliseconds. The extension test suite runs with DD_TRACE_RETRY_INTERVAL=1 to keep retries fast.
1 parent 6d0209b commit 09494de

6 files changed

Lines changed: 16 additions & 1 deletion

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ TRACER_SOURCES_INI := -d datadog.trace.sources_path=$(TRACER_SOURCE_DIR)
4444
RUN_TESTS_IS_PARALLEL ?= $(shell test $(PHP_MAJOR_MINOR) -ge 74 && echo 1)
4545

4646
# shuffle parallel tests to evenly distribute test load, avoiding a batch of 32 tests being request-replayer tests
47-
RUN_TESTS_CMD := DD_SERVICE= DD_ENV= REPORT_EXIT_STATUS=1 TEST_PHP_SRCDIR=$(PROJECT_ROOT) USE_TRACKED_ALLOC=1 php -n -d 'memory_limit=-1' $(BUILD_DIR)/run-tests.php $(if $(QUIET_TESTS),,-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP) $(if $(ASAN), --asan) --show-diff -n -p $(shell which php) -q $(if $(RUN_TESTS_IS_PARALLEL), --shuffle -j$(MAX_TEST_PARALLELISM))
47+
RUN_TESTS_CMD := DD_SERVICE= DD_ENV= DD_TRACE_RETRY_INTERVAL=1 REPORT_EXIT_STATUS=1 TEST_PHP_SRCDIR=$(PROJECT_ROOT) USE_TRACKED_ALLOC=1 php -n -d 'memory_limit=-1' $(BUILD_DIR)/run-tests.php $(if $(QUIET_TESTS),,-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP) $(if $(ASAN), --asan) --show-diff -n -p $(shell which php) -q $(if $(RUN_TESTS_IS_PARALLEL), --shuffle -j$(MAX_TEST_PARALLELISM))
4848

4949
C_FILES = $(shell find components components-rs ext src/dogstatsd tracer zend_abstract_interface -name '*.c' -o -name '*.h' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )
5050
TEST_FILES = $(shell find tests/ext -name '*.php*' -o -name '*.inc' -o -name '*.json' -o -name '*.yaml' -o -name 'CONFLICTS' | awk '{ printf "$(BUILD_DIR)/%s\n", $$1 }' )

‎ext/configuration.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ enum datadog_sidecar_connection_mode {
107107
CONFIG(BOOL, DD_INJECT_FORCE, "false", .ini_change = zai_config_system_ini_change) \
108108
CONFIG(DOUBLE, DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS, "5.0", .ini_change = zai_config_system_ini_change) \
109109
CONFIG(BOOL, DD_REMOTE_CONFIG_ENABLED, "true", .ini_change = zai_config_system_ini_change) \
110+
CONFIG(INT, DD_TRACE_RETRY_INTERVAL, "100", .ini_change = zai_config_system_ini_change) \
110111
CONFIG(BOOL, DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED, "true")
111112

112113
#define DD_CONFIGURATIONS_ONLY

‎ext/sidecar.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ static void dd_sidecar_post_connect(ddog_SidecarTransport **transport, bool is_f
110110
php_version_rt,
111111
DDOG_CHARSLICE_C(PHP_DDTRACE_VERSION),
112112
get_global_DD_TRACE_AGENT_FLUSH_INTERVAL(),
113+
get_global_DD_TRACE_RETRY_INTERVAL(),
113114
(int)(get_global_DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS() * 1000),
114115
// for historical reasons in seconds
115116
get_global_DD_TELEMETRY_HEARTBEAT_INTERVAL() * 1000,

‎metadata/supported-configurations.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2168,6 +2168,13 @@
21682168
"default": "false"
21692169
}
21702170
],
2171+
"DD_TRACE_RETRY_INTERVAL": [
2172+
{
2173+
"implementation": "B",
2174+
"type": "int",
2175+
"default": "100"
2176+
}
2177+
],
21712178
"DD_TRACE_ROADRUNNER_ANALYTICS_ENABLED": [
21722179
{
21732180
"implementation": "A",

‎tests/Integrations/Guzzle/V6/composer.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"require": {
33
"guzzlehttp/guzzle": "~6.0"
4+
},
5+
"config": {
6+
"audit": {
7+
"block-insecure": false
8+
}
49
}
510
}

‎tests/ext/telemetry/config.phpt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ DD_TRACE_AUTOFINISH_SPANS=1
1919
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
2020
DD_AGENT_HOST=
2121
DD_AUTOLOAD_NO_COMPILE=
22+
DD_TRACE_RETRY_INTERVAL=
2223
DD_TRACE_GIT_METADATA_ENABLED=0
2324
DD_TRACE_IGNORE_AGENT_SAMPLING_RATES=1
2425
DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED=0

0 commit comments

Comments
 (0)