fix(spans): Extract http status code from span data when provided as …

…int (#3491)

Some SDKs send this field as an integer, which gets converted to `None`
by the `v.as_str()` call.

I added code to catch if the value is an integer and convert it to a
string. In terms of testing, I tested the function which extracts the
status, but also added sample spans to the mobile event to generate a
snapshot validating both string or integers are extracted.

The issue was identified as a difference between Android and iOS events.

CHANGELOG.md

@@ -9,6 +9,7 @@
 **Bug fixes:**
 
 - Respect country code TLDs when scrubbing span tags. ([#3458](https://github.com/getsentry/relay/pull/3458))
+- Extract HTTP status code from span data when sent as integers. ([#3491](https://github.com/getsentry/relay/pull/3491))
 
 **Features**:
 

relay-event-normalization/src/normalize/utils.rs

@@ -6,6 +6,7 @@
 use std::f64::consts::SQRT_2;
 
 use relay_event_schema::protocol::{Event, ResponseContext, Span, TraceContext, User};
+use relay_protocol::Value;
 
 /// Used to decide when to extract mobile-specific tags.
 pub const MOBILE_SDKS: [&str; 4] = [
@@ -31,10 +32,14 @@ pub fn http_status_code_from_span(span: &Span) -> Option<String> {
         .data
         .value()
         .and_then(|data| data.http_response_status_code.value())
-        .and_then(|v| v.as_str())
-        .map(|v| v.to_string())
+        .map(|v| match v {
+            Value::String(s) => Some(s.as_str().to_owned()),
+            Value::I64(i) => Some(i.to_string()),
+            Value::U64(u) => Some(u.to_string()),
+            _ => None,
+        })
     {
-        return Some(status_code);
+        return status_code;
     }
 
     // For SDKs which put the HTTP status code into the span tags.
@@ -194,8 +199,8 @@ pub fn calculate_cdf_score(value: f64, p10: f64, p50: f64) -> f64 {
 
 #[cfg(test)]
 mod tests {
-    use crate::utils::get_event_user_tag;
-    use relay_event_schema::protocol::User;
+    use crate::utils::{get_event_user_tag, http_status_code_from_span};
+    use relay_event_schema::protocol::{Span, User};
     use relay_protocol::Annotated;
 
     #[test]
@@ -241,4 +246,22 @@ mod tests {
 
         assert!(get_event_user_tag(&user).is_none());
     }
+
+    #[test]
+    fn test_extracts_http_status_code_when_int() {
+        let span = Annotated::<Span>::from_json(
+            r#"{
+                "data": {
+                    "http.response.status_code": 400
+                }
+            }"#,
+        )
+        .unwrap()
+        .into_value()
+        .unwrap();
+
+        let result = http_status_code_from_span(&span);
+
+        assert_eq!(result, Some("400".to_string()));
+    }
 }

relay-server/src/metrics_extraction/event.rs

@@ -1240,6 +1240,28 @@ mod tests {
                     "start_timestamp": 1597976300.0000000,
                     "timestamp": 1597976303.0000000,
                     "trace_id": "ff62a8b040f340bda5d830223def1d81"
+                },
+                {
+                    "op": "http.client",
+                    "description": "www.example.com",
+                    "span_id": "bd429c44b67a3eb2",
+                    "start_timestamp": 1597976300.0000000,
+                    "timestamp": 1597976303.0000000,
+                    "trace_id": "ff62a8b040f340bda5d830223def1d81",
+                    "data": {
+                        "http.response.status_code": "200"
+                    }
+                },
+                {
+                    "op": "http.client",
+                    "description": "www.example.com",
+                    "span_id": "bd429c44b67a3eb2",
+                    "start_timestamp": 1597976300.0000000,
+                    "timestamp": 1597976303.0000000,
+                    "trace_id": "ff62a8b040f340bda5d830223def1d81",
+                    "data": {
+                        "http.response.status_code": 200
+                    }
                 }
             ]
         }
@@ -1373,7 +1395,7 @@ mod tests {
             .filter(|b| &*b.name == "c:spans/usage@none")
             .collect::<Vec<_>>();
 
-        let expected_usage = 10; // We count all spans received by Relay, plus one for the transaction
+        let expected_usage = 12; // We count all spans received by Relay, plus one for the transaction
         assert_eq!(usage_metrics.len(), expected_usage);
         for m in usage_metrics {
             assert!(m.tags.is_empty());