fix: use proper remove method for spans + format

Author: yannham

datadog-sidecar-ffi/src/span.rs

@@ -7,6 +7,7 @@ use libdd_trace_utils::span::v04::{
     AttributeAnyValueBytes, AttributeArrayValueBytes, SpanBytes, SpanEventBytes, SpanLinkBytes,
     VecMap,
 };
+use libdd_trace_utils::span::vec_map::Tombstone;
 use std::borrow::Cow;
 use std::collections::HashMap;
 use std::ffi::{c_char, CString};
@@ -61,11 +62,17 @@ fn insert_vec_map<V>(map: &mut VecMap<BytesString, V>, key: CharSlice, value: V)
 }
 
 #[inline]
-fn remove_vec_map<V>(map: &mut VecMap<BytesString, V>, key: CharSlice) {
+fn remove_vec_map_slow<V>(map: &mut VecMap<BytesString, V>, key: CharSlice) {
     let bytes_str_key = convert_char_slice_to_bytes_string(key);
     map.remove_slow(&bytes_str_key);
 }
 
+#[inline]
+fn remove_vec_map<V: Tombstone>(map: &mut VecMap<BytesString, V>, key: CharSlice) {
+    let bytes_str_key = convert_char_slice_to_bytes_string(key);
+    map.remove_unset(&bytes_str_key);
+}
+
 #[inline]
 fn exists_vec_map<V>(map: &VecMap<BytesString, V>, key: CharSlice) -> bool {
     let bytes_str_key = convert_char_slice_to_bytes_string(key);
@@ -385,7 +392,7 @@ pub extern "C" fn ddog_add_span_metrics(span: &mut SpanBytes, key: CharSlice, va
 
 #[no_mangle]
 pub extern "C" fn ddog_del_span_metrics(span: &mut SpanBytes, key: CharSlice) {
-    remove_vec_map(&mut span.metrics, key);
+    remove_vec_map_slow(&mut span.metrics, key);
 }
 
 #[no_mangle]
@@ -428,7 +435,7 @@ pub extern "C" fn ddog_add_span_meta_struct(span: &mut SpanBytes, key: CharSlice
 
 #[no_mangle]
 pub extern "C" fn ddog_del_span_meta_struct(span: &mut SpanBytes, key: CharSlice) {
-    remove_vec_map(&mut span.meta_struct, key);
+    remove_vec_map_slow(&mut span.meta_struct, key);
 }
 
 #[no_mangle]

libdd-trace-utils/src/msgpack_decoder/v05/mod.rs

@@ -388,7 +388,10 @@ mod tests {
         assert_eq!(span.error, 1);
         assert_eq!(span.meta.len(), 3);
         assert_eq!(
-            span.meta.get("_dd.sampling_rate_whatever").unwrap().as_str(),
+            span.meta
+                .get("_dd.sampling_rate_whatever")
+                .unwrap()
+                .as_str(),
             "value whatever"
         );
         assert_eq!(span.meta.get("").unwrap().as_str(), "item");

libdd-trace-utils/src/msgpack_encoder/v1/mod.rs

@@ -122,10 +122,7 @@ where
                 apm_mode = span.meta.get("_dd.apm_mode").map(|v| v.borrow());
             }
             if git_commit_sha.is_none() {
-                git_commit_sha = span
-                    .meta
-                    .get("_dd.git.commit.sha")
-                    .map(|v| v.borrow());
+                git_commit_sha = span.meta.get("_dd.git.commit.sha").map(|v| v.borrow());
             }
             if env.is_some()
                 && hostname.is_some()
@@ -183,8 +180,8 @@ where
 
     for span in spans {
         // Root span: either no parent in this chunk, or tagged _dd.top_level=1 (remote parent).
-        let is_root = span.parent_id == 0
-            || span.metrics.get("_dd.top_level").copied().unwrap_or(0.0) == 1.0;
+        let is_root =
+            span.parent_id == 0 || span.metrics.get("_dd.top_level").copied().unwrap_or(0.0) == 1.0;
 
         if is_root {
             // Root span is authoritative: its values supersede any non-root fallback,

libdd-trace-utils/src/msgpack_encoder/v1/span_v04.rs

@@ -263,12 +263,7 @@ pub fn encode_span<W: RmpWrite, T: TraceData>(
     let version = span.meta.get("version").map(|v| v.borrow());
     let component = span.meta.get("component").map(|v| v.borrow());
     // span.kind is always emitted — defaults to Internal per OTEL spec.
-    let kind = span_kind_from_str(
-        span.meta
-            .get("span.kind")
-            .map(|v| v.borrow())
-            .unwrap_or(""),
-    );
+    let kind = span_kind_from_str(span.meta.get("span.kind").map(|v| v.borrow()).unwrap_or(""));
 
     let span_len = 3 // span_id, start, kind — always present
         + (!span.service.borrow().is_empty()) as u32

libdd-trace-utils/src/otlp_encoder/mapper.rs

@@ -121,10 +121,7 @@ fn map_span<T: TraceData>(span: &Span<T>, resource_service: &str) -> OtlpSpan {
         .map(|v| tag_to_otlp_kind(v.borrow()))
         .unwrap_or_else(|| dd_type_to_otlp_kind(span.r#type.borrow()));
     let (attributes, dropped_attributes_count) = map_attributes(span, resource_service);
-    let error_msg = span
-        .meta
-        .get("error.msg")
-        .map(|v| v.borrow().to_string());
+    let error_msg = span.meta.get("error.msg").map(|v| v.borrow().to_string());
     let status = if span.error != 0 {
         Status {
             message: error_msg,

libdd-trace-utils/src/span/trace_utils.rs

@@ -13,17 +13,13 @@ const TRACER_TOP_LEVEL_KEY: &str = "_dd.top_level";
 const MEASURED_KEY: &str = "_dd.measured";
 const PARTIAL_VERSION_KEY: &str = "_dd.partial_version";
 
-fn set_top_level_span<T>(span: &mut Span<T>, is_top_level: bool)
+fn set_top_level_span<T>(span: &mut Span<T>)
 where
     T: TraceData,
     T::Text: std::borrow::Borrow<str>,
 {
-    if is_top_level {
-        span.metrics
-            .insert(T::Text::from_static_str(TOP_LEVEL_KEY), 1.0);
-    } else {
-        span.metrics.remove_slow(TOP_LEVEL_KEY);
-    }
+    span.metrics
+        .insert(T::Text::from_static_str(TOP_LEVEL_KEY), 1.0);
 }
 
 /// Updates all the spans top-level attribute.
@@ -44,19 +40,19 @@ where
     for span_idx in 0..trace.len() {
         let parent_id = trace[span_idx].parent_id;
         if parent_id == 0 {
-            set_top_level_span(&mut trace[span_idx], true);
+            set_top_level_span(&mut trace[span_idx]);
             continue;
         }
         match span_id_idx.get(&parent_id).map(|i| &trace[*i].service) {
             Some(parent_span_service) => {
                 if !(parent_span_service == &trace[span_idx].service) {
                     // parent is not in the same service
-                    set_top_level_span(&mut trace[span_idx], true)
+                    set_top_level_span(&mut trace[span_idx])
                 }
             }
             None => {
                 // span has no parent in chunk
-                set_top_level_span(&mut trace[span_idx], true)
+                set_top_level_span(&mut trace[span_idx])
             }
         }
     }

libdd-trace-utils/src/trace_utils.rs

@@ -424,19 +424,19 @@ pub fn compute_top_level_span(trace: &mut [pb::Span]) {
     }
     for span in trace.iter_mut() {
         if span.parent_id == 0 {
-            set_top_level_span(span, true);
+            set_top_level_span(span);
             continue;
         }
         match span_id_to_service.get(&span.parent_id) {
             Some(parent_span_service) => {
                 if !parent_span_service.eq(&span.service) {
                     // parent is not in the same service
-                    set_top_level_span(span, true)
+                    set_top_level_span(span)
                 }
             }
             None => {
                 // span has no parent in chunk
-                set_top_level_span(span, true)
+                set_top_level_span(span)
             }
         }
     }
@@ -450,12 +450,8 @@ pub fn has_top_level(span: &pb::Span) -> bool {
         || span.metrics.get(TOP_LEVEL_KEY).is_some_and(|v| *v == 1.0)
 }
 
-fn set_top_level_span(span: &mut pb::Span, is_top_level: bool) {
-    if is_top_level {
-        span.metrics.insert(TOP_LEVEL_KEY.to_string(), 1.0);
-    } else {
-        span.metrics.remove(TOP_LEVEL_KEY);
-    }
+fn set_top_level_span(span: &mut pb::Span) {
+    span.metrics.insert(TOP_LEVEL_KEY.to_string(), 1.0);
 }
 
 pub fn set_serverless_root_span_tags(