Increase default timeout a bit more, for sidecar only

Author: bwoebi

Makefile

@@ -165,10 +165,10 @@ install_appsec:
 install_all: install install_ini
 
 run_tests: $(TEST_FILES) $(TEST_STUB_FILES) $(BUILD_DIR)/run-tests.php
-	$(ALL_TEST_ENV_OVERRIDE) DD_TRACE_AGENT_TIMEOUT=2000 $(RUN_TESTS_CMD) $(TESTS)
+	$(ALL_TEST_ENV_OVERRIDE) $(RUN_TESTS_CMD) $(TESTS)
 
 test_c: $(SO_FILE) $(TEST_FILES) $(TEST_STUB_FILES) $(BUILD_DIR)/run-tests.php
-	$(if $(ASAN), USE_ZEND_ALLOC=0 USE_TRACKED_ALLOC=1 LSAN_OPTIONS=fast_unwind_on_malloc=0$${LSAN_OPTIONS:+$(,)$${LSAN_OPTIONS}}) $(ALL_TEST_ENV_OVERRIDE) DD_TRACE_AGENT_TIMEOUT=2000 $(RUN_TESTS_CMD) -d extension=$(SO_FILE) $(BUILD_DIR)/$(subst $(BUILD_DIR_NAME)/,,$(TESTS))
+	$(if $(ASAN), USE_ZEND_ALLOC=0 USE_TRACKED_ALLOC=1 LSAN_OPTIONS=fast_unwind_on_malloc=0$${LSAN_OPTIONS:+$(,)$${LSAN_OPTIONS}}) $(ALL_TEST_ENV_OVERRIDE) $(RUN_TESTS_CMD) -d extension=$(SO_FILE) $(BUILD_DIR)/$(subst $(BUILD_DIR_NAME)/,,$(TESTS))
 
 test_c_coverage: dist_clean
 	DD_TRACE_DOCKER_DEBUG=1 EXTRA_CFLAGS="-fprofile-arcs -ftest-coverage" $(MAKE) test_c || exit 0
@@ -207,7 +207,7 @@ test_extension_ci: $(SO_FILE) $(TEST_FILES) $(TEST_STUB_FILES) $(BUILD_DIR)/run-
 	set -xe; \
 	export PATH="$(PROJECT_ROOT)/tests/ext/valgrind:$$PATH"; \
 	export TEST_PHP_JUNIT=$(JUNIT_RESULTS_DIR)/normal-extension-test.xml; \
-	$(ALL_TEST_ENV_OVERRIDE) DD_TRACE_AGENT_TIMEOUT=2000 $(RUN_TESTS_CMD) -d extension=$(SO_FILE) $(BUILD_DIR)/$(TESTS); \
+	$(ALL_TEST_ENV_OVERRIDE) $(RUN_TESTS_CMD) -d extension=$(SO_FILE) $(BUILD_DIR)/$(TESTS); \
 	\
 	export TEST_PHP_JUNIT=$(JUNIT_RESULTS_DIR)/valgrind-extension-test.xml; \
 	export TEST_PHP_OUTPUT=$(JUNIT_RESULTS_DIR)/valgrind-run-tests.out; \

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 1000
+#define DD_TRACE_AGENT_TIMEOUT_VAL 3000
 #define DD_TRACE_AGENT_FLUSH_INTERVAL_VAL 1001
 
 #define DD_CFG_STR(str) #str

metadata/supported-configurations.json

@@ -781,7 +781,7 @@
       {
         "implementation": "B",
         "type": "int",
-        "default": "500"
+        "default": "3000"
       }
     ],
     "DD_TRACE_AGENT_URL": [

tracer/coms.c

@@ -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_SAMPLE_RATE].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);
 }