feat: encoder v1 to v04 + refacto

datadog-sidecar-ffi/src/lib.rs

@@ -1694,7 +1694,7 @@ pub unsafe extern "C" fn ddog_send_traces_to_sidecar(
     // Write traces to the shared memory
     let mut shm_slice = mapped_shm.as_slice_mut();
     let shm_slice_len = shm_slice.len();
-    let written = match msgpack_encoder::v04::write_to_slice(&mut shm_slice, traces) {
+    let written = match msgpack_encoder::v04::write_to_slice_v04(&mut shm_slice, traces) {
         Ok(()) => shm_slice_len - shm_slice.len(),
         Err(_) => {
             tracing::error!("Failed serializing the traces");
@@ -1724,7 +1724,7 @@ pub unsafe extern "C" fn ddog_send_traces_to_sidecar(
         match blocking::send_trace_v04_bytes(
             &mut parameters.transport,
             &parameters.instance_id,
-            msgpack_encoder::v04::to_vec_with_capacity(traces, written as u32),
+            msgpack_encoder::v04::to_vec_with_capacity_v04(traces, written as u32),
             check!(
                 (&parameters.tracer_headers_tags).try_into(),
                 "Failed to convert tracer headers tags"

libdd-data-pipeline/src/trace_exporter/mod.rs

@@ -1254,7 +1254,7 @@ mod tests {
                 ..Default::default()
             }],
         ];
-        let data = msgpack_encoder::v04::to_vec(&traces);
+        let data = msgpack_encoder::v04::to_vec_v04(&traces);
 
         let _result = exporter.send(data.as_ref()).expect("failed to send trace");
 
@@ -1354,7 +1354,7 @@ mod tests {
             name: BytesString::from_slice(b"test").unwrap(),
             ..Default::default()
         }]];
-        let data = msgpack_encoder::v04::to_vec(&traces);
+        let data = msgpack_encoder::v04::to_vec_v04(&traces);
         let result = exporter.send(data.as_ref());
 
         assert!(result.is_err());
@@ -1462,7 +1462,7 @@ mod tests {
             name: BytesString::from_slice(b"test").unwrap(),
             ..Default::default()
         }]];
-        let data = msgpack_encoder::v04::to_vec(&traces);
+        let data = msgpack_encoder::v04::to_vec_v04(&traces);
         let result = exporter.send(data.as_ref());
 
         assert!(result.is_err());
@@ -1566,7 +1566,7 @@ mod tests {
             name: BytesString::from_slice(b"test").unwrap(),
             ..Default::default()
         }]];
-        let data = msgpack_encoder::v04::to_vec(&traces);
+        let data = msgpack_encoder::v04::to_vec_v04(&traces);
 
         let _result = exporter.send(data.as_ref()).expect("failed to send trace");
 
@@ -1626,7 +1626,7 @@ mod tests {
             name: BytesString::from_slice(b"test").unwrap(),
             ..Default::default()
         }]];
-        let data = msgpack_encoder::v04::to_vec(&traces);
+        let data = msgpack_encoder::v04::to_vec_v04(&traces);
         let result = exporter.send(data.as_ref()).unwrap();
 
         assert_eq!(
@@ -1668,7 +1668,7 @@ mod tests {
             name: BytesString::from_slice(b"test").unwrap(),
             ..Default::default()
         }]];
-        let data = msgpack_encoder::v04::to_vec(&traces);
+        let data = msgpack_encoder::v04::to_vec_v04(&traces);
         let code = match exporter.send(data.as_ref()).unwrap_err() {
             TraceExporterError::Request(e) => Some(e.status()),
             _ => None,
@@ -1703,7 +1703,7 @@ mod tests {
             name: BytesString::from_slice(b"test").unwrap(),
             ..Default::default()
         }]];
