emit otel

Author: danielsn

libdd-profiling/src/cxx.rs

@@ -616,7 +616,7 @@ impl Profile {
         // Reset the profile and get the old one to serialize
         let old_profile = self.inner.reset_and_return_previous()?;
         let end_time = Some(std::time::SystemTime::now());
-        let encoded = old_profile.serialize_into_compressed_pprof(end_time, None)?;
+        let encoded = old_profile.serialize_into_compressed(end_time, None)?;
         Ok(encoded.buffer)
     }
 }
@@ -647,7 +647,7 @@ fn prepare_profile_for_export<'a>(
 )> {
     let old_profile = profile.inner.reset_and_return_previous()?;
     let end_time = Some(std::time::SystemTime::now());
-    let encoded = old_profile.serialize_into_compressed_pprof(end_time, None)?;
+    let encoded = old_profile.serialize_into_compressed(end_time, None)?;
 
     let files_to_compress_vec: Vec<exporter::File> =
         files_to_compress.iter().map(Into::into).collect();

libdd-profiling/src/exporter/profile_exporter.rs

@@ -280,7 +280,7 @@ impl ProfileExporter {
         let attachments: Vec<_> = additional_files
             .iter()
             .map(|f| f.name)
-            .chain(std::iter::once("profile.pprof"))
+            .chain(std::iter::once(profile.filename))
             .collect();
 
         let mut internal = internal_metadata.unwrap_or_else(|| json!({}));
@@ -340,8 +340,8 @@ impl ProfileExporter {
 
         // Add profile
         Ok(form.part(
-            "profile.pprof",
-            reqwest::multipart::Part::bytes(profile.buffer).file_name("profile.pprof"),
+            profile.filename,
+            reqwest::multipart::Part::bytes(profile.buffer).file_name(profile.filename),
         ))
     }
 }

libdd-profiling/src/internal/profile/mod.rs

@@ -72,6 +72,9 @@ pub struct EncodedProfile {
     pub end: SystemTime,
     pub buffer: Vec<u8>,
     pub endpoints_stats: ProfiledEndpointsStats,
+    /// The filename to use when uploading this profile as a multipart attachment,
+    /// e.g. `"profile.pprof"` or `"profile.otel"`.
+    pub filename: &'static str,
 }
 
 impl EncodedProfile {
@@ -101,6 +104,7 @@ impl EncodedProfile {
             end,
             buffer,
             endpoints_stats,
+            filename: "profile.pprof",
         })
     }
 }
@@ -338,6 +342,7 @@ impl Profile {
         upscaling_info: UpscalingInfo,
     ) -> anyhow::Result<()> {
         anyhow::ensure!(offset_values.len() == 1 || offset_values.len() == 2);
+        #[cfg(feature = "otel")]
         if offset_values.len() == 2 {
             anyhow::ensure!(
                 self.observations.paired_samples[offset_values[0]] == Some(offset_values[1])
@@ -496,6 +501,23 @@ impl Profile {
         self.encode_otel(end_time, duration)
     }
 
+    /// Serialize the aggregated profile, choosing the output format at runtime.
+    ///
+    /// If the `DD_PROFILING_OTEL_FORMAT` environment variable is set to any non-empty value **and**
+    /// the crate was compiled with the `otel` feature, the profile is encoded as OTLP; otherwise
+    /// it falls back to pprof.
+    pub fn serialize_into_compressed(
+        self,
+        end_time: Option<SystemTime>,
+        duration: Option<Duration>,
+    ) -> anyhow::Result<EncodedProfile> {
+        #[cfg(feature = "otel")]
+        if std::env::var_os("DD_PROFILING_OTEL_FORMAT").is_some() {
+            return self.encode_otel(end_time, duration);
+        }
+        self.serialize_into_compressed_pprof(end_time, duration)
+    }
+
     /// Serialize the aggregated profile, adding the end time and duration.
     /// # Arguments
     /// * `end_time` - Optional end time of the profile. Passing None will use the current time.
@@ -904,6 +926,7 @@ impl Profile {
             end,
             buffer,
             endpoints_stats,
+            filename: "profile.otel",
         })
     }
 
@@ -1070,6 +1093,7 @@ impl Profile {
             end,
             buffer: Vec::new(),
             endpoints_stats,
+            filename: "profile.pprof",
         })
     }