Merge branch 'main' into vianney/fix-telemetry-stop

VianneyRuhlmann · web-flow · commit 9ee83f2216d9 · 2026-04-20T12:17:34.000+02:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -86,6 +86,6 @@ bin_tests/tests/test_the_tests.rs    @DataDog/libdatadog-core
 bin_tests/src/bin/test_the_tests.rs  @DataDog/libdatadog-core
 tools/cc_utils/                      @DataDog/libdatadog-php
 tools/sidecar_mockgen/               @DataDog/libdatadog-php
-libdd-data-pipeline/src/otlp/                           @DataDog/apm-sdk-capabilities
-libdd-data-pipeline/tests/test_trace_exporter_otlp_export.rs @DataDog/apm-sdk-capabilities
-libdd-trace-utils/src/otlp_encoder/                     @DataDog/apm-sdk-capabilities
+libdd-data-pipeline/src/otlp/                           @DataDog/apm-sdk-capabilities-rust
+libdd-data-pipeline/tests/test_trace_exporter_otlp_export.rs @DataDog/apm-sdk-capabilities-rust
+libdd-trace-utils/src/otlp_encoder/                     @DataDog/apm-sdk-capabilities-rust
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/datadog-sidecar-ffi/src/lib.rs b/datadog-sidecar-ffi/src/lib.rs
@@ -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,
@@ -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(),
diff --git a/datadog-sidecar-ffi/tests/sidecar.rs b/datadog-sidecar-ffi/tests/sidecar.rs
@@ -98,6 +98,7 @@ fn test_ddog_sidecar_register_app() {
             1000,
             1000000,
             1,
+            86400000,
             10000000,
             10000000,
             "".into(),
@@ -151,6 +152,7 @@ fn test_ddog_sidecar_register_app() {
             1000,
             1000000,
             1,
+            86400000,
             10000000,
             10000000,
             "".into(),
diff --git a/datadog-sidecar/src/service/mod.rs b/datadog-sidecar/src/service/mod.rs
@@ -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,
diff --git a/datadog-sidecar/src/service/sidecar_server.rs b/datadog-sidecar/src/service/sidecar_server.rs
@@ -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(
diff --git a/examples/ffi/exporter.cpp b/examples/ffi/exporter.cpp
@@ -146,6 +146,18 @@ int main(int argc, char *argv[]) {
   auto cancel = ddog_CancellationToken_new();
   auto cancel_for_background_thread = ddog_CancellationToken_clone(&cancel);
 
+  // Eagerly initialize the tokio runtime. This is optional, but required
+  // to avoid race conditions if another thread might be using the
+  // the cancellation token at the same time as the profile is being sent
+  // (as is the case here).
+  ddog_VoidResult init_result = ddog_prof_Exporter_init_runtime(exporter);
+  if (init_result.tag != DDOG_VOID_RESULT_OK) {
+    print_error("Failed to initialize exporter runtime: ", init_result.err);
+    ddog_Error_drop(&init_result.err);
+    ddog_prof_Exporter_drop(exporter);
+    return 1;
+  }
+
   // As an example of CancellationToken usage, here we create a background
   // thread that sleeps for some time and then cancels a request early (e.g.
   // before the timeout in ddog_prof_Exporter_send_blocking is hit).
diff --git a/libdd-common-ffi/src/vec.rs b/libdd-common-ffi/src/vec.rs
@@ -181,7 +181,7 @@ mod tests {
         let vec = vec![0, 2, 4, 6];
         let ffi_vec: Vec<u8> = Vec::from(vec.clone());
 
-        for (a, b) in vec.iter().zip(ffi_vec.into_iter()) {
+        for (a, b) in vec.iter().zip(&ffi_vec) {
             assert_eq!(a, b)
         }
     }
diff --git a/libdd-profiling-ffi/src/exporter.rs b/libdd-profiling-ffi/src/exporter.rs
@@ -222,8 +222,38 @@ unsafe fn parse_json(
     }
 }
 
+/// Initializes the tokio runtime for the exporter.
+///
+/// This function creates the tokio runtime used by `ddog_prof_Exporter_send_blocking`.
+/// It can be called ahead of time to ensure the runtime is ready before sending.
+///
+/// # Thread Affinity
+///
+/// **Important**: The runtime has thread affinity. This function should be called from
+/// the same thread that will later call `ddog_prof_Exporter_send_blocking`.
+///
+/// # Arguments
+/// * `exporter` - Borrows the exporter.
+///
+/// # Safety
+/// The `exporter` must point to a valid ProfileExporter that has not been dropped.
+#[no_mangle]
+#[must_use]
+#[named]
+pub unsafe extern "C" fn ddog_prof_Exporter_init_runtime(
+    mut exporter: *mut Handle<ProfileExporter>,
+) -> VoidResult {
+    wrap_with_void_ffi_result!({
+        let exporter = exporter.to_inner_mut()?;
+        exporter.init_runtime()?
+    })
+}
+
 /// Builds a request and sends it, returning the HttpStatus.
 ///
+/// Note: If the runtime has not been initialized via `ddog_prof_Exporter_init_runtime`,
+/// it will be lazily initialized on first call.
+///
 /// # Arguments
 /// * `exporter` - Borrows the exporter.
 /// * `profile` - Takes ownership of the profile.
diff --git a/libdd-profiling-protobuf/CHANGELOG.md b/libdd-profiling-protobuf/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+
+
+## [2.0.0](https://github.com/datadog/libdatadog/compare/libdd-profiling-protobuf-v1.0.0..libdd-profiling-protobuf-v2.0.0) - 2026-04-15
+
+### Changed
+
+- bumped prost dependency from 0.13 to 0.14 ([#1426](https://github.com/datadog/libdatadog/issues/1700)) - ([14bab865c](https://github.com/datadog/libdatadog/commit/14bab865c))
+
+
+
 ## 1.0.0 - 2025-11-17
 
 Initial release.
diff --git a/libdd-profiling-protobuf/Cargo.toml b/libdd-profiling-protobuf/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "libdd-profiling-protobuf"
-version = "1.0.0"
+version = "2.0.0"
 description = "Protobuf utils for Datadog's continuous profiling library"
 homepage = "https://github.com/DataDog/libdatadog/tree/main/libdd-profiling-protobuf"
 repository = "https://github.com/DataDog/libdatadog/tree/main/libdd-profiling-protobuf"
diff --git a/libdd-profiling/Cargo.toml b/libdd-profiling/Cargo.toml
@@ -43,7 +43,7 @@ httparse = "1.9"
 indexmap = "2.11"
 libdd-alloc = { version = "1.0.0", path = "../libdd-alloc" }
 libdd-common = { version = "3.0.2", path = "../libdd-common", default-features = false, features = ["reqwest", "test-utils"] }
-libdd-profiling-protobuf = { version = "1.0.0", path = "../libdd-profiling-protobuf", features = ["prost_impls"] }
+libdd-profiling-protobuf = { version = "2.0.0", path = "../libdd-profiling-protobuf", features = ["prost_impls"] }
 mime = "0.3.16"
 parking_lot = { version = "0.12", default-features = false }
 prost = "0.14.1"
diff --git a/libdd-profiling/src/exporter/profile_exporter.rs b/libdd-profiling/src/exporter/profile_exporter.rs
@@ -161,6 +161,26 @@ impl ProfileExporter {
     /// - Using the async [`send`] method directly from within a tokio runtime
     ///
     /// [`send`]: ProfileExporter::send
+    /// Initializes the tokio runtime for blocking operations.
+    ///
+    /// This method lazily creates a single-threaded tokio runtime. It can be called
+    /// before `send_blocking` to ensure the runtime is ready ahead of time.
+    ///
+    /// # Thread Affinity
+    ///
+    /// **Important**: The runtime uses `new_current_thread()`, which has thread affinity.
+    /// This method should be called from the same thread that will later call `send_blocking`.
+    pub fn init_runtime(&mut self) -> anyhow::Result<()> {
+        if self.runtime.is_none() {
+            self.runtime = Some(
+                tokio::runtime::Builder::new_current_thread()
+                    .enable_all()
+                    .build()?,
+            );
+        }
+        Ok(())
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub fn send_blocking(
         &mut self,
@@ -172,13 +192,7 @@ impl ProfileExporter {
         process_tags: Option<&str>,
         cancel: Option<&CancellationToken>,
     ) -> anyhow::Result<reqwest::StatusCode> {
-        if self.runtime.is_none() {
-            self.runtime = Some(
-                tokio::runtime::Builder::new_current_thread()
-                    .enable_all()
-                    .build()?,
-            );
-        }
+        self.init_runtime()?;
 
         Ok(self
             .runtime
diff --git a/libdd-telemetry/src/worker/mod.rs b/libdd-telemetry/src/worker/mod.rs
@@ -489,9 +489,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)]
diff --git a/libdd-trace-obfuscation/src/ip_address.rs b/libdd-trace-obfuscation/src/ip_address.rs
@@ -104,12 +104,8 @@ fn parse_ip(s: &str) -> Option<(&str, &str)> {
         match ch {
             '0'..='9' => continue,
             '.' | '-' | '_' => return parse_ip_v4(s, ch),
-            ':' | 'A'..='F' | 'a'..='f' => {
-                if s.parse::<Ipv6Addr>().is_ok() {
-                    return Some((s, ""));
-                } else {
-                    return None;
-                }
+            ':' | 'A'..='F' | 'a'..='f' if s.parse::<Ipv6Addr>().is_ok() => {
+                return Some((s, ""));
             }
             '[' => {
                 // Parse IPv6 in [host]:port format

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ mod tests {`
`181`	`181`	`let vec = vec![0, 2, 4, 6];`
`182`	`182`	`let ffi_vec: Vec<u8> = Vec::from(vec.clone());`
`183`	`183`
`184`		`- for (a, b) in vec.iter().zip(ffi_vec.into_iter()) {`
	`184`	`+ for (a, b) in vec.iter().zip(&ffi_vec) {`
`185`	`185`	`assert_eq!(a, b)`
`186`	`186`	`}`
`187`	`187`	`}`