Fix crash when reconnecting in background sender thread

bwoebi · bwoebi · commit 05dd5ba13ccd · 2026-03-23T15:23:57.000+01:00
Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/ext/process_tags.c b/ext/process_tags.c
@@ -314,7 +314,7 @@ zend_string *ddtrace_process_tags_get_base_hash(void) {
 }
 
 bool ddtrace_process_tags_enabled(void){
-    return get_DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED();
+    return zai_config_is_initialized() ? get_DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED() : get_global_DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED();
 }
 
 void ddtrace_process_tags_first_rinit(void) {
diff --git a/libdatadog b/libdatadog
@@ -1 +1 @@
-Subproject commit c722b209ece89f245da4d5c1f35e01914b27f315
+Subproject commit 561f772f872ed2edc523ffbd6a2f65e7172ab6dd
diff --git a/tests/ext/telemetry/broken_pipe.phpt b/tests/ext/telemetry/broken_pipe.phpt
@@ -29,7 +29,7 @@ dd_trace_serialize_closed_spans();
 
 // force a reconnect, it needs to resubmit telemetry info
 dd_trace_internal_fn("break_sidecar_connection");
-dd_trace_internal_fn("synchronous_flush", 5000); // await connection breaking
+dd_trace_internal_fn("stats_sidecar"); // await connection breaking
 
 dd_trace_internal_fn("finalize_telemetry");
 
@@ -71,7 +71,7 @@ if ($i == 300) {
 
 ?>
 --EXPECTF--
-[ddtrace] [info] [%d] Flushing trace of size 1 to send-queue for %sbroken_pipe-telemetry.out
+[ddtrace] [info] [%d] Flushing trace of size 1 to send-queue for %sbroken_pipe-telemetry.out%A
 [ddtrace] [datadog_sidecar::service::blocking] [%d] The sidecar transport is closed. Reconnecting... This generally indicates a problem with the sidecar, most likely a crash. Check the logs / core dump locations and possibly report a bug.
 string(11) "app-started"
 string(25) "broken_pipe-telemetry-app"

Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,7 @@ zend_string *ddtrace_process_tags_get_base_hash(void) {`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`bool ddtrace_process_tags_enabled(void){`
`317`		`- return get_DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED();`
	`317`	`+ return zai_config_is_initialized() ? get_DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED() : get_global_DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED();`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`void ddtrace_process_tags_first_rinit(void) {`