fix(metrics-extraction): Add defaulting of required attributes in light normalization

CHANGELOG.md

@@ -5,6 +5,7 @@
 **Internal**:
 
 - Proactively move on-disk spool to memory. ([#2949](https://github.com/getsentry/relay/pull/2949))
+- Default missing `Event.platform` and `Event.level` fields during light normalization. ([#2961](https://github.com/getsentry/relay/pull/2961))
 
 **Bug Fixes**:
 

relay-event-normalization/src/event.rs

@@ -19,8 +19,8 @@ use relay_event_schema::processor::{
 };
 use relay_event_schema::protocol::{
     AsPair, Context, ContextInner, Contexts, DeviceClass, Event, EventType, Exception, Headers,
-    IpAddr, LogEntry, Measurement, Measurements, NelContext, Request, SpanAttribute, SpanStatus,
-    Tags, User,
+    IpAddr, Level, LogEntry, Measurement, Measurements, NelContext, Request, SpanAttribute,
+    SpanStatus, Tags, User,
 };
 use relay_protocol::{Annotated, Empty, Error, ErrorKind, Meta, Object, Value};
 use smallvec::SmallVec;
@@ -253,6 +253,7 @@ fn normalize(event: &mut Event, meta: &mut Meta, config: &NormalizationConfig) -
     normalize_logentry(&mut event.logentry, meta);
     normalize_release_dist(event); // dist is a tag extracted along with other metrics from transactions
     normalize_event_tags(event); // Tags are added to every metric
+    normalize_platform_and_level(event);
 
     // TODO: Consider moving to store normalization
     if config.device_class_synthesis_config {
@@ -455,6 +456,18 @@ fn normalize_dist(distribution: &mut Annotated<String>) {
     });
 }
 
+/// Defaults the `platform` and `level` required attributes.
+fn normalize_platform_and_level(event: &mut Event) {
+    // The defaulting behavior, was inherited from `StoreNormalizeProcessor` and it's put here since only light
+    // normalization happens before metrics extraction and we want the metrics extraction pipeline to already work
+    // on some normalized data.
+    event.platform.get_or_insert_with(|| "other".to_string());
+    event.level.get_or_insert_with(|| match event.ty.value() {
+        Some(EventType::Transaction) => Level::Info,
+        _ => Level::Error,
+    });
+}
+
 /// Validates the timestamp range and sets a default value.
 fn normalize_timestamps(
     event: &mut Event,
@@ -1111,6 +1124,48 @@ mod tests {
         assert_eq!(dist.value(), None);
     }
 
+    #[test]
+    fn test_normalize_platform_and_level_with_transaction_event() {
+        let json = r#"
+        {
+            "type": "transaction"
+        }
+        "#;
+
+        let mut event = Annotated::<Event>::from_json(json).unwrap().0.unwrap();
+
+        normalize_platform_and_level(&mut event);
+
+        insta::assert_ron_snapshot!(SerializableAnnotated(&Annotated::new(event)), {}, @r###"
+        {
+          "level": "info",
+          "type": "transaction",
+          "platform": "other",
+        }
+        "###);
+    }
+
+    #[test]
+    fn test_normalize_platform_and_level_with_error_event() {
+        let json = r#"
+        {
+            "type": "error"
+        }
+        "#;
+
+        let mut event = Annotated::<Event>::from_json(json).unwrap().0.unwrap();
+
+        normalize_platform_and_level(&mut event);
+
+        insta::assert_ron_snapshot!(SerializableAnnotated(&Annotated::new(event)), {}, @r###"
+        {
+          "level": "error",
+          "type": "error",
+          "platform": "other",
+        }
+        "###);
+    }
+
     #[test]
     fn test_computed_measurements() {
         let json = r#"

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

@@ -1074,6 +1074,7 @@ mod tests {
     #[test]
     fn test_field_value_provider_event_filled() {
         let event = Event {
+            level: Annotated::new(Level::Info),
             release: Annotated::new(LenientString("1.1.1".to_owned())),
             environment: Annotated::new("prod".to_owned()),
             user: Annotated::new(User {
@@ -1146,6 +1147,8 @@ mod tests {
             ..Default::default()
         };
 
+        assert_eq!(Some(Val::String("info")), event.get_value("event.level"));
+
         assert_eq!(Some(Val::String("1.1.1")), event.get_value("event.release"));
         assert_eq!(
             Some(Val::String("prod")),

tests/integration/fixtures/security_report/csp.no_processing.output.json

@@ -22,10 +22,12 @@
   },
   "culprit": "default-src self",
   "environment": "production",
+  "level": "error",
   "logentry": {
     "formatted": "Blocked 'default-src' from 'evilhackerscripts.com'"
   },
   "logger": "csp",
+  "platform": "other",
   "release": "01d5c3165d9fbc5c8bdcf9550a1d6793a80fc02b",
   "request": {
     "headers": [

tests/integration/fixtures/security_report/csp_chrome.no_processing.output.json

@@ -23,10 +23,12 @@
   },
   "culprit": "style-src cdn.example.com",
   "environment": "production",
+  "level": "error",
   "logentry": {
     "formatted": "Blocked 'style' from 'localhost:8000'"
   },
   "logger": "csp",
+  "platform": "other",
   "release": "01d5c3165d9fbc5c8bdcf9550a1d6793a80fc02b",
   "request": {
     "headers": [

tests/integration/fixtures/security_report/csp_chrome_blocked_asset.no_processing.output.json

@@ -23,10 +23,12 @@
   },
   "culprit": "style-src cdn.example.com",
   "environment": "production",
+  "level": "error",
   "logentry": {
     "formatted": "Blocked 'style' from 'notlocalhost:8000'"
   },
   "logger": "csp",
+  "platform": "other",
   "release": "01d5c3165d9fbc5c8bdcf9550a1d6793a80fc02b",
   "request": {
     "headers": [

tests/integration/fixtures/security_report/csp_firefox_blocked_asset.no_processing.output.json

@@ -22,10 +22,12 @@
   },
   "culprit": "style-src http://cdn.example.com",
   "environment": "production",
+  "level": "error",
   "logentry": {
     "formatted": "Blocked 'style' from 'notlocalhost:8000'"
   },
   "logger": "csp",
+  "platform": "other",
   "release": "01d5c3165d9fbc5c8bdcf9550a1d6793a80fc02b",
   "request": {
     "headers": [

tests/integration/fixtures/security_report/expect_ct.no_processing.output.json

@@ -13,10 +13,12 @@
     }
   },
   "culprit": "www.example.com",
+  "level": "error",
   "logentry": {
     "formatted": "Expect-CT failed for 'www.example.com'"
   },
   "logger": "csp",
+  "platform": "other",
   "release": "01d5c3165d9fbc5c8bdcf9550a1d6793a80fc02b",
   "environment": "production",
   "request": {

tests/integration/fixtures/security_report/expect_staple.no_processing.output.json

@@ -13,10 +13,12 @@
     }
   },
   "culprit": "www.example.com",
+  "level": "error",
   "logentry": {
     "formatted": "Expect-Staple failed for 'www.example.com'"
   },
   "logger": "csp",
+  "platform": "other",
   "release": "01d5c3165d9fbc5c8bdcf9550a1d6793a80fc02b",
   "environment": "production",
   "request": {

tests/integration/fixtures/security_report/hpkp.no_processing.output.json

@@ -12,10 +12,12 @@
       "version": ">=10"
     }
   },
+  "level": "error",
   "logentry": {
     "formatted": "Public key pinning validation failed for 'www.example.com'"
   },
   "logger": "csp",
+  "platform": "other",
   "release": "01d5c3165d9fbc5c8bdcf9550a1d6793a80fc02b",
   "environment": "production",
   "request": {