suggestions

Author: thetruecpaul

py/tests/test_processing.py

@@ -119,18 +119,16 @@ 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",
-        }
-        assert event["contexts"]["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",
+            },
+            "client_os": {"name": "Ubuntu", "os": "Ubuntu", "type": "os"},
+            "trace": pytest.mock.ANY,
         }
-        assert set(event["contexts"].keys()) == {"browser", "client_os", "trace"}
     else:
         assert set(event["contexts"].keys()) == {"trace"}
 

relay-event-schema/Cargo.toml

@@ -20,6 +20,7 @@ debugid = { workspace = true, features = ["serde"] }
 enumset = { workspace = true }
 minidump = { workspace = true }
 opentelemetry-proto = { workspace = true, features = ["gen-tonic", "trace"] }
+rand = { workspace = true }
 relay-common = { workspace = true }
 relay-conventions = { workspace = true }
 relay-base-schema = { workspace = true }
@@ -31,7 +32,6 @@ serde_json = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
 uuid = { workspace = true }
-rand.workspace = true
 
 [dev-dependencies]
 insta = { workspace = true }

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

@@ -171,14 +171,8 @@ relay_common::impl_str_serde!(SpanId, "a span identifier");
 
 impl SpanId {
     pub fn random() -> Self {
-        let mut span_bytes = [0u8; 8];
-        rand::rng().fill_bytes(&mut span_bytes);
-
-        if !span_bytes.iter().all(|&x| x == 0) {
-            Self(span_bytes)
-        } else {
-            Self([42u8; 8])
-        }
+        let value: u64 = rand::random_range(1..=u64::MAX);
+        Self(value.to_ne_bytes())
     }
 }