remove attributes instead of just type/value

Author: Dav1dde

relay-server/src/services/processor/ourlog.rs

@@ -154,13 +154,20 @@ fn process_attribute_types(ourlog: &mut OurLog) {
             (Annotated(Some(Double), _), Annotated(Some(Value::U64(_)), _)) => (),
             (Annotated(Some(Double), _), Annotated(Some(Value::F64(_)), _)) => (),
             (Annotated(Some(String), _), Annotated(Some(Value::String(_)), _)) => (),
-            (Annotated(ty_opt @ Some(Unknown(_)), ty_meta), _) => {
-                ty_meta.add_error(ErrorKind::InvalidData);
-                ty_meta.set_original_value(ty_opt.take());
+            // Note: currently the mapping to Kafka requires that invalid or unknown combinations
+            // of types and values are removed from the mapping.
+            //
+            // Usually Relay would only modify the offending values, but for now, until there
+            // is better support in the pipeline here, we need to remove the entire attribute.
+            (Annotated(Some(Unknown(_)), _), _) => {
+                let original = attribute.value_mut().take();
+                attribute.meta_mut().add_error(ErrorKind::InvalidData);
+                attribute.meta_mut().set_original_value(original);
             }
-            (Annotated(Some(_), _), Annotated(value @ Some(_), value_meta)) => {
-                value_meta.add_error(ErrorKind::InvalidData);
-                value_meta.set_original_value(value.take());
+            (Annotated(Some(_), _), Annotated(Some(_), _)) => {
+                let original = attribute.value_mut().take();
+                attribute.meta_mut().add_error(ErrorKind::InvalidData);
+                attribute.meta_mut().set_original_value(original);
             }
             (Annotated(None, _), _) | (_, Annotated(None, _)) => {
                 let original = attribute.value_mut().take();

tests/integration/test_ourlogs.py

@@ -152,6 +152,7 @@ def test_ourlog_extraction_with_sentry_logs(
                 "sentry.severity_text": {"value": "info", "type": "string"},
                 "unknown_type": {"value": "info", "type": "unknown"},
                 "broken_type": {"value": "info", "type": "not_a_real_type"},
+                "mismatched_type": {"value": "some string", "type": "boolean"},
                 "valid_string_with_other": {
                     "value": "test",
                     "type": "string",