Skip to content

Propagate agent configured timeout to sidecar #4025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bwoebi wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Propagate agent configured timeout to sidecar #4025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92d3d15
Propagate agent configured timeout to sidecar
bwoebi Jun 22, 2026
5e9d824
Set low timeouts in tests accessing invalid urls
bwoebi Jun 30, 2026
c08f840
Increase default timeout a bit
bwoebi Jun 30, 2026
408f68e
Increase default timeout a bit more, for sidecar only
bwoebi Jul 3, 2026
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
6 changes: 4 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ TRACER_SOURCES_INI := -d datadog.trace.sources_path=$(TRACER_SOURCE_DIR)
RUN_TESTS_IS_PARALLEL ?= $(shell test $(PHP_MAJOR_MINOR) -ge 74 && echo 1)

# shuffle parallel tests to evenly distribute test load, avoiding a batch of 32 tests being request-replayer tests
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))
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))

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 }' )
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 }' )
Expand Down Expand Up @@ -211,7 +211,7 @@ test_extension_ci: $(SO_FILE) $(TEST_FILES) $(TEST_STUB_FILES) $(BUILD_DIR)/run-
\
export TEST_PHP_JUNIT=$(JUNIT_RESULTS_DIR)/valgrind-extension-test.xml; \
export TEST_PHP_OUTPUT=$(JUNIT_RESULTS_DIR)/valgrind-run-tests.out; \
DD_SPAWN_WORKER_STABLE_TRAMPOLINE=1 $(ALL_TEST_ENV_OVERRIDE) $(RUN_TESTS_CMD) -d extension=$(SO_FILE) -m -s $$TEST_PHP_OUTPUT $(BUILD_DIR)/$(TESTS) && ! grep -e '^LEAKED TEST SUMMARY' $$TEST_PHP_OUTPUT; \
DD_SPAWN_WORKER_STABLE_TRAMPOLINE=1 $(ALL_TEST_ENV_OVERRIDE) DD_TRACE_AGENT_TIMEOUT=5000 $(RUN_TESTS_CMD) -d extension=$(SO_FILE) -m -s $$TEST_PHP_OUTPUT $(BUILD_DIR)/$(TESTS) && ! grep -e '^LEAKED TEST SUMMARY' $$TEST_PHP_OUTPUT; \
)

