fix(libdd-crashtracker): avoid leaking Endpoint through the public API

Author: hoolioh

libdd-crashtracker-ffi/src/collector/datatypes.rs

@@ -1,7 +1,6 @@
 // Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
-use libdd_common::Endpoint;
 use libdd_common_ffi::slice::{AsBytes, CharSlice};
 use libdd_common_ffi::{Error, Slice};
 pub use libdd_crashtracker::{OpTypes, StacktraceCollection};
@@ -61,7 +60,7 @@ pub struct Config<'a> {
     pub demangle_names: bool,
     /// The endpoint to send the crash report to (can be a file://).
     /// If None, the crashtracker will infer the agent host from env variables.
-    pub endpoint: Option<&'a Endpoint>,
+    pub endpoint: CharSlice<'a>,
     /// Optional filename for a unix domain socket if the receiver is used asynchonously
     pub optional_unix_socket_filename: CharSlice<'a>,
     pub resolve_frames: StacktraceCollection,
@@ -90,7 +89,7 @@ impl<'a> TryFrom<Config<'a>> for libdd_crashtracker::CrashtrackerConfiguration {
         };
         let create_alt_stack = value.create_alt_stack;
         let use_alt_stack = value.use_alt_stack;
-        let endpoint = value.endpoint.cloned();
+        let endpoint = value.endpoint.try_to_string_option().unwrap_or(None);
         let resolve_frames = value.resolve_frames;
         let signals = value.signals.iter().copied().collect();
         let timeout = if value.timeout_ms == 0 {
@@ -104,7 +103,7 @@ impl<'a> TryFrom<Config<'a>> for libdd_crashtracker::CrashtrackerConfiguration {
             additional_files,
             create_alt_stack,
             use_alt_stack,
-            endpoint,
+            endpoint.as_deref(),
             resolve_frames,
             signals,
             timeout,

libdd-crashtracker/src/collector/api.rs

@@ -118,7 +118,6 @@ mod tests {
     use crate::{begin_op, insert_span, insert_trace, StacktraceCollection};
     use chrono::Utc;
     use libdd_common::tag;
-    use libdd_common::Endpoint;
     use std::time::Duration;
     // We can't run this in the main test runner because it (deliberately) crashes,
     // and would make all following tests unrunable.
@@ -133,7 +132,7 @@ mod tests {
         let dir = "/tmp/crashreports/";
         let output_url = format!("file://{dir}{time}.txt");
 
-        let endpoint = Some(Endpoint::from_slice(&output_url));
+        let endpoint = Some(output_url.as_str());
 
         let path_to_receiver_binary =
             "/tmp/libdatadog/bin/libdatadog-crashtracking-receiver".to_string();
@@ -198,7 +197,7 @@ mod tests {
         let dir = "/tmp/crashreports/";
         let output_url = format!("file://{dir}{time}.txt");
 
-        let endpoint = Some(Endpoint::from_slice(&output_url));
+        let endpoint = Some(output_url.as_str());
 
         let create_alt_stack = true;
         let use_alt_stack = false;
@@ -254,7 +253,7 @@ mod tests {
         let dir = "/tmp/crashreports/";
         let output_url = format!("file://{dir}{time}.txt");
 
-        let endpoint = Some(Endpoint::from_slice(&output_url));
+        let endpoint = Some(output_url.as_str());
 
         let path_to_receiver_binary =
             "/tmp/libdatadog/bin/libdatadog-crashtracking-receiver".to_string();
@@ -376,7 +375,7 @@ mod tests {
         let dir = "/tmp/crashreports/";
         let output_url = format!("file://{dir}{time}.txt");
 
-        let endpoint = Some(Endpoint::from_slice(&output_url));
+        let endpoint = Some(output_url.as_str());
 
         let path_to_receiver_binary =
             "/tmp/libdatadog/bin/libdatadog-crashtracking-receiver".to_string();
@@ -504,7 +503,7 @@ mod tests {
         let dir = "/tmp/crashreports/";
         let output_url = format!("file://{dir}{time}.txt");
 
-        let endpoint = Some(Endpoint::from_slice(&output_url));
+        let endpoint = Some(output_url.as_str());
 
         let path_to_receiver_binary =
             "/tmp/libdatadog/bin/libdatadog-crashtracking-receiver".to_string();
@@ -667,7 +666,7 @@ mod tests {
         let dir = "/tmp/crashreports/";
         let output_url = format!("file://{dir}{time}.txt");
 
-        let endpoint = Some(Endpoint::from_slice(&output_url));
+        let endpoint = Some(output_url.as_str());
 
         let path_to_receiver_binary =
             "/tmp/libdatadog/bin/libdatadog-crashtracking-receiver".to_string();

libdd-crashtracker/src/shared/configuration.rs

@@ -78,7 +78,7 @@ impl CrashtrackerConfiguration {
         additional_files: Vec<String>,
         create_alt_stack: bool,
         use_alt_stack: bool,
-        endpoint: Option<Endpoint>,
+        endpoint: Option<&str>,
         resolve_frames: StacktraceCollection,
         mut signals: Vec<i32>,
         timeout: Option<Duration>,
@@ -91,6 +91,8 @@ impl CrashtrackerConfiguration {
             "Cannot create an altstack without using it"
         );
         let timeout = timeout.unwrap_or(constants::DD_CRASHTRACK_DEFAULT_TIMEOUT);
+        let endpoint = endpoint.map(Endpoint::from_slice);
+
         if signals.is_empty() {
             signals = default_signals();
         } else {
@@ -135,7 +137,7 @@ impl CrashtrackerConfiguration {
         self.use_alt_stack
     }
 
-    pub fn endpoint(&self) -> &Option<Endpoint> {
+    pub(crate) fn endpoint(&self) -> &Option<Endpoint> {
         &self.endpoint
     }