From ca3dd18cdb4916f2ba0364154f833c46f5f346f4 Mon Sep 17 00:00:00 2001
From: Dominik Buszowiecki <44422760+DominikB2014@users.noreply.github.com>
Date: Mon, 19 Aug 2024 02:59:59 -0400
Subject: [PATCH] feat(spans): tag resource specific metrics with
 `user.geo.subregion` (#3934)

work towards https://github.com/getsentry/sentry/issues/75230

This should allow all the asset module to be filtered down on user
subregion.
---
 CHANGELOG.md                                             | 1 +
 relay-dynamic-config/src/defaults.rs                     | 9 +++++++++
 ...action__event__tests__both_feature_flags_enabled.snap | 9 +++++++++
 ...r__metrics_extraction__event__tests__only_common.snap | 9 +++++++++
 4 files changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b479586c3..5fd9400a2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 - Add `last_peek` field to the `Priority` struct. ([#3922](https://github.com/getsentry/relay/pull/3922))
 - Extract `user.geo.subregion` for mobile spans. ([#3927](https://github.com/getsentry/relay/pull/3927))
 - Rename `Peek` to `EnvelopeBufferGuard`. ([#3930](https://github.com/getsentry/relay/pull/3930))
+- Tag `user.geo.subregion` for resource metrics. ([#3934](https://github.com/getsentry/relay/pull/3934))
 
 ## 24.7.1
 
diff --git a/relay-dynamic-config/src/defaults.rs b/relay-dynamic-config/src/defaults.rs
index 616fa9e99d..758795ab57 100644
--- a/relay-dynamic-config/src/defaults.rs
+++ b/relay-dynamic-config/src/defaults.rs
@@ -268,6 +268,9 @@ pub fn hardcoded_span_metrics() -> Vec<(GroupKey, Vec<MetricSpec>, Vec<TagMappin
                         Tag::with_key("transaction")
                             .from_field("span.sentry_tags.transaction")
                             .always(), // already guarded by condition on metric
+                        Tag::with_key("user.geo.subregion")
+                            .from_field("span.sentry_tags.user.geo.subregion")
+                            .always(), // already guarded by condition on metric
                     ],
                 },
                 MetricSpec {
@@ -303,6 +306,9 @@ pub fn hardcoded_span_metrics() -> Vec<(GroupKey, Vec<MetricSpec>, Vec<TagMappin
                         Tag::with_key("span.op")
                             .from_field("span.sentry_tags.op")
                             .always(), // already guarded by condition on metric
+                        Tag::with_key("user.geo.subregion")
+                            .from_field("span.sentry_tags.user.geo.subregion")
+                            .always(), // already guarded by condition on metric
                     ],
                 },
                 MetricSpec {
@@ -335,6 +341,9 @@ pub fn hardcoded_span_metrics() -> Vec<(GroupKey, Vec<MetricSpec>, Vec<TagMappin
                         Tag::with_key("span.op")
                             .from_field("span.sentry_tags.op")
                             .always(), // already guarded by condition on metric
+                        Tag::with_key("user.geo.subregion")
+                            .from_field("span.sentry_tags.user.geo.subregion")
+                            .always(), // already guarded by condition on metric
                     ],
                 },
                 MetricSpec {
diff --git a/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__both_feature_flags_enabled.snap b/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__both_feature_flags_enabled.snap
index b7e4a1a6c8..2846429a65 100644
--- a/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__both_feature_flags_enabled.snap
+++ b/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__both_feature_flags_enabled.snap
@@ -4379,6 +4379,7 @@ expression: metrics
             "span.group": "d744fa0716ef1142",
             "span.op": "resource.css",
             "transaction": "gEt /api/:version/users/",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4407,6 +4408,7 @@ expression: metrics
             "span.domain": "*.domain.com",
             "span.group": "d744fa0716ef1142",
             "span.op": "resource.css",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4435,6 +4437,7 @@ expression: metrics
             "span.domain": "*.domain.com",
             "span.group": "d744fa0716ef1142",
             "span.op": "resource.css",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4606,6 +4609,7 @@ expression: metrics
             "span.group": "89bda2e660f6236c",
             "span.op": "resource.script",
             "transaction": "gEt /api/:version/users/",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4634,6 +4638,7 @@ expression: metrics
             "span.domain": "*.example.com:5688",
             "span.group": "89bda2e660f6236c",
             "span.op": "resource.script",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4662,6 +4667,7 @@ expression: metrics
             "span.domain": "*.example.com:5688",
             "span.group": "89bda2e660f6236c",
             "span.op": "resource.script",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -8346,6 +8352,7 @@ expression: metrics
             "span.group": "7f402250846262be",
             "span.op": "resource.css",
             "transaction": "gEt /api/:version/users/",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -8374,6 +8381,7 @@ expression: metrics
             "span.domain": "*.domain.com",
             "span.group": "7f402250846262be",
             "span.op": "resource.css",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -8402,6 +8410,7 @@ expression: metrics
             "span.domain": "*.domain.com",
             "span.group": "7f402250846262be",
             "span.op": "resource.css",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
diff --git a/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__only_common.snap b/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__only_common.snap
index 498f393aa5..785b6b811a 100644
--- a/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__only_common.snap
+++ b/relay-server/src/metrics_extraction/snapshots/relay_server__metrics_extraction__event__tests__only_common.snap
@@ -4077,6 +4077,7 @@ expression: metrics
             "span.group": "d744fa0716ef1142",
             "span.op": "resource.css",
             "transaction": "gEt /api/:version/users/",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4105,6 +4106,7 @@ expression: metrics
             "span.domain": "*.domain.com",
             "span.group": "d744fa0716ef1142",
             "span.op": "resource.css",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4133,6 +4135,7 @@ expression: metrics
             "span.domain": "*.domain.com",
             "span.group": "d744fa0716ef1142",
             "span.op": "resource.css",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4304,6 +4307,7 @@ expression: metrics
             "span.group": "89bda2e660f6236c",
             "span.op": "resource.script",
             "transaction": "gEt /api/:version/users/",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4332,6 +4336,7 @@ expression: metrics
             "span.domain": "*.example.com:5688",
             "span.group": "89bda2e660f6236c",
             "span.op": "resource.script",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -4360,6 +4365,7 @@ expression: metrics
             "span.domain": "*.example.com:5688",
             "span.group": "89bda2e660f6236c",
             "span.op": "resource.script",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -7775,6 +7781,7 @@ expression: metrics
             "span.group": "7f402250846262be",
             "span.op": "resource.css",
             "transaction": "gEt /api/:version/users/",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -7803,6 +7810,7 @@ expression: metrics
             "span.domain": "*.domain.com",
             "span.group": "7f402250846262be",
             "span.op": "resource.css",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,
@@ -7831,6 +7839,7 @@ expression: metrics
             "span.domain": "*.domain.com",
             "span.group": "7f402250846262be",
             "span.op": "resource.css",
+            "user.geo.subregion": "155",
         },
         metadata: BucketMetadata {
             merges: 1,