Remove more Clone & rename to BytesData

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

Author: bwoebi

datadog-trace-utils/src/span/mod.rs

@@ -99,7 +99,7 @@ impl SpanBytes for Bytes {
 /// Trait representing a tuple of (Text, Bytes) types used for different underlying data structures.
 /// Note: The functions are internal to the msgpack decoder and should not be used directly: they're
 /// only exposed here due to the inavailability of min_specialization in stable Rust.
-pub trait TraceData: Default + Debug + Clone + PartialEq + Serialize {
+pub trait TraceData: Default + Debug + PartialEq + Serialize {
     type Text: SpanText;
     type Bytes: SpanBytes;
 
@@ -111,9 +111,9 @@ pub trait TraceData: Default + Debug + Clone + PartialEq + Serialize {
 }
 
 /// TraceData implementation using `Bytes` and `BytesString`.
-#[derive(Default, Debug, Clone, PartialEq, Serialize)]
-pub struct TinyData;
-impl TraceData for TinyData {
+#[derive(Default, Debug, PartialEq, Serialize)]
+pub struct BytesData;
+impl TraceData for BytesData {
     type Text = BytesString;
     type Bytes = Bytes;
 
@@ -134,7 +134,6 @@ impl TraceData for TinyData {
 
     #[inline]
     fn read_string(buf: &mut Bytes) -> Result<BytesString, DecodeError> {
-        // Note: we need to pass a &'static lifetime here, otherwise it'll complain
         read_string_ref_nomut(unsafe { buf.as_mut_slice() }).map(|(str, newbuf)| {
             let string = BytesString::from_bytes_slice(buf, str);
             *unsafe { buf.as_mut_slice() } = newbuf;
@@ -144,7 +143,7 @@ impl TraceData for TinyData {
 }
 
 /// TraceData implementation using `&str` and `&[u8]`.
-#[derive(Default, Debug, Clone, PartialEq, Serialize)]
+#[derive(Default, Debug, PartialEq, Serialize)]
 pub struct SliceData<'a>(PhantomData<&'a u8>);
 impl<'a> TraceData for SliceData<'a> {
     type Text = &'a str;

datadog-trace-utils/src/span/v04/mod.rs

@@ -1,7 +1,7 @@
 // Copyright 2023-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::span::{SliceData, SpanKeyParseError, TinyData, TraceData};
+use crate::span::{SliceData, SpanKeyParseError, BytesData, TraceData};
 use crate::tracer_payload::TraceChunks;
 use serde::ser::SerializeStruct;
 use serde::Serialize;
@@ -217,19 +217,19 @@ fn is_default<T: Default + PartialEq>(t: &T) -> bool {
     t == &T::default()
 }
 
-pub type SpanBytes = Span<TinyData>;
-pub type SpanLinkBytes = SpanLink<TinyData>;
-pub type SpanEventBytes = SpanEvent<TinyData>;
-pub type AttributeAnyValueBytes = AttributeAnyValue<TinyData>;
-pub type AttributeArrayValueBytes = AttributeArrayValue<TinyData>;
+pub type SpanBytes = Span<BytesData>;
+pub type SpanLinkBytes = SpanLink<BytesData>;
+pub type SpanEventBytes = SpanEvent<BytesData>;
+pub type AttributeAnyValueBytes = AttributeAnyValue<BytesData>;
+pub type AttributeArrayValueBytes = AttributeArrayValue<BytesData>;
 
 pub type SpanSlice<'a> = Span<SliceData<'a>>;
 pub type SpanLinkSlice<'a> = SpanLink<SliceData<'a>>;
 pub type SpanEventSlice<'a> = SpanEvent<SliceData<'a>>;
 pub type AttributeAnyValueSlice<'a> = AttributeAnyValue<SliceData<'a>>;
 pub type AttributeArrayValueSlice<'a> = AttributeArrayValue<SliceData<'a>>;
 
-pub type TraceChunksBytes = TraceChunks<TinyData>;
+pub type TraceChunksBytes = TraceChunks<BytesData>;
 
 #[cfg(test)]
 mod tests {

datadog-trace-utils/src/tracer_payload.rs

@@ -1,7 +1,7 @@
 // Copyright 2024-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::span::{v04, v05, TinyData, TraceData};
+use crate::span::{v04, v05, BytesData, TraceData};
 use crate::trace_utils::collect_trace_chunks;
 use crate::{msgpack_decoder, trace_utils::cmp_send_data_payloads};
 use datadog_trace_protobuf::pb;
@@ -29,7 +29,7 @@ pub enum TraceChunks<T: TraceData> {
     V05((Vec<T::Text>, Vec<Vec<v05::Span>>)),
 }
 
-impl TraceChunks<TinyData> {
+impl TraceChunks<BytesData> {
     pub fn into_tracer_payload_collection(self) -> TracerPayloadCollection {
         match self {
             TraceChunks::V04(traces) => TracerPayloadCollection::V04(traces),
@@ -222,7 +222,7 @@ impl TraceChunkProcessor for DefaultTraceChunkProcessor {
 pub fn decode_to_trace_chunks(
     data: tinybytes::Bytes,
     encoding_type: TraceEncoding,
-) -> Result<(TraceChunks<TinyData>, usize), anyhow::Error> {
+) -> Result<(TraceChunks<BytesData>, usize), anyhow::Error> {
     let (data, size) = match encoding_type {
         TraceEncoding::V04 => msgpack_decoder::v04::from_bytes(data),
         TraceEncoding::V05 => msgpack_decoder::v05::from_bytes(data),