more test fixes and snapshot updates

Author: Lms24

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

@@ -206,12 +206,12 @@ mod tests {
   },
   "links": [
     {
-      "trace_id": "4c79f60c11214eb38604f4ae0781bfb2",
-      "span_id": "fa90fdead5f74052",
-      "parent_span_id": "fa90fdead5f74053",
+      "trace_id": "3c79f60c11214eb38604f4ae0781bfb2",
+      "span_id": "ea90fdead5f74052",
+      "parent_span_id": "ea90fdead5f74053",
       "sampled": true,
       "attributes": {
-          "sentry.link.type": "previous_trace"
+        "sentry.link.type": "previous_trace"
       }
     }
   ],
@@ -250,9 +250,9 @@ mod tests {
                 ..Default::default()
             }),
             links: Annotated::new(Array::from(vec![Annotated::new(SpanLink {
-                trace_id: Annotated::new(TraceId("4c79f60c11214eb38604f4ae0781bfb2".into())),
-                span_id: Annotated::new(SpanId("fa90fdead5f74052".into())),
-                parent_span_id: Annotated::new(SpanId("fa90fdead5f74052".into())),
+                trace_id: Annotated::new(TraceId("3c79f60c11214eb38604f4ae0781bfb2".into())),
+                span_id: Annotated::new(SpanId("ea90fdead5f74052".into())),
+                parent_span_id: Annotated::new(SpanId("ea90fdead5f74053".into())),
                 sampled: Annotated::new(true),
                 attributes: Annotated::new({
                     let mut map: std::collections::BTreeMap<String, Annotated<Value>> =

relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__extract_span_metrics_mobile.snap

@@ -28,6 +28,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
             origin: ~,
             profile_id: ~,
             data: ~,
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -185,6 +186,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 lcp_url: ~,
                 other: {},
             },
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -286,6 +288,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
             origin: ~,
             profile_id: ~,
             data: ~,
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -366,6 +369,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
             origin: ~,
             profile_id: ~,
             data: ~,
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -446,6 +450,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
             origin: ~,
             profile_id: ~,
             data: ~,
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -526,6 +531,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
             origin: ~,
             profile_id: ~,
             data: ~,
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -677,6 +683,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 lcp_url: ~,
                 other: {},
             },
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -828,6 +835,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 lcp_url: ~,
                 other: {},
             },
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -908,6 +916,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
             origin: ~,
             profile_id: ~,
             data: ~,
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -1059,6 +1068,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 lcp_url: ~,
                 other: {},
             },
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",
@@ -1210,6 +1220,7 @@ expression: "(&event.value().unwrap().spans, metrics.project_metrics)"
                 lcp_url: ~,
                 other: {},
             },
+            links: ~,
             sentry_tags: SentryTags {
                 release: "1.2.3",
                 user: "id:user123",

relay-server/src/metrics_extraction/transactions/mod.rs

@@ -616,7 +616,7 @@ mod tests {
         };
 
         let extracted = extractor.extract(event.value().unwrap()).unwrap();
-        insta::assert_debug_snapshot!(event.value().unwrap().spans, @r###"
+        insta::assert_debug_snapshot!(event.value().unwrap().spans, @r#"
         [
             Span {
                 timestamp: Timestamp(
@@ -644,6 +644,7 @@ mod tests {
                 origin: ~,
                 profile_id: ~,
                 data: ~,
+                links: ~,
                 sentry_tags: ~,
                 received: ~,
                 measurements: ~,
@@ -652,7 +653,7 @@ mod tests {
                 other: {},
             },
         ]
-        "###);
+        "#);
 
         insta::assert_debug_snapshot!(extracted.project_metrics, @r###"
         [

relay-spans/src/span.rs

@@ -537,7 +537,7 @@ mod tests {
         let otel_span: OtelSpan = serde_json::from_str(json).unwrap();
         let span_from_otel = otel_to_sentry_span(otel_span);
 
-        insta::assert_debug_snapshot!(span_from_otel, @r###"
+        insta::assert_debug_snapshot!(span_from_otel, @r#"
         Span {
             timestamp: Timestamp(
                 1970-01-01T00:02:03.500Z,
@@ -639,14 +639,15 @@ mod tests {
                 lcp_url: ~,
                 other: {},
             },
+            links: ~,
             sentry_tags: ~,
             received: ~,
             measurements: ~,
             platform: "php",
             was_transaction: ~,
             other: {},
         }
-        "###);
+        "#);
     }
 
     #[test]