Propagate agent configured timeout to sidecar (#4025)

* Propagate agent configured timeout to sidecar

And make two RC tests more resilient to race conditions

* Set low timeouts in tests accessing invalid urls

* Increase default timeout a bit

* Increase default timeout a bit more, for sidecar only

* Try more elaborate unix socket proxy

Author: bwoebi

Makefile

@@ -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 }' )
@@ -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

ext/configuration.h

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

ext/sidecar.c

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

metadata/supported-configurations.json

@@ -800,9 +800,9 @@
     ],
     "DD_TRACE_AGENT_TIMEOUT": [
       {
-        "implementation": "B",
+        "implementation": "C",
         "type": "int",
-        "default": "500"
+        "default": "3000"
       }
     ],
     "DD_TRACE_AGENT_URL": [

tests/ext/appsec/sca_flag_is_sent_01.phpt

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

tests/ext/appsec/sca_flag_is_sent_02.phpt

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

tests/ext/appsec/sca_flag_is_sent_03.phpt

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

tests/ext/appsec/sca_flag_is_sent_04.phpt

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

tests/ext/appsec/sca_flag_is_sent_05.phpt

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

tests/ext/background-sender/agent_headers_unix_domain_socket.phpt

@@ -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',