Flush telemetry as well on anticipated sidecar shutdown

bwoebi · bwoebi · commit 59a58ef74d60 · 2026-04-21T20:38:59.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components-rs/common.h b/components-rs/common.h
@@ -1174,6 +1174,11 @@ typedef struct ddog_NativeFile {
   struct ddog_PlatformHandle_File *handle;
 } ddog_NativeFile;
 
+typedef struct ddog_SidecarFlushOptions {
+  bool traces_and_stats;
+  bool telemetry;
+} ddog_SidecarFlushOptions;
+
 typedef struct ddog_TracerHeaderTags {
   ddog_CharSlice lang;
   ddog_CharSlice lang_version;
diff --git a/components-rs/sidecar.h b/components-rs/sidecar.h
@@ -104,7 +104,8 @@ ddog_MaybeError ddog_sidecar_clear_inherited_listener(void);
 
 ddog_MaybeError ddog_sidecar_ping(struct ddog_SidecarTransport **transport);
 
-ddog_MaybeError ddog_sidecar_flush_traces(struct ddog_SidecarTransport **transport);
+ddog_MaybeError ddog_sidecar_flush(struct ddog_SidecarTransport **transport,
+                                   struct ddog_SidecarFlushOptions options);
 
 struct ddog_InstanceId *ddog_sidecar_instanceId_build(ddog_CharSlice session_id,
                                                       ddog_CharSlice runtime_id);
diff --git a/ext/ddtrace.c b/ext/ddtrace.c
@@ -1598,7 +1598,7 @@ static PHP_MSHUTDOWN_FUNCTION(ddtrace) {
     } else /* ! part of the if outside the ifdef */
 #endif
     if (get_global_DD_TRACE_FORCE_FLUSH_ON_SHUTDOWN() && DDTRACE_G(sidecar)) {
-        ddog_sidecar_flush_traces(&DDTRACE_G(sidecar));
+        ddog_sidecar_flush(&DDTRACE_G(sidecar), (ddog_SidecarFlushOptions){.traces_and_stats = true, .telemetry = true});
     }
 
     ddtrace_log_mshutdown();
@@ -3083,7 +3083,7 @@ PHP_FUNCTION(dd_trace_internal_fn) {
             } else
 #endif
             if (DDTRACE_G(sidecar)) {
-                ddtrace_ffi_try("Failed synchronously flushing traces", ddog_sidecar_flush_traces(&DDTRACE_G(sidecar)));
+                ddtrace_ffi_try("Failed synchronously flushing traces", ddog_sidecar_flush(&DDTRACE_G(sidecar), (ddog_SidecarFlushOptions){.traces_and_stats = true}));
             }
             RETVAL_TRUE;
 #ifndef _WIN32
@@ -3218,7 +3218,7 @@ PHP_FUNCTION(dd_trace_synchronous_flush) {
     } else
 #endif
     if (DDTRACE_G(sidecar)) {
-        ddtrace_ffi_try("Failed synchronously flushing traces", ddog_sidecar_flush_traces(&DDTRACE_G(sidecar)));
+        ddtrace_ffi_try("Failed synchronously flushing traces", ddog_sidecar_flush(&DDTRACE_G(sidecar), (ddog_SidecarFlushOptions){.traces_and_stats = true}));
     }
     RETURN_NULL();
 }
diff --git a/ext/signals.c b/ext/signals.c
@@ -363,7 +363,7 @@ static int dd_call_prev_handler(bool flush) {
     }
 
     if (flush) {
-        ddog_sidecar_flush_traces(&ddtrace_sidecar_for_signal);
+        ddog_sidecar_flush(&ddtrace_sidecar_for_signal, (ddog_SidecarFlushOptions){.traces_and_stats = true});
     }
 
     if (prev_handler == SIG_DFL) {
diff --git a/libdatadog b/libdatadog
@@ -1 +1 @@
-Subproject commit c03245d4e11b55533955bb4043572f9613dced60
+Subproject commit d29b8d22f33ee0bd2ca9baf40f1afee801550c73

Original file line number	Diff line number	Diff line change
`@@ -1598,7 +1598,7 @@ static PHP_MSHUTDOWN_FUNCTION(ddtrace) {`
`1598`	`1598`	`} else /* ! part of the if outside the ifdef */`
`1599`	`1599`	`#endif`
`1600`	`1600`	`if (get_global_DD_TRACE_FORCE_FLUSH_ON_SHUTDOWN() && DDTRACE_G(sidecar)) {`
`1601`		`- ddog_sidecar_flush_traces(&DDTRACE_G(sidecar));`
	`1601`	`+ ddog_sidecar_flush(&DDTRACE_G(sidecar), (ddog_SidecarFlushOptions){.traces_and_stats = true, .telemetry = true});`
`1602`	`1602`	`}`
`1603`	`1603`
`1604`	`1604`	`ddtrace_log_mshutdown();`
`@@ -3083,7 +3083,7 @@ PHP_FUNCTION(dd_trace_internal_fn) {`
`3083`	`3083`	`} else`
`3084`	`3084`	`#endif`
`3085`	`3085`	`if (DDTRACE_G(sidecar)) {`
`3086`		`- ddtrace_ffi_try("Failed synchronously flushing traces", ddog_sidecar_flush_traces(&DDTRACE_G(sidecar)));`
	`3086`	`+ ddtrace_ffi_try("Failed synchronously flushing traces", ddog_sidecar_flush(&DDTRACE_G(sidecar), (ddog_SidecarFlushOptions){.traces_and_stats = true}));`
`3087`	`3087`	`}`
`3088`	`3088`	`RETVAL_TRUE;`
`3089`	`3089`	`#ifndef _WIN32`
`@@ -3218,7 +3218,7 @@ PHP_FUNCTION(dd_trace_synchronous_flush) {`
`3218`	`3218`	`} else`
`3219`	`3219`	`#endif`
`3220`	`3220`	`if (DDTRACE_G(sidecar)) {`
`3221`		`- ddtrace_ffi_try("Failed synchronously flushing traces", ddog_sidecar_flush_traces(&DDTRACE_G(sidecar)));`
	`3221`	`+ ddtrace_ffi_try("Failed synchronously flushing traces", ddog_sidecar_flush(&DDTRACE_G(sidecar), (ddog_SidecarFlushOptions){.traces_and_stats = true}));`
`3222`	`3222`	`}`
`3223`	`3223`	`RETURN_NULL();`
`3224`	`3224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ static int dd_call_prev_handler(bool flush) {`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`if (flush) {`
`366`		`- ddog_sidecar_flush_traces(&ddtrace_sidecar_for_signal);`
	`366`	`+ ddog_sidecar_flush(&ddtrace_sidecar_for_signal, (ddog_SidecarFlushOptions){.traces_and_stats = true});`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`if (prev_handler == SIG_DFL) {`