revisions part 2

Author: rachelyangdog

libdd-trace-utils/Cargo.toml

@@ -19,6 +19,7 @@ path = "benches/main.rs"
 
 [dependencies]
 anyhow = "1.0"
+base64 = "0.22"
 hyper = { workspace = true, optional = true, default-features = false }
 "http" = "1"
 "http-body" = "1"

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

@@ -17,6 +17,7 @@
 //! dependency for that purpose:
 //!   <https://github.com/open-telemetry/opentelemetry-rust/tree/opentelemetry-proto-0.28.0/opentelemetry-proto>
 
+use base64::{engine::general_purpose::STANDARD, Engine as _};
 use serde::{Serialize, Serializer};
 
 /// Top-level OTLP trace export request (ExportTraceServiceRequest).
@@ -127,14 +128,19 @@ pub enum AnyValue {
     #[serde(serialize_with = "serialize_int_value_as_string")]
     IntValue(i64),
     DoubleValue(f64),
-    BytesValue(String),
+    #[serde(serialize_with = "serialize_bytes_as_base64")]
+    BytesValue(Vec<u8>),
     ArrayValue(ArrayValue),
 }
 
 fn serialize_int_value_as_string<S: Serializer>(v: &i64, s: S) -> Result<S::Ok, S::Error> {
     s.serialize_str(&v.to_string())
 }
 
+fn serialize_bytes_as_base64<S: Serializer>(v: &[u8], s: S) -> Result<S::Ok, S::Error> {
+    s.serialize_str(&STANDARD.encode(v))
+}
+
 /// OTLP array value — wraps a list of [`AnyValue`] items.
 #[derive(Debug, Serialize)]
 pub struct ArrayValue {

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

@@ -408,4 +408,43 @@ mod tests {
         let rate = rate_kv["value"]["doubleValue"].as_f64().unwrap();
         assert!((rate - std::f64::consts::PI).abs() < 1e-9);
     }
+
+    #[test]
+    fn test_128bit_trace_id_from_dd_p_tid() {
+        // When "_dd.p.tid" is present it supplies the high 64 bits of the trace ID.
+        // Low 64 bits come from span.trace_id; the two are concatenated to form a 128-bit hex ID.
+        let resource_info = OtlpResourceInfo::default();
+        let mut span: Span<BytesData> = Span {
+            trace_id: 0xD269B633813FC60C_u128, // low 64 bits
+            span_id: 1,
+            name: libdd_tinybytes::BytesString::from_static("s"),
+            start: 0,
+            duration: 1,
+            ..Default::default()
+        };
+        span.meta.insert(
+            "_dd.p.tid".into(),
+            libdd_tinybytes::BytesString::from_static("5b8efff798038103"),
+        );
+        let req = map_traces_to_otlp(vec![vec![span]], &resource_info);
+        let otlp_span = &req.resource_spans[0].scope_spans[0].spans[0];
+        assert_eq!(otlp_span.trace_id, "5b8efff798038103d269b633813fc60c");
+    }
+
+    #[test]
+    fn test_128bit_trace_id_without_dd_p_tid() {
+        // When "_dd.p.tid" is absent the high 64 bits default to zero.
+        let resource_info = OtlpResourceInfo::default();
+        let span: Span<BytesData> = Span {
+            trace_id: 0xD269B633813FC60C_u128,
+            span_id: 1,
+            name: libdd_tinybytes::BytesString::from_static("s"),
+            start: 0,
+            duration: 1,
+            ..Default::default()
+        };
+        let req = map_traces_to_otlp(vec![vec![span]], &resource_info);
+        let otlp_span = &req.resource_spans[0].scope_spans[0].spans[0];
+        assert_eq!(otlp_span.trace_id, "0000000000000000d269b633813fc60c");
+    }
 }