test fixes

Author: thetruecpaul

py/tests/test_processing.py

@@ -119,17 +119,20 @@ def test_normalize_user_agent(must_normalize):
     )
 
     if must_normalize:
-        assert event["contexts"] == {
-            "browser": {
-                "browser": "Firefox 15.0.1",
-                "name": "Firefox",
-                "version": "15.0.1",
-                "type": "browser",
-            },
-            "client_os": {"name": "Ubuntu", "os": "Ubuntu", "type": "os"},
+        assert event["contexts"]["browser"] == {
+            "browser": "Firefox 15.0.1",
+            "name": "Firefox",
+            "version": "15.0.1",
+            "type": "browser",
+        }
+        assert event["contexts"]["client_os"] == {
+            "name": "Ubuntu",
+            "os": "Ubuntu",
+            "type": "os",
         }
+        assert set(event["contexts"].keys()) == {"browser", "client_os", "trace"}
     else:
-        assert "contexts" not in event
+        assert set(event["contexts"].keys()) == {"trace"}
 
 
 def test_validate_pii_selector():

relay-event-normalization/src/event.rs

@@ -3978,14 +3978,49 @@ mod tests {
             },
         );
 
-        insta::assert_ron_snapshot!(SerializableAnnotated(&event.contexts), {}, @r###"
+        insta::assert_ron_snapshot!(SerializableAnnotated(&event.contexts), {
+            ".event_id" => "[event-id]",
+            ".trace.trace_id" => "[trace-id]",
+            ".trace.span_id" => "[span-id]"
+        }, @r#"
         {
           "performance_score": {
             "score_profile_version": "beta",
             "type": "performancescore",
           },
+          "trace": {
+            "trace_id": "[trace-id]",
+            "span_id": "[span-id]",
+            "status": "unknown",
+            "exclusive_time": 5000.0,
+            "type": "trace",
+          },
+          "_meta": {
+            "trace": {
+              "span_id": {
+                "": Meta(Some(MetaInner(
+                  rem: [
+                    [
+                      "span_id.missing",
+                      s,
+                    ],
+                  ],
+                ))),
+              },
+              "trace_id": {
+                "": Meta(Some(MetaInner(
+                  rem: [
+                    [
+                      "trace_id.missing",
+                      s,
+                    ],
+                  ],
+                ))),
+              },
+            },
+          },
         }
-        "###);
+        "#);
         insta::assert_ron_snapshot!(SerializableAnnotated(&event.measurements), {}, @r###"
         {
           "inp": {