Skip to content

Flush telemetry as well on anticipated sidecar shutdown #3806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bwoebi merged 1 commit into from
Apr 22, 2026
Merged

Flush telemetry as well on anticipated sidecar shutdown #3806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions components-rs/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion components-rs/sidecar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions ext/ddtrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion ext/signals.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion libdatadog
Open in desktop
Submodule libdatadog updated 23 files
+15 −14 Cargo.lock
+1 −1 Cargo.toml
+1 −0 LICENSE-3rdparty.csv
+1 −10 datadog-ipc/benches/ipc.rs
+6 −3 datadog-sidecar-ffi/src/lib.rs
+4 −4 datadog-sidecar/src/service/blocking.rs
+1 −1 datadog-sidecar/src/service/mod.rs
+4 −3 datadog-sidecar/src/service/sender.rs
+9 −2 datadog-sidecar/src/service/sidecar_interface.rs
+39 −6 datadog-sidecar/src/service/sidecar_server.rs
+3 −0 libdd-common/Cargo.toml
+333 −0 libdd-common/src/bench_utils.rs
+2 −0 libdd-common/src/lib.rs
+6 −15 libdd-crashtracker/src/crash_info/errors_intake.rs
+8 −0 libdd-data-pipeline/Cargo.toml
+99 −0 libdd-data-pipeline/benches/trace_buffer.rs
+2 −0 libdd-data-pipeline/src/lib.rs
+934 −0 libdd-data-pipeline/src/trace_buffer/mod.rs
+2 −2 libdd-data-pipeline/src/trace_exporter/mod.rs
+1 −0 libdd-trace-utils/Cargo.toml
+30 −0 libdd-trace-utils/benches/deserialization.rs
+8 −1 libdd-trace-utils/benches/main.rs
+1 −0 tools/docker/Dockerfile.build
Loading