Skip to content

feat(sidecar): wire telemetry_extended_heartbeat_interval through SessionConfig #1882

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

Open
khanayan123 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat(sidecar): wire telemetry_extended_heartbeat_interval through SessionConfig #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb6f49b
feat(sidecar): wire telemetry_extended_heartbeat_interval through Ses…
khanayan123 Apr 15, 2026
755b54b
fix(telemetry): use AppExtendedHeartbeat payload for extended heartbeat
khanayan123 Apr 15, 2026
d414b20
fix: update FFI test call sites for new extended heartbeat param
khanayan123 Apr 15, 2026
a03953e
style: fix rustfmt line wrapping
khanayan123 Apr 15, 2026
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
4 changes: 4 additions & 0 deletions datadog-sidecar-ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,7 @@ pub unsafe extern "C" fn ddog_sidecar_session_set_config(
flush_interval_milliseconds: u32,
remote_config_poll_interval_millis: u32,
telemetry_heartbeat_interval_millis: u32,
telemetry_extended_heartbeat_interval_millis: u64,
force_flush_size: usize,
force_drop_size: usize,
log_level: ffi::CharSlice,
Expand Down Expand Up @@ -643,6 +644,9 @@ pub unsafe extern "C" fn ddog_sidecar_session_set_config(
telemetry_heartbeat_interval: Duration::from_millis(
telemetry_heartbeat_interval_millis as u64,
),
telemetry_extended_heartbeat_interval: Duration::from_millis(
telemetry_extended_heartbeat_interval_millis,
),
force_flush_size,
force_drop_size,
log_level: log_level.to_utf8_lossy().into(),
Expand Down
2 changes: 2 additions & 0 deletions datadog-sidecar-ffi/tests/sidecar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ fn test_ddog_sidecar_register_app() {
1000,
1000000,
1,
86400000,
10000000,
10000000,
"".into(),
Expand Down Expand Up @@ -151,6 +152,7 @@ fn test_ddog_sidecar_register_app() {
1000,
1000000,
1,
86400000,
10000000,
10000000,
"".into(),
Expand Down
1 change: 1 addition & 0 deletions datadog-sidecar/src/service/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ pub struct SessionConfig {
pub flush_interval: Duration,
pub remote_config_poll_interval: Duration,
pub telemetry_heartbeat_interval: Duration,
pub telemetry_extended_heartbeat_interval: Duration,
pub force_flush_size: usize,
pub force_drop_size: usize,
pub log_level: String,
Expand Down
4 changes: 4 additions & 0 deletions datadog-sidecar/src/service/sidecar_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,12 +640,16 @@ impl SidecarInterface for ConnectionSidecarHandler {
*session.process_tags.lock_or_panic() = config.process_tags.clone();
session.modify_telemetry_config(|cfg| {
cfg.telemetry_heartbeat_interval = config.telemetry_heartbeat_interval;
cfg.telemetry_extended_heartbeat_interval =
config.telemetry_extended_heartbeat_interval;
let endpoint = get_product_endpoint(
libdd_telemetry::config::PROD_INTAKE_SUBDOMAIN,
&config.endpoint,
);
cfg.set_endpoint(endpoint).ok();
cfg.telemetry_heartbeat_interval = config.telemetry_heartbeat_interval;
cfg.telemetry_extended_heartbeat_interval =
config.telemetry_extended_heartbeat_interval;
});
session.modify_trace_config(|cfg| {
let endpoint = get_product_endpoint(
Expand Down
6 changes: 3 additions & 3 deletions libdd-telemetry/src/worker/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,9 +483,9 @@ impl TelemetryWorker {
self.data.integrations.unflush_stored();
self.data.configurations.unflush_stored();

let app_started = data::Payload::AppStarted(self.build_app_started());
match self.send_payload(&app_started).await {
Ok(()) => self.payload_sent_success(&app_started),
let extended_hb = data::Payload::AppExtendedHeartbeat(self.build_app_started());
match self.send_payload(&extended_hb).await {
Ok(()) => self.payload_sent_success(&extended_hb),
Err(err) => self.log_err(&err),
}
#[allow(clippy::unwrap_used)]
Expand Down
Loading