ref(ourlogs): Stop ingesting sentry.severity_number

CHANGELOG.md

@@ -15,6 +15,7 @@
 - Deprecate old AI monitoring attributes. ([#4960](https://github.com/getsentry/relay/pull/4960))
 - Normalize legacy `ai.*` attributes to `gen_ai.*` names. ([#4924](https://github.com/getsentry/relay/pull/4924))
 - Force the routing key to be random instead of letting Kafka handle the randomization. ([#4974](https://github.com/getsentry/relay/pull/4974))
+- Stop extracting the `sentry.severity_number` attribute for logs. ([#4989](https://github.com/getsentry/relay/pull/4989))
 - Stop extracting the `sentry.trace_flags` attribute for logs. ([#4988](https://github.com/getsentry/relay/pull/4988))
 - Add Jwm to the supported image types. ([#4975](https://github.com/getsentry/relay/pull/4975))
 

relay-ourlogs/src/ourlog.rs

@@ -134,10 +134,6 @@ pub fn ourlog_merge_otel(ourlog: &mut Annotated<OurLog>, received_at: DateTime<U
             .map(|level| level.to_string())
             .unwrap_or_else(|| "info".to_owned()),
     );
-    attributes.insert(
-        "sentry.severity_number".to_owned(),
-        level_to_otel_severity_number(ourlog_value.level.value().cloned()),
-    );
     attributes.insert(
         "sentry.timestamp_nanos".to_owned(),
         timestamp_nanos.to_string(),
@@ -149,20 +145,6 @@ pub fn ourlog_merge_otel(ourlog: &mut Annotated<OurLog>, received_at: DateTime<U
     );
 }
 
-fn level_to_otel_severity_number(level: Option<OurLogLevel>) -> i64 {
-    match level {
-        Some(OurLogLevel::Trace) => 1,
-        Some(OurLogLevel::Debug) => 5,
-        Some(OurLogLevel::Info) => 9,
-        Some(OurLogLevel::Warn) => 13,
-        Some(OurLogLevel::Error) => 17,
-        Some(OurLogLevel::Fatal) => 21,
-        // 0 is the default value.
-        // https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/68e1d6cd94bfca9bdf725327d4221f97ce0e0564/pkg/stanza/docs/types/severity.md
-        _ => 0,
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -433,10 +415,6 @@ mod tests {
               "type": "string",
               "value": "946684800000000000"
             },
-            "sentry.severity_number": {
-              "type": "integer",
-              "value": 9
-            },
             "sentry.severity_text": {
               "type": "string",
               "value": "info"
@@ -454,39 +432,6 @@ mod tests {
         "###);
     }
 
-    #[test]
-    fn ourlog_merge_otel_log_with_unknown_severity_number() {
-        let json = r#"{
-            "timestamp": 946684800.0,
-            "level": "abc",
-            "trace_id": "5B8EFFF798038103D269B633813FC60C",
-            "span_id": "EEE19B7EC3C1B174",
-            "body": "Example log record",
-            "attributes": {
-                "foo": {
-                    "value": "9",
-                    "type": "string"
-                }
-            }
-        }"#;
-
-        let mut data = Annotated::<OurLog>::from_json(json).unwrap();
-        ourlog_merge_otel(
-            &mut data,
-            DateTime::from_timestamp_nanos(946684800000000000),
-        );
-        assert_eq!(
-            data.value()
-                .unwrap()
-                .attributes
-                .value()
-                .unwrap()
-                .get_attribute("sentry.severity_number")
-                .unwrap(),
-            &Attribute::new(AttributeType::Integer, Value::I64(0)),
-        );
-    }
-
     #[test]
     #[allow(deprecated)]
     fn ourlog_merge_otel_log_with_timestamp() {
@@ -518,10 +463,6 @@ mod tests {
               "type": "string",
               "value": "946684800000000000"
             },
-            "sentry.severity_number": {
-              "type": "integer",
-              "value": 0
-            },
             "sentry.severity_text": {
               "type": "string",
               "value": "info"

tests/integration/test_ourlogs.py

@@ -244,7 +244,6 @@ def test_ourlog_meta_attributes(
             "sentry.body": {"stringValue": "oops, not again"},
             "sentry.browser.name": {"stringValue": "Python Requests"},
             "sentry.browser.version": {"stringValue": "2.32"},
-            "sentry.severity_number": {"intValue": "17"},
             "sentry.severity_text": {"stringValue": "error"},
             "sentry.span_id": {"stringValue": "eee19b7ec3c1b175"},
             **timestamps(ts),
@@ -305,7 +304,6 @@ def test_ourlog_extraction_with_sentry_logs(
             "span_id": "eee19b7ec3c1b174",
             "level": "info",
             "body": "Example log record",
-            "severity_number": 10,
             "attributes": {
                 "boolean.attribute": {"value": True, "type": "boolean"},
                 "integer.attribute": {"value": 42, "type": "integer"},
@@ -333,7 +331,6 @@ def test_ourlog_extraction_with_sentry_logs(
                 "sentry.body": {"stringValue": "This is really bad"},
                 "sentry.browser.name": {"stringValue": "Python Requests"},
                 "sentry.browser.version": {"stringValue": "2.32"},
-                "sentry.severity_number": {"intValue": "17"},
                 "sentry.severity_text": {"stringValue": "error"},
                 "sentry.span_id": {"stringValue": "eee19b7ec3c1b175"},
                 **timestamps(ts),
@@ -360,7 +357,6 @@ def test_ourlog_extraction_with_sentry_logs(
                 "sentry.body": {"stringValue": "Example log record"},
                 "sentry.browser.name": {"stringValue": "Python Requests"},
                 "sentry.browser.version": {"stringValue": "2.32"},
-                "sentry.severity_number": {"intValue": "9"},
                 "sentry.severity_text": {"stringValue": "info"},
                 "sentry.span_id": {"stringValue": "eee19b7ec3c1b174"},
                 "string.attribute": {"stringValue": "some string"},
@@ -433,7 +429,6 @@ def test_ourlog_extraction_with_sentry_logs_with_missing_fields(
             "sentry.body": {"stringValue": "Example log record 2"},
             "sentry.browser.name": {"stringValue": "Python Requests"},
             "sentry.browser.version": {"stringValue": "2.32"},
-            "sentry.severity_number": {"intValue": "13"},
             "sentry.severity_text": {"stringValue": "warn"},
             **timestamps(ts),
         },
@@ -559,7 +554,6 @@ def test_browser_name_version_extraction(
             "sentry.body": {"stringValue": "This is really bad"},
             "sentry.browser.name": {"stringValue": expected_browser_name},
             "sentry.browser.version": {"stringValue": expected_browser_version},
-            "sentry.severity_number": {"intValue": "17"},
             "sentry.severity_text": {"stringValue": "error"},
             "sentry.span_id": {"stringValue": "eee19b7ec3c1b175"},
             **timestamps(ts),