Fixes

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

Cargo.lock

@@ -17,6 +17,7 @@ percent-encoding = "2.1"
 uuid = { version = "1.7.0", features = ["v4"] }
 serde_json = "1.0"
 tokio = "1.36.0"
+tokio-util = { version = "0.7", features = ["rt"] }
 log = "0.4.21"
 
 [features]

live-debugger-ffi/Cargo.toml

@@ -121,6 +121,7 @@ impl<'a> From<&'a datadog_live_debugger::SpanDecorationProbe> for SpanDecoration
             span_tags: tags.as_ptr(),
             span_tags_num: tags.len(),
         };
+        std::mem::forget(conditions);
         std::mem::forget(tags);
         new
     }
@@ -139,7 +140,7 @@ impl<'a> Drop for SpanDecorationProbe<'a> {
             );
             let num_conditions = tags.iter().filter(|p| p.next_condition).count();
             _ = Vec::from_raw_parts(
-                self.conditions as *mut ProbeCondition,
+                self.conditions as *mut &ProbeCondition,
                 num_conditions,
                 num_conditions,
             );

live-debugger-ffi/src/data.rs

@@ -236,9 +236,8 @@ pub fn ddog_evaluate_string<'a>(
 ) -> Cow<'a, str> {
     let mut ctx = EvalCtx::new(context);
     let (result, new_errors) = datadog_live_debugger::eval_string(&mut ctx, condition);
-    if !new_errors.is_empty() {
-        *errors = Some(Box::new(new_errors));
-    }
+    let found_errors = if !new_errors.is_empty() { Some(Box::new(new_errors)) } else { None };
+    std::mem::forget(std::mem::replace(errors, found_errors));
     result
 }
 

live-debugger-ffi/src/evaluator.rs

@@ -11,6 +11,7 @@ use percent_encoding::{percent_encode, CONTROLS};
 use std::sync::Arc;
 use std::thread::JoinHandle;
 use tokio::sync::mpsc;
+use tokio_util::task::TaskTracker;
 
 macro_rules! try_c {
     ($failable:expr) => {
@@ -46,6 +47,7 @@ async fn sender_routine(
     mut receiver: mpsc::Receiver<SendData>,
 ) {
     let tags = Arc::new(tags);
+    let tracker = TaskTracker::new();
     loop {
         let data = match receiver.recv().await {
             None => break,
@@ -54,7 +56,7 @@ async fn sender_routine(
 
         let endpoint = endpoint.clone();
         let tags = tags.clone();
-        tokio::spawn(async move {
+        tracker.spawn(async move {
             let data = match &data {
                 SendData::Raw(vec) => vec.as_slice(),
                 SendData::Wrapped(wrapped) => wrapped.slice.as_bytes(),
@@ -65,6 +67,8 @@ async fn sender_routine(
             }
         });
     }
+
+    tracker.wait().await;
 }
 
 pub struct SenderHandle {

live-debugger-ffi/src/sender.rs

@@ -86,7 +86,7 @@ lazy_static! {
         REDACTED_TYPES_INITIALIZED.store(true, Ordering::Relaxed);
         Regex::new(&REDACTED_WILDCARD_TYPES_PATTERN).unwrap()
     };
-    
+
     static ref ASSUMED_SAFE_NAME_LEN: usize = {
         REDACTED_NAMES_INITIALIZED.store(true, Ordering::Relaxed);
         REDACTED_NAMES.iter().map(|n| n.len()).max().unwrap() + 5