Don't filter away u64s smaller than i64max, and add integ test.

Author: elramen

relay-event-normalization/src/eap/mod.rs

@@ -123,10 +123,12 @@ pub fn normalize_attribute_types(attributes: &mut Annotated<Attributes>) {
         match (&mut inner.value.ty, &mut inner.value.value) {
             (Annotated(Some(Boolean), _), Annotated(Some(Value::Bool(_)), _)) => (),
             (Annotated(Some(Integer), _), Annotated(Some(Value::I64(_)), _)) => (),
-            (Annotated(Some(Integer), _), Annotated(Some(Value::U64(_)), _)) => {
-                attribute.meta_mut().add_error(ErrorKind::InvalidData);
-                let original = attribute.value_mut().take();
-                attribute.meta_mut().set_original_value(original);
+            (Annotated(Some(Integer), _), Annotated(Some(Value::U64(u)), _)) => {
+                if *u > i64::MAX as u64 {
+                    let original = attribute.value_mut().take();
+                    attribute.meta_mut().add_error(ErrorKind::InvalidData);
+                    attribute.meta_mut().set_original_value(original);
+                }
             }
             (Annotated(Some(Double), _), Annotated(Some(Value::I64(_)), _)) => (),
             (Annotated(Some(Double), _), Annotated(Some(Value::U64(_)), _)) => (),
@@ -770,7 +772,7 @@ mod tests {
                 "type": "integer",
                 "value": "abc"
             },
-            "invalid_int_i64": {
+            "invalid_int": {
                 "type": "integer",
                 "value": 9223372036854775808
             },
@@ -815,8 +817,8 @@ mod tests {
             "type": "double",
             "value": -42
           },
+          "invalid_int": null,
           "invalid_int_from_invalid_string": null,
-          "invalid_int_i64": null,
           "missing_type": null,
           "missing_value": null,
           "supported_array_double": {
@@ -876,25 +878,25 @@ mod tests {
             "some_other_field": "some_other_value"
           },
           "_meta": {
-            "invalid_int_from_invalid_string": {
+            "invalid_int": {
               "": {
                 "err": [
                   "invalid_data"
                 ],
                 "val": {
                   "type": "integer",
-                  "value": "abc"
+                  "value": 9223372036854775808
                 }
               }
             },
-            "invalid_int_i64": {
+            "invalid_int_from_invalid_string": {
               "": {
                 "err": [
                   "invalid_data"
                 ],
                 "val": {
                   "type": "integer",
-                  "value": 9223372036854775808
+                  "value": "abc"
                 }
               }
             },

tests/integration/test_spansv2.py

@@ -73,6 +73,8 @@ def test_spansv2_basic(
             "attributes": {
                 "foo": {"value": "bar", "type": "string"},
                 "array": {"value": ["foo", "bar"], "type": "array"},
+                "valid_int": {"value": 9223372036854775807, "type": "integer"},
+                "invalid_int": {"value": 9223372036854775808, "type": "integer"},
                 "invalid": {"value": True, "type": "string"},
                 "http.response_content_length": {"value": 17, "type": "integer"},
             },
@@ -96,6 +98,8 @@ def test_spansv2_basic(
             "foo": {"type": "string", "value": "bar"},
             "http.response_content_length": {"value": 17, "type": "integer"},
             "http.response.body.size": {"value": 17, "type": "integer"},
+            "valid_int": {"value": 9223372036854775807, "type": "integer"},
+            "invalid_int": None,
             "invalid": None,
             "sentry.browser.name": {"type": "string", "value": "Python Requests"},
             "sentry.browser.version": {"type": "string", "value": "2.32"},
@@ -118,12 +122,18 @@ def test_spansv2_basic(
         },
         "_meta": {
             "attributes": {
+                "invalid_int": {
+                    "": {
+                        "err": ["invalid_data"],
+                        "val": {"type": "integer", "value": 9223372036854775808},
+                    }
+                },
                 "invalid": {
                     "": {
                         "err": ["invalid_data"],
                         "val": {"type": "string", "value": True},
                     }
-                }
+                },
             }
         },
         "name": "some op",