feat(metrics): Tag metrics by transaction name [INGEST-542] (#1126)

Author: untitaker

CHANGELOG.md

@@ -5,7 +5,8 @@
 **Features**:
 
 - Add bucket width to bucket protocol. ([#1103](https://github.com/getsentry/relay/pull/1103))
-- Support multiple kafka cluster configurations ([#1101](https://github.com/getsentry/relay/pull/1101))
+- Support multiple kafka cluster configurations. ([#1101](https://github.com/getsentry/relay/pull/1101))
+- Tag metrics by transaction name. ([#1126](https://github.com/getsentry/relay/pull/1126))
 
 **Bug Fixes**:
 

relay-server/src/actors/envelopes.rs

@@ -434,6 +434,9 @@ fn extract_transaction_metrics(event: &Event, target: &mut Vec<Metric>) {
     if let Some(environment) = event.environment.as_str() {
         tags.insert("environment".to_owned(), environment.to_owned());
     }
+    if let Some(transaction) = event.transaction.as_str() {
+        tags.insert("transaction".to_owned(), transaction.to_owned());
+    }
 
     if let Some(measurements) = event.measurements.value() {
         for (name, annotated) in measurements.iter() {
@@ -3266,6 +3269,7 @@ mod tests {
             "timestamp": "2021-04-26T08:00:00+0100",
             "release": "1.2.3",
             "environment": "fake_environment",
+            "transaction": "mytransaction",
             "measurements": {
                 "foo": {"value": 420.69}
             },
@@ -3296,6 +3300,7 @@ mod tests {
             assert!(matches!(metric.value, MetricValue::Distribution(_)));
             assert_eq!(metric.tags["release"], "1.2.3");
             assert_eq!(metric.tags["environment"], "fake_environment");
+            assert_eq!(metric.tags["transaction"], "mytransaction");
         }
     }
 

tests/integration/test_metrics.py

@@ -455,30 +455,31 @@ def test_transaction_metrics(
 
     metrics = metrics_by_name(metrics_consumer, 3)
 
-    assert metrics["measurement.foo"] == {
+    common = {
+        "timestamp": int(timestamp.timestamp()),
         "org_id": 1,
         "project_id": 42,
-        "timestamp": int(timestamp.timestamp()),
+        "tags": {"transaction": "/organizations/:orgId/performance/:eventSlug/"},
+    }
+
+    assert metrics["measurement.foo"] == {
+        **common,
         "name": "measurement.foo",
         "type": "d",
         "unit": "",
         "value": [1.2, 2.2],
     }
 
     assert metrics["measurement.bar"] == {
-        "org_id": 1,
-        "project_id": 42,
-        "timestamp": int(timestamp.timestamp()),
+        **common,
         "name": "measurement.bar",
         "type": "d",
         "unit": "",
         "value": [1.3],
     }
 
     assert metrics["breakdown.breakdown1.baz"] == {
-        "org_id": 1,
-        "project_id": 42,
-        "timestamp": int(timestamp.timestamp()),
+        **common,
         "name": "breakdown.breakdown1.baz",
         "type": "d",
         "unit": "",