-        let data = msgpack_encoder::v04::to_vec(&traces);
+        let data = msgpack_encoder::v04::to_vec_v04(&traces);
         let err = exporter.send(data.as_ref());
 
         assert!(err.is_err());
@@ -2048,7 +2048,7 @@ mod tests {
             ..Default::default()
         }];
 
-        let data = msgpack_encoder::v04::to_vec(&[trace_chunk]);
+        let data = msgpack_encoder::v04::to_vec_v04(&[trace_chunk]);
 
         // Wait for the info fetcher to get the config
         while mock_info.calls() == 0 {
@@ -2116,7 +2116,7 @@ mod tests {
             error: 0,
             ..Default::default()
         }]];
-        let data = msgpack_encoder::v04::to_vec(&traces);
+        let data = msgpack_encoder::v04::to_vec_v04(&traces);
         let result = exporter.send(data.as_ref());
 
         assert!(
@@ -2193,7 +2193,7 @@ mod single_threaded_tests {
             ..Default::default()
         }];
 
-        let data = msgpack_encoder::v04::to_vec(&[trace_chunk]);
+        let data = msgpack_encoder::v04::to_vec_v04(&[trace_chunk]);
 
         // Wait for the info fetcher to get the config
         while agent_info::get_agent_info().is_none() {
@@ -2294,7 +2294,7 @@ mod single_threaded_tests {
             ..Default::default()
         }];
 
-        let data = msgpack_encoder::v04::to_vec(&[trace_chunk]);
+        let data = msgpack_encoder::v04::to_vec_v04(&[trace_chunk]);
 
         // Wait for agent_info to be present so that sending a trace will trigger the stats worker
         // to start
@@ -2393,7 +2393,7 @@ mod single_threaded_tests {
             duration: 10,
             ..Default::default()
         }];
-        let data = msgpack_encoder::v04::to_vec(&[trace_chunk]);
+        let data = msgpack_encoder::v04::to_vec_v04(&[trace_chunk]);
         let _ = exporter.send(data.as_ref());
 
         let start = std::time::Instant::now();
@@ -2501,7 +2501,7 @@ mod single_threaded_tests {
             duration: 10,
             ..Default::default()
         }];
-        let data = msgpack_encoder::v04::to_vec(&[trace_chunk]);
+        let data = msgpack_encoder::v04::to_vec_v04(&[trace_chunk]);
 
         // 1st send: /info has promoted v1_active=true, so this hits /v1.0/traces and 404s.
         let result1 = exporter.send(&data);

libdd-data-pipeline/src/trace_exporter/trace_serializer.rs

@@ -120,7 +120,7 @@ impl TraceSerializer {
             .max(MIN_BUFFER_CAPACITY);
         let buff = match payload {
             tracer_payload::TraceChunks::V04(p) => {
-                msgpack_encoder::v04::to_vec_with_capacity(p, capacity as u32)
+                msgpack_encoder::v04::to_vec_with_capacity_v04(p, capacity as u32)
             }
             tracer_payload::TraceChunks::V05(p) => {
                 let mut buff = Vec::with_capacity(capacity);
@@ -129,7 +129,7 @@ impl TraceSerializer {
                 buff
             }
             tracer_payload::TraceChunks::V1(p) => {
-                msgpack_encoder::v1::to_vec_with_capacity(p, capacity as u32, metadata)
+                msgpack_encoder::v1::to_vec_with_capacity_v04(p, capacity as u32, metadata)
             }
         };
         self.previous_serialised_len

libdd-trace-utils/benches/serialization.rs

@@ -65,7 +65,7 @@ pub fn serialize_internal_to_msgpack(c: &mut Criterion) {
         b.iter_batched(
             || vec![0u8; 12_000_000],
             |mut vec| {
-                let _ = black_box(msgpack_encoder::v04::write_to_slice(
+                let _ = black_box(msgpack_encoder::v04::write_to_slice_v04(
                     &mut vec.as_mut_slice(),
                     black_box(&data),
                 ));