ref: impl TryFrom<&[u8]> for TraceId (#4759)

This means we can read `TraceId`s from bytes directly instead of first
hex encoding them and then parsing them again.

Author: loewenheim

relay-event-schema/src/protocol/contexts/trace.rs

@@ -1,6 +1,5 @@
 use relay_protocol::{
-    Annotated, Array, Empty, Error, ErrorKind, FromValue, IntoValue, Object, SkipSerialization,
-    Value,
+    Annotated, Array, Empty, Error, FromValue, IntoValue, Object, SkipSerialization, Value,
 };
 use serde::{Serialize, Serializer};
 use std::fmt;
@@ -29,23 +28,25 @@ use crate::protocol::{OperationType, OriginType, SpanData, SpanLink, SpanStatus}
 #[derive(Clone, Copy, Default, PartialEq, Empty, ProcessValue)]
 pub struct TraceId(Uuid);
 
-impl TraceId {
-    pub fn parse_str(input: &str) -> Result<TraceId, Error> {
-        Self::from_str(input)
-    }
-}
-
 relay_common::impl_str_serde!(TraceId, "a trace identifier");
 
 impl FromStr for TraceId {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Uuid::parse_str(s).map(Into::into).map_err(|_| {
-            Error::with(ErrorKind::InvalidData, |e| {
-                e.insert("reason", "the trace id is not valid");
-            })
-        })
+        Uuid::parse_str(s)
+            .map(Into::into)
+            .map_err(|_| Error::invalid("the trace id is not valid"))
+    }
+}
+
+impl TryFrom<&[u8]> for TraceId {
+    type Error = Error;
+
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        let uuid =
+            Uuid::from_slice(value).map_err(|_| Error::invalid("the trace id is not valid"))?;
+        Ok(Self(uuid))
     }
 }
 

relay-ourlogs/src/ourlog.rs

@@ -36,7 +36,7 @@ pub fn otel_to_sentry_log(otel_log: OtelLog) -> Result<OurLog, Error> {
         ..
     } = otel_log;
     let span_id = SpanId(hex::encode(span_id));
-    let trace_id: TraceId = hex::encode(trace_id).parse()?;
+    let trace_id = TraceId::try_from(trace_id.as_slice())?;
     let timestamp = Utc.timestamp_nanos(time_unix_nano as i64);
     let body = body
         .and_then(|v| v.value)

relay-spans/src/otel_to_sentry_v2.rs

@@ -47,7 +47,7 @@ pub fn otel_to_sentry_span(otel_span: OtelSpan) -> Result<SentrySpanV2, Error> {
     let end_timestamp = Utc.timestamp_nanos(end_time_unix_nano as i64);
 
     let span_id: SpanId = hex::encode(span_id).parse()?;
-    let trace_id: TraceId = hex::encode(trace_id).parse()?;
+    let trace_id = TraceId::try_from(trace_id.as_slice())?;
     let parent_span_id = match parent_span_id.as_slice() {
         &[] => None,
         _ => Some(hex::encode(parent_span_id).parse()?),