build_tea: TEA_BUILD_TESTS=ON
Expand Down
2 changes: 1 addition & 1 deletion ext/configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ enum datadog_sidecar_connection_mode {
* A user hit an issue with the userland time of 100.
*/
#define DD_TRACE_AGENT_CONNECT_TIMEOUT_VAL 100
#define DD_TRACE_AGENT_TIMEOUT_VAL 500
#define DD_TRACE_AGENT_TIMEOUT_VAL 3000
#define DD_TRACE_AGENT_FLUSH_INTERVAL_VAL 1001

#define DD_CFG_STR(str) #str
Expand Down
1 change: 1 addition & 0 deletions ext/sidecar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,7 @@ ddog_Endpoint *datadog_sidecar_agent_endpoint(void) {

if (agent_endpoint) {
dd_set_endpoint_test_token(agent_endpoint);
ddog_endpoint_set_timeout(agent_endpoint, get_global_DD_TRACE_AGENT_TIMEOUT());
}

return agent_endpoint;
Expand Down
2 changes: 1 addition & 1 deletion metadata/supported-configurations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@
{
"implementation": "B",
"type": "int",
"default": "500"
"default": "3000"
}
],
"DD_TRACE_AGENT_URL": [
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/appsec/sca_flag_is_sent_01.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
--ENV--
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/sca_flag_is_sent_01-telemetry.out"
--FILE_EXTERNAL--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/appsec/sca_flag_is_sent_02.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_APPSEC_SCA_ENABLED=true
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/sca_flag_is_sent_02-telemetry.out"
--FILE_EXTERNAL--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/appsec/sca_flag_is_sent_03.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_APPSEC_SCA_ENABLED=false
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/sca_flag_is_sent_03-telemetry.out"
--FILE_EXTERNAL--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/appsec/sca_flag_is_sent_04.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
--ENV--
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/sca_flag_is_sent_04-telemetry.out"
datadog.appsec.sca_enabled=1
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/appsec/sca_flag_is_sent_05.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
--ENV--
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/sca_flag_is_sent_05-telemetry.out"
datadog.appsec.sca_enabled=0
Expand Down
3 changes: 3 additions & 0 deletions tests/ext/background-sender/agent_headers_unix_domain_socket.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ $proxy = RequestReplayer::launchUnixProxy(str_replace("unix://", "", getenv("DD_
\DDTrace\start_span();
\DDTrace\close_span();

// ensure the response also is received by the sender first, to avoid retries holding up other tests
dd_trace_internal_fn("synchronous_flush");

echo PHP_EOL;
$headers = $rr->replayHeaders([
'content-type',
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/background-sender/background_sender_ipv6_support.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ include_once __DIR__ . '/../startup_logging.inc';
$logs = dd_get_startup_logs([], [
'DD_AGENT_HOST' => '::1',
'DD_TRACE_DEBUG' => 1,
'DD_TRACE_AGENT_TIMEOUT' => 200,
'DD_TRACE_RETRY_INTERVAL' => 1,
]);

dd_dump_startup_logs($logs, [
Expand Down
5 changes: 3 additions & 2 deletions tests/ext/background-sender/cli_shutdown_no_hang_unreachable_agent.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ DD_AGENT_HOST=192.0.2.1
DD_TRACE_AGENT_PORT=18126
DD_TRACE_SIDECAR_TRACE_SENDER=0
DD_TRACE_SHUTDOWN_TIMEOUT=2000
DD_TRACE_AGENT_TIMEOUT=500
DD_TRACE_AGENT_CONNECT_TIMEOUT=500
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_AGENT_CONNECT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
DD_TRACE_AGENT_RETRIES=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=0
DD_REMOTE_CONFIG_ENABLED=0
Expand Down
3 changes: 3 additions & 0 deletions tests/ext/background-sender/default_unix_domain_socket_agent.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ If an agent unix domain socket exists it will try to connect to it
<?php include __DIR__ . '/../includes/skipif_no_dev_env.inc'; ?>
<?php @mkdir("/var/run/datadog"); if (!is_dir("/var/run/datadog")) { shell_exec("sudo mkdir /var/run/datadog <&-; sudo chown $(id -u) /var/run/datadog"); } if (!is_file("/var/run/datadog/apm.socket") && !is_writable("/var/run/datadog")) die("skip: no permissions to create a /var/run/datadog/apm.socket"); ?>
--ENV--
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=0
DD_REMOTE_CONFIG_ENABLED=0
DD_AGENT_HOST=
--FILE--
<?php
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/background-sender/sidecar_handles_invalid_agent_url.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ The sidecar properly handles invalid agent urls
DD_TRACE_AGENT_URL=/invalid
DD_TRACE_SIDECAR_TRACE_SENDER=1
DD_CRASHTRACKING_ENABLED=0
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--FILE--
<?php

Expand Down
2 changes: 2 additions & 0 deletions tests/ext/library_config/fleet_config.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ copy(__DIR__.'/fleet_config.yaml', '/tmp/test_c_fleet_config.yaml');
_DD_TEST_LIBRARY_CONFIG_FLEET_FILE=/tmp/test_c_fleet_config.yaml
_DD_TEST_LIBRARY_CONFIG_LOCAL_FILE=/foo
DD_TRACE_SPANS_LIMIT=42
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/fleet-config-telemetry.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/library_config/local_config.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ copy(__DIR__.'/local_config.yaml', '/tmp/test_c_local_config.yaml');
_DD_TEST_LIBRARY_CONFIG_FLEET_FILE=/foo
_DD_TEST_LIBRARY_CONFIG_LOCAL_FILE=/tmp/test_c_local_config.yaml
DD_TRACE_SPANS_LIMIT=42
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/local-config-telemetry.out"
--FILE--
Expand Down
3 changes: 3 additions & 0 deletions tests/ext/remote_config/dynamic_config_multiconfig.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ $specific_path = put_dynamic_config_file([
]);

dd_trace_internal_fn("await_remote_config");
if (ini_get("datadog.trace.sample_rate") == "0.3") { // possible race condition, just re-poll
dd_trace_internal_fn("await_remote_config");
}

// Specific config wins for sample_rate; org-level provides log_injection.
print "After both configs:\n";
Expand Down
6 changes: 5 additions & 1 deletion tests/ext/remote_config/rc_fork_notify.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ DD_TRACE_AGENT_TEST_SESSION_TOKEN=remote-config/rc_fork_notify
--FILE--
<?php

if (!pcntl_fork()) {
if ($child = !pcntl_fork()) {
require __DIR__ . "/remote_config.inc";
put_dynamic_config_file(["tracing_enabled" => true]);
}
Expand All @@ -24,6 +24,10 @@ if (!ini_get("datadog.trace.enabled")) {
dd_trace_internal_fn("await_remote_config");
}

if (!$child) {
pcntl_wait($status);
}

print ini_get("datadog.trace.enabled");

?>
Expand Down
6 changes: 1 addition & 5 deletions tests/ext/request-replayer/dd_trace_agent_env.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ $rr = new RequestReplayer();
$span = \DDTrace\start_span();

// make sure sidecar keeps up with us
$start = microtime(true);
\DDTrace\start_trace_span();
\DDTrace\close_span();
$rr->waitForDataAndReplay();
usleep(floor(microtime(true) - $start) * 100000);
dd_trace_internal_fn('await_agent_info');

\DDTrace\close_span();
var_dump($span->env);
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/startup_logging_diagnostics.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ $args = [
];
$env = [
'DD_TRACE_DEBUG' => '1',
'DD_TRACE_AGENT_TIMEOUT' => 200,
'DD_TRACE_RETRY_INTERVAL' => 1,
'DD_AGENT_HOST' => 'invalid_host',
'DD_SERVICE' => 'foo_service',
'DD_TAGS' => 'foo:tag',
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/broken_pipe.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_LOG_LEVEL=info,startup=off
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/broken_pipe-telemetry.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/composer.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
--ENV--
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/composer-telemetry.out"
--FILE--
Expand Down
5 changes: 3 additions & 2 deletions tests/ext/telemetry/config.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ DD_TRACE_AUTOFINISH_SPANS=1
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_AGENT_HOST=
DD_AUTOLOAD_NO_COMPILE=
DD_TRACE_RETRY_INTERVAL=
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
DD_TRACE_GIT_METADATA_ENABLED=0
DD_TRACE_IGNORE_AGENT_SAMPLING_RATES=1
DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED=0
Expand Down Expand Up @@ -49,7 +50,7 @@ for ($i = 0; $i < 300; ++$i) {
if ($json["request_type"] == "app-client-configuration-change") {
$cfg = $json["payload"]["configuration"];
print_r(array_values(array_filter($cfg, function ($c) {
return $c["origin"] == "env_var" && $c["name"] != "DD_TRACE_SOURCES_PATH" && $c["name"] != "DD_TRACE_SIDECAR_TRACE_SENDER";
return $c["origin"] == "env_var" && $c["name"] != "DD_TRACE_SOURCES_PATH" && $c["name"] != "DD_TRACE_SIDECAR_TRACE_SENDER" && $c["name"] != "DD_TRACE_AGENT_TIMEOUT" && $c["name"] != "DD_TRACE_RETRY_INTERVAL";
})));
var_dump(count(array_filter($cfg, function ($c) {
return $c["origin"] == "default";
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/disabled.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ if (PHP_OS === "WINNT" && PHP_VERSION_ID < 70400) die("skip: Windows on PHP 7.2
--ENV--
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=0
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/disabled-telemetry.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/integration.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
DD_TRACE_GENERATE_ROOT_SPAN=0
_DD_LOAD_TEST_INTEGRATIONS=1
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/integration-telemetry.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/integration_filesystem_01.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ DD_TRACE_GENERATE_ROOT_SPAN=0
_DD_LOAD_TEST_INTEGRATIONS=1
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_APPSEC_RASP_ENABLED=0
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/integration-telemetry-01.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/integration_filesystem_02.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ DD_TRACE_GENERATE_ROOT_SPAN=0
_DD_LOAD_TEST_INTEGRATIONS=1
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_LOGS_INJECTION=false
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/integration-telemetry-02.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/integration_filesystem_03.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
DD_TRACE_GENERATE_ROOT_SPAN=0
_DD_LOAD_TEST_INTEGRATIONS=1
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/integration-telemetry-03.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/integration_filesystem_04.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ DD_TRACE_GENERATE_ROOT_SPAN=0
_DD_LOAD_TEST_INTEGRATIONS=1
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_FILESYSTEM_ENABLED=0
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/integration-telemetry-04.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/integration_runtime_error.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TELEMETRY_LOG_COLLECTION_ENABLED=1
DD_TRACE_LOG_LEVEL=warn
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/integration-runtime-error-telemetry.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/metrics_logs_created.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_LOG_LEVEL=warn
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/metrics-logs-created-telemetry.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/metrics_spans_created.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
DD_TRACE_GENERATE_ROOT_SPAN=0
_DD_LOAD_TEST_INTEGRATIONS=1
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/metrics-spans_created-telemetry.out"
zend.assertions=1
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/simple.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ require __DIR__ . '/../includes/clear_skipif_telemetry.inc'
--ENV--
DD_TRACE_GENERATE_ROOT_SPAN=0
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/simple-telemetry.out"
--FILE--
Expand Down
2 changes: 2 additions & 0 deletions tests/ext/telemetry/telemetry_process_tags.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ DD_TRACE_GENERATE_ROOT_SPAN=0
_DD_LOAD_TEST_INTEGRATIONS=1
DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED=1
DD_TRACE_AGENT_TIMEOUT=200
DD_TRACE_RETRY_INTERVAL=1
--INI--
datadog.trace.agent_url="file://{PWD}/process-tags-telemetry.out"
--FILE--
Expand Down
4 changes: 3 additions & 1 deletion tracer/coms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,8 +806,10 @@ void ddtrace_coms_curl_shutdown(void) {

static long dd_max_long(long a, long b) { return a >= b ? a : b; }

// Shorter time for in-process timeout
void ddtrace_curl_set_timeout(CURL *curl) {
long timeout = dd_max_long(get_global_DD_TRACE_BGS_TIMEOUT(), get_global_DD_TRACE_AGENT_TIMEOUT());
long agent_timeout = zai_config_memoized_entries[DATADOG_CONFIG_DD_TRACE_AGENT_TIMEOUT].name_index == ZAI_CONFIG_ORIGIN_DEFAULT ? 500 : get_global_DD_TRACE_AGENT_TIMEOUT();
long timeout = dd_max_long(get_global_DD_TRACE_BGS_TIMEOUT(), agent_timeout);
curl_easy_setopt(curl, CURLOPT_TIMEOUT_MS, timeout);
}

Expand Down
Loading