fix(spans): Use db.system for SQL parsing

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - Remove profile_id from context when no profile is in the envelope. ([#2523](https://github.com/getsentry/relay/pull/2523))
 - Fix reporting of Relay's crashes to Sentry. The `crash-handler` feature did not enable the crash reporter and uploads of crashes were broken. ([#2532](https://github.com/getsentry/relay/pull/2532))
+- Use correct field to pick SQL parser for span normalization. ([#2536](https://github.com/getsentry/relay/pull/2536))
 
 **Internal**:
 

relay-event-normalization/src/normalize/span/description/mod.rs

@@ -34,7 +34,7 @@ pub(crate) fn scrub_span_description(span: &mut Span, rules: &Vec<SpanDescriptio
             ("db", _) => sql::scrub_queries(
                 span.data
                     .value()
-                    .and_then(|d| d.get("system"))
+                    .and_then(|d| d.get("db.system"))
                     .and_then(|v| v.as_str()),
                 description,
             ),
@@ -217,7 +217,6 @@ fn apply_span_rename_rules(span: &mut Span, rules: &Vec<SpanDescriptionRule>) ->
 
 #[cfg(test)]
 mod tests {
-
     use similar_asserts::assert_eq;
 
     use super::*;
@@ -428,4 +427,30 @@ mod tests {
         "resource.css",
         ""
     );
+
+    #[test]
+    fn informed_sql_parser() {
+        let json = r#"
+            {
+                "description": "SELECT \"not an identifier\"",
+                "span_id": "bd2eb23da2beb459",
+                "start_timestamp": 1597976393.4619668,
+                "timestamp": 1597976393.4718769,
+                "trace_id": "ff62a8b040f340bda5d830223def1d81",
+                "op": "db",
+                "data": {"db.system": "mysql"}
+            }
+        "#;
+
+        let mut span = Annotated::<Span>::from_json(json).unwrap();
+        let span = span.value_mut().as_mut().unwrap();
+        scrub_span_description(span, &vec![]);
+        let scrubbed = span
+            .data
+            .value()
+            .and_then(|d| d.get("description.scrubbed"))
+            .and_then(|v| v.value())
+            .and_then(|v| v.as_str());
+        assert_eq!(scrubbed, Some("SELECT %s"));
+    }
 }