Propagate agent configured timeout to sidecar

And make two RC tests more resilient to race conditions

Author: bwoebi

Cargo.lock

@@ -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= DD_TRACE_RETRY_INTERVAL=1 DD_TRACE_AGENT_TIMEOUT=5000 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 }' )

Makefile

@@ -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;

ext/sidecar.c

@@ -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";

tests/ext/remote_config/dynamic_config_multiconfig.phpt

@@ -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]);
 }
@@ -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");
 
 ?>

tests/ext/remote_config/rc_fork_notify.phpt

@@ -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);

tests/ext/request-replayer/dd_trace_agent_env.phpt

@@ -19,6 +19,7 @@ DD_TRACE_AUTOFINISH_SPANS=1
 DD_INSTRUMENTATION_TELEMETRY_ENABLED=1
 DD_AGENT_HOST=
 DD_AUTOLOAD_NO_COMPILE=
+DD_TRACE_AGENT_TIMEOUT=
 DD_TRACE_RETRY_INTERVAL=
 DD_TRACE_GIT_METADATA_ENABLED=0
 DD_TRACE_IGNORE_AGENT_SAMPLING_RATES=1