fix: pair length delimiter size

Author: morrisonlevi

datadog-profiling-protobuf/src/lib.rs

@@ -74,12 +74,12 @@ impl<V: Value> Pair<V> {
 
     pub fn proto_len(&self) -> u64 {
         let tag = Tag::new(self.field, V::WIRE_TYPE).proto_len();
+        let value = self.value.proto_len();
         let len_prefix = if V::WIRE_TYPE == WireType::LengthDelimited {
-            self.value.proto_len()
+            Varint(value).proto_len()
         } else {
             0
         };
-        let value = self.value.proto_len();
         tag + len_prefix + value
     }
 
@@ -228,11 +228,11 @@ impl Tag {
     }
 }
 
-pub struct PackedVarint<'a, T: Into<Varint>> {
+pub struct Packed<'a, T: Into<Varint>> {
     values: &'a [T],
 }
 
-impl<'a, T: Into<Varint>> PackedVarint<'a, T>
+impl<'a, T: Into<Varint>> Packed<'a, T>
 where
     Varint: From<&'a T>,
 {
@@ -241,7 +241,7 @@ where
     }
 }
 
-impl<'a, T: Into<Varint>> Value for PackedVarint<'a, T>
+impl<'a, T: Into<Varint>> Value for Packed<'a, T>
 where
     Varint: From<&'a T>,
 {

datadog-profiling-protobuf/src/sample.rs

@@ -1,7 +1,7 @@
 // Copyright 2025-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::{prost_impls, Label, PackedVarint, Value, WireType};
+use crate::{prost_impls, Label, Packed, Value, WireType};
 use std::io::{self, Write};
 
 #[derive(Copy, Clone, Debug)]
@@ -15,8 +15,8 @@ impl Value for Sample<'_> {
     const WIRE_TYPE: WireType = WireType::LengthDelimited;
 
     fn proto_len(&self) -> u64 {
-        let locations = PackedVarint::new(self.location_ids).field(1).proto_len();
-        let values = PackedVarint::new(self.values).field(2).proto_len();
+        let locations = Packed::new(self.location_ids).field(1).proto_len();
+        let values = Packed::new(self.values).field(2).proto_len();
         let labels = self
             .labels
             .iter()
@@ -26,10 +26,8 @@ impl Value for Sample<'_> {
     }
 
     fn encode<W: Write>(&self, writer: &mut W) -> io::Result<()> {
-        PackedVarint::new(self.location_ids)
-            .field(1)
-            .encode(writer)?;
-        PackedVarint::new(self.values).field(2).encode(writer)?;
+        Packed::new(self.location_ids).field(1).encode(writer)?;
+        Packed::new(self.values).field(2).encode(writer)?;
 
         for label in self.labels {
             label.field(3).encode(writer)?;

datadog-profiling-protobuf/src/value_type.rs

@@ -57,11 +57,8 @@ mod tests {
         assert_eq!(i64::from(value_type.r#type), prost_value_type.r#type);
         assert_eq!(i64::from(value_type.unit), prost_value_type.unit);
 
-        let value = value_type.unit.to_u64();
-        let value1 = value_type.r#type.to_u64();
-        let len = (Varint(value1).field(1).proto_len_small()
-            + Varint(value).field(2).proto_len_small()) as usize;
-        let mut buffer = Vec::with_capacity(len);
+        let mut buffer = Vec::with_capacity(value_type.proto_len() as usize);
+        prost_value_type.encode(&mut buffer).unwrap();
         value_type.encode(&mut buffer).unwrap();
         let roundtrip = prost_impls::ValueType::decode(buffer.as_slice()).unwrap();
         assert_eq!(prost_value_type, roundtrip);