diff --git a/relay/setup/static.CALLSITE.html b/relay/setup/static.CALLSITE.html index 911e6cbf01..ff41474ed0 100644 --- a/relay/setup/static.CALLSITE.html +++ b/relay/setup/static.CALLSITE.html @@ -1 +1 @@ -CALLSITE in relay::setup - Rust

Static relay::setup::CALLSITE

source · 
static CALLSITE: DefaultCallsite
\ No newline at end of file +CALLSITE in relay::setup - Rust

Static relay::setup::CALLSITE

source · 
static CALLSITE: DefaultCallsite
\ No newline at end of file diff --git a/src/relay_server/metrics_extraction/spans/mod.rs.html b/src/relay_server/metrics_extraction/spans/mod.rs.html index 39809c493d..35e84e75d8 100644 --- a/src/relay_server/metrics_extraction/spans/mod.rs.html +++ b/src/relay_server/metrics_extraction/spans/mod.rs.html @@ -1087,6 +1087,15 @@ 1087 1088 1089 +1090 +1091 +1092 +1093 +1094 +1095 +1096 +1097 +1098 
use std::collections::BTreeMap;
 
 use itertools::Itertools;
@@ -1211,18 +1220,33 @@
                 span_tags.insert(SpanTagKey::Module, module.to_owned());
             }
 
+            let scrubbed_description = span
+                .data
+                .value()
+                .and_then(|data| data.get("description.scrubbed"))
+                .and_then(|value| value.as_str());
+
             // TODO(iker): we're relying on the existance of `http.method`
             // or `db.operation`. This is not guaranteed, and we'll need to
             // parse the span description in that case.
-            let action = match span_module {
-                Some("http") => span
+            let action = match (span_module, span_op.as_str(), scrubbed_description) {
+                (Some("http"), _, _) => span
                     .data
                     .value()
                     // TODO(iker): some SDKs extract this as method
                     .and_then(|v| v.get("http.method"))
                     .and_then(|method| method.as_str())
                     .map(|s| s.to_uppercase()),
-                Some("db") => {
+                (_, "db.redis", Some(desc)) => {
+                    // This only works as long as redis span descriptions contain the command + " *"
+                    let command = desc.replace(" *", "");
+                    if command.is_empty() {
+                        None
+                    } else {
+                        Some(command)
+                    }
+                }
+                (Some("db"), _, _) => {
                     let action_from_data = span
                         .data
                         .value()
@@ -1263,12 +1287,6 @@
                 }
             }
 
-            let scrubbed_description = span
-                .data
-                .value()
-                .and_then(|data| data.get("description.scrubbed"))
-                .and_then(|value| value.as_str());
-
             let sanitized_description = sanitized_span_description(
                 scrubbed_description,
                 span_module,