Review fixes

Author: sl0thentr0py

relay-server/src/endpoints/spans.rs

@@ -25,34 +25,35 @@ where
     B::Data: Send + Into<Bytes>,
     B::Error: Into<axum::BoxError>,
 {
-    let mut trace = None;
-    if content_type.as_ref().starts_with("application/json") {
+    let trace = if content_type.as_ref().starts_with("application/json") {
         let json: Json<TracesData> = request.extract().await?;
-        trace = Some(json.0)
+        Some(json.0)
     } else if content_type.as_ref().starts_with("application/x-protobuf") {
         let protobuf: Protobuf<TracesData> = request.extract().await?;
-        trace = Some(protobuf.0)
-    }
+        Some(protobuf.0)
+    } else {
+        None
+    };
 
-    if let Some(trace) = trace {
-        let mut envelope = Envelope::from_request(None, meta);
-        for resource_span in trace.resource_spans {
-            for scope_span in resource_span.scope_spans {
-                for span in scope_span.spans {
-                    let Ok(payload) = serde_json::to_vec(&span) else {
-                        continue;
-                    };
-                    let mut item = Item::new(ItemType::OtelSpan);
-                    item.set_payload(ContentType::Json, payload);
-                    envelope.add_item(item);
-                }
+    let Some(trace) = trace else {
+        return Ok(StatusCode::UNSUPPORTED_MEDIA_TYPE);
+    };
+
+    let mut envelope = Envelope::from_request(None, meta);
+    for resource_span in trace.resource_spans {
+        for scope_span in resource_span.scope_spans {
+            for span in scope_span.spans {
+                let Ok(payload) = serde_json::to_vec(&span) else {
+                    continue;
+                };
+                let mut item = Item::new(ItemType::OtelSpan);
+                item.set_payload(ContentType::Json, payload);
+                envelope.add_item(item);
             }
         }
-        common::handle_envelope(&state, envelope).await?;
-        Ok(StatusCode::ACCEPTED)
-    } else {
-        Ok(StatusCode::UNSUPPORTED_MEDIA_TYPE)
     }
+    common::handle_envelope(&state, envelope).await?;
+    Ok(StatusCode::ACCEPTED)
 }
 
 pub fn route<B>(config: &Config) -> MethodRouter<ServiceState, B>

relay-spans/src/lib.rs

@@ -14,4 +14,3 @@ pub use opentelemetry_proto::tonic::trace::v1 as OtelTrace;
 mod otel_to_sentry_tags;
 mod span;
 mod status_codes;
-mod utils;

relay-spans/src/span.rs

@@ -299,26 +299,4 @@ mod tests {
         let event_span: EventSpan = otel_span.to_sentry_span();
         assert_eq!(event_span.exclusive_time, Annotated::new(0.0788));
     }
-
-    #[ignore = "not supported with the new otel structs"]
-    #[test]
-    fn parse_span_with_timestamps_as_strings() {
-        let json = r#"{
-            "traceId": "89143b0763095bd9c9955e8175d1fb23",
-            "spanId": "e342abb1214ca181",
-            "parentSpanId": "0c7a7dea069bf5a6",
-            "name": "middleware - fastify -> @fastify/multipart",
-            "kind": 1,
-            "startTimeUnixNano": "1697620454980000000",
-            "endTimeUnixNano": "1697620454980078800"
-        }"#;
-        let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
-        let event_span: EventSpan = otel_span.to_sentry_span();
-        assert_eq!(
-            event_span.start_timestamp,
-            Annotated::new(Timestamp(
-                DateTime::<Utc>::from_timestamp(1697620454, 980000000).unwrap()
-            ))
-        );
-    }
 }