feat(spans): Extract release tag from the transaction to the span (#…

…2189)
getsentry · Jun 9, 2023 · dca9fb7 · dca9fb7
1 parent a013cca
commit dca9fb7
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 4 deletions.
diff --git a/relay-server/src/metrics_extraction/spans/mod.rs b/relay-server/src/metrics_extraction/spans/mod.rs
@@ -43,6 +43,13 @@ pub(crate) fn extract_span_metrics(
         return Err(ExtractMetricsError::InvalidTimestamp);
     }
 
+    // Collect data for the databag that isn't metrics
+    let mut databag = BTreeMap::new();
+
+    if let Some(release) = event.release.as_str() {
+        databag.insert("release".to_owned(), release.to_owned());
+    }
+
     // Collect the shared tags for all the metrics and spans on this transaction.
     let mut shared_tags = BTreeMap::new();
 
@@ -180,12 +187,18 @@ pub(crate) fn extract_span_metrics(
             // represent a risk for the indexers.
 
             // Even if we emit metrics, we want this info to be duplicated in every span.
-            span.data.get_or_insert_with(BTreeMap::new).extend(
-                span_tags
+            span.data.get_or_insert_with(BTreeMap::new).extend({
+                let it = span_tags
                     .clone()
                     .into_iter()
-                    .map(|(k, v)| (k, Annotated::new(Value::String(v)))),
-            );
+                    .map(|(k, v)| (k, Annotated::new(Value::String(v))));
+                it.chain(
+                    databag
+                        .clone()
+                        .into_iter()
+                        .map(|(k, v)| (k, Annotated::new(Value::String(v)))),
+                )
+            });
 
             if let Some(user) = event.user.value() {
                 if let Some(value) = get_eventuser_tag(user) {

diff --git a/...s/relay_server__metrics_extraction__transactions__tests__extract_transaction_metrics.snap b/...s/relay_server__metrics_extraction__transactions__tests__extract_transaction_metrics.snap
@@ -29,6 +29,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.op": String(
                 "react.mount",
             ),
@@ -70,6 +73,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.category": String(
                 "ui.react",
             ),
@@ -117,6 +123,9 @@ expression: event.value().unwrap().spans
             "http.method": String(
                 "PoSt",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "POST",
             ),
@@ -179,6 +188,9 @@ expression: event.value().unwrap().spans
             "http.method": String(
                 "POST",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "POST",
             ),
@@ -244,6 +256,9 @@ expression: event.value().unwrap().spans
             "http.method": String(
                 "POST",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "POST",
             ),
@@ -318,6 +333,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "SELECT",
             ),
@@ -386,6 +404,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "SELECT",
             ),
@@ -454,6 +475,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "INSERT",
             ),
@@ -519,6 +543,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "INSERT",
             ),
@@ -578,6 +605,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "INSERT",
             ),
@@ -640,6 +670,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "SELECT",
             ),
@@ -705,6 +738,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "SELECT",
             ),
@@ -773,6 +809,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.action": String(
                 "SELECT",
             ),
@@ -844,6 +883,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.category": String(
                 "db",
             ),
@@ -909,6 +951,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.category": String(
                 "cache",
             ),
@@ -968,6 +1013,9 @@ expression: event.value().unwrap().spans
             "environment": String(
                 "fake_environment",
             ),
+            "release": String(
+                "1.2.3",
+            ),
             "span.category": String(
                 "resource",
             ),