From d6db70a2b16567acaab943673c8c58cbb77c58af Mon Sep 17 00:00:00 2001 From: Dominik Buszowiecki Date: Fri, 6 Sep 2024 10:45:10 -0400 Subject: [PATCH 1/2] only extract metrics on mobile and frontend projects --- relay-dynamic-config/src/defaults.rs | 3 +- .../src/normalize/span/tag_extraction.rs | 74 ++++++++++++++-- relay-server/src/metrics_extraction/event.rs | 5 ++ ...nt__tests__both_feature_flags_enabled.snap | 84 +++++++++++++++++++ ...extraction__event__tests__only_common.snap | 84 +++++++++++++++++++ 5 files changed, 244 insertions(+), 6 deletions(-) diff --git a/relay-dynamic-config/src/defaults.rs b/relay-dynamic-config/src/defaults.rs index e24060c034..2cbcfe3de4 100644 --- a/relay-dynamic-config/src/defaults.rs +++ b/relay-dynamic-config/src/defaults.rs @@ -180,7 +180,8 @@ pub fn hardcoded_span_metrics() -> Vec<(GroupKey, Vec, Vec BTreeMap { if let Some(user_email) = user.email.value() { tags.insert(SpanTagKey::UserEmail, user_email.clone()); } - if let Some(country_code) = user.geo.value().and_then(|geo| geo.country_code.value()) { - tags.insert(SpanTagKey::UserCountryCode, country_code.to_owned()); - if let Some(subregion) = Subregion::from_iso2(country_code.as_str()) { - let numerical_subregion = subregion as u8; - tags.insert(SpanTagKey::UserSubregion, numerical_subregion.to_string()); + + // We only want this on frontend or mobile modules. + let should_extract_geo = + event.context::().is_some() || MOBILE_SDKS.contains(&event.sdk_name()); + + if should_extract_geo { + if let Some(country_code) = user.geo.value().and_then(|geo| geo.country_code.value()) { + tags.insert(SpanTagKey::UserCountryCode, country_code.to_owned()); + if let Some(subregion) = Subregion::from_iso2(country_code.as_str()) { + let numerical_subregion = subregion as u8; + tags.insert(SpanTagKey::UserSubregion, numerical_subregion.to_string()); + } } } } @@ -2676,6 +2683,9 @@ LIMIT 1 "trace": { "trace_id": "ff62a8b040f340bda5d830223def1d81", "span_id": "bd429c44b67a3eb4" + }, + "browser": { + "name": "Chrome" } }, "user": { @@ -2722,6 +2732,60 @@ LIMIT 1 assert_eq!(get_value!(span.sentry_tags["user.geo.subregion"]!), "21"); } + #[test] + fn not_extract_geo_location_if_not_browser() { + let json = r#" + { + "type": "transaction", + "platform": "python", + "start_timestamp": "2021-04-26T07:59:01+0100", + "timestamp": "2021-04-26T08:00:00+0100", + "transaction": "foo", + "contexts": { + "trace": { + "trace_id": "ff62a8b040f340bda5d830223def1d81", + "span_id": "bd429c44b67a3eb4" + } + }, + "user": { + "id": "1", + "email": "admin@sentry.io", + "username": "admin", + "geo": { + "country_code": "US" + } + }, + "spans": [ + { + "op": "http.client", + "span_id": "bd429c44b67a3eb1", + "start_timestamp": 1597976300.0000000, + "timestamp": 1597976302.0000000, + "trace_id": "ff62a8b040f340bda5d830223def1d81" + } + ] + } + "#; + + let mut event = Annotated::::from_json(json).unwrap(); + + normalize_event( + &mut event, + &NormalizationConfig { + enrich_spans: true, + ..Default::default() + }, + ); + + let spans = get_value!(event.spans!); + let span = &spans[0]; + + let tags = span.value().unwrap().sentry_tags.value().unwrap(); + + assert_eq!(tags.get("user.geo.subregion"), None); + assert_eq!(tags.get("user.geo.country_code"), None); + } + #[test] fn extract_thread_id_name_from_span_data_into_sentry_tags() { let json = r#" diff --git a/relay-server/src/metrics_extraction/event.rs b/relay-server/src/metrics_extraction/event.rs index 3707be9f86..ab43be6e27 100644 --- a/relay-server/src/metrics_extraction/event.rs +++ b/relay-server/src/metrics_extraction/event.rs @@ -171,6 +171,11 @@ mod tests { "span_id": "bd429c44b67a3eb4", "op": "mYOp", "status": "ok" + }, + "browser": { + "name": "Chrome", + "version": "120.1.1", + "type": "browser" } }, "request": { 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 2846429a65..6a1fc1d22b 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 @@ -178,6 +178,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -205,6 +206,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "d9dc18637d441612", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -235,6 +237,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -262,6 +265,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "d9dc18637d441612", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -310,6 +314,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -337,6 +342,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "25faf23529f71d3e", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -367,6 +373,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -394,6 +401,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "25faf23529f71d3e", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -442,6 +450,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -469,6 +478,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "488f09b46e5978be", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -499,6 +509,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -526,6 +537,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "488f09b46e5978be", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -573,6 +585,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -599,6 +612,7 @@ expression: metrics "span.description": "GET *", "span.group": "37e3d9fab1ae9162", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -628,6 +642,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -654,6 +669,7 @@ expression: metrics "span.description": "GET *", "span.group": "37e3d9fab1ae9162", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -702,6 +718,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -729,6 +746,7 @@ expression: metrics "span.group": "37e3d9fab1ae9162", "span.op": "http.client", "span.status_code": "500", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -759,6 +777,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -786,6 +805,7 @@ expression: metrics "span.group": "37e3d9fab1ae9162", "span.op": "http.client", "span.status_code": "500", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -835,6 +855,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -863,6 +884,7 @@ expression: metrics "span.group": "464fe695f9cf639c", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -894,6 +916,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -922,6 +945,7 @@ expression: metrics "span.group": "464fe695f9cf639c", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -971,6 +995,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -999,6 +1024,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1030,6 +1056,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1058,6 +1085,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1107,6 +1135,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1135,6 +1164,7 @@ expression: metrics "span.group": "72ab88b506cb04b2", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1166,6 +1196,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1194,6 +1225,7 @@ expression: metrics "span.group": "72ab88b506cb04b2", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1243,6 +1275,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1271,6 +1304,7 @@ expression: metrics "span.group": "c8e531abe96ff360", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1302,6 +1336,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1330,6 +1365,7 @@ expression: metrics "span.group": "c8e531abe96ff360", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1379,6 +1415,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1407,6 +1444,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1438,6 +1476,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1466,6 +1505,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1515,6 +1555,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1543,6 +1584,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1574,6 +1616,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1602,6 +1645,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4784,6 +4828,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4811,6 +4856,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "d9dc18637d441612", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4841,6 +4887,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4868,6 +4915,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "d9dc18637d441612", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4916,6 +4964,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4943,6 +4992,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "25faf23529f71d3e", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4973,6 +5023,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5000,6 +5051,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "25faf23529f71d3e", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5048,6 +5100,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5075,6 +5128,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "488f09b46e5978be", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5105,6 +5159,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5132,6 +5187,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "488f09b46e5978be", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5179,6 +5235,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5205,6 +5262,7 @@ expression: metrics "span.description": "GET *", "span.group": "37e3d9fab1ae9162", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5234,6 +5292,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5260,6 +5319,7 @@ expression: metrics "span.description": "GET *", "span.group": "37e3d9fab1ae9162", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5309,6 +5369,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5337,6 +5398,7 @@ expression: metrics "span.group": "464fe695f9cf639c", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5368,6 +5430,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5396,6 +5459,7 @@ expression: metrics "span.group": "464fe695f9cf639c", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5445,6 +5509,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5473,6 +5538,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5504,6 +5570,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5532,6 +5599,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5581,6 +5649,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5609,6 +5678,7 @@ expression: metrics "span.group": "72ab88b506cb04b2", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5640,6 +5710,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5668,6 +5739,7 @@ expression: metrics "span.group": "72ab88b506cb04b2", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5717,6 +5789,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5745,6 +5818,7 @@ expression: metrics "span.group": "c8e531abe96ff360", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5776,6 +5850,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5804,6 +5879,7 @@ expression: metrics "span.group": "c8e531abe96ff360", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5853,6 +5929,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5881,6 +5958,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5912,6 +5990,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5940,6 +6019,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5989,6 +6069,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -6017,6 +6098,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -6048,6 +6130,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -6076,6 +6159,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "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 785b6b811a..33b71ca803 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 @@ -178,6 +178,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -205,6 +206,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "d9dc18637d441612", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -235,6 +237,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -262,6 +265,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "d9dc18637d441612", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -310,6 +314,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -337,6 +342,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "25faf23529f71d3e", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -367,6 +373,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -394,6 +401,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "25faf23529f71d3e", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -442,6 +450,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -469,6 +478,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "488f09b46e5978be", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -499,6 +509,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -526,6 +537,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "488f09b46e5978be", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -573,6 +585,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -599,6 +612,7 @@ expression: metrics "span.description": "GET *", "span.group": "37e3d9fab1ae9162", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -628,6 +642,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -654,6 +669,7 @@ expression: metrics "span.description": "GET *", "span.group": "37e3d9fab1ae9162", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -702,6 +718,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -729,6 +746,7 @@ expression: metrics "span.group": "37e3d9fab1ae9162", "span.op": "http.client", "span.status_code": "500", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -759,6 +777,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -786,6 +805,7 @@ expression: metrics "span.group": "37e3d9fab1ae9162", "span.op": "http.client", "span.status_code": "500", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -835,6 +855,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -863,6 +884,7 @@ expression: metrics "span.group": "464fe695f9cf639c", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -894,6 +916,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -922,6 +945,7 @@ expression: metrics "span.group": "464fe695f9cf639c", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -971,6 +995,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -999,6 +1024,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1030,6 +1056,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1058,6 +1085,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1107,6 +1135,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1135,6 +1164,7 @@ expression: metrics "span.group": "72ab88b506cb04b2", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1166,6 +1196,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1194,6 +1225,7 @@ expression: metrics "span.group": "72ab88b506cb04b2", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1243,6 +1275,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1271,6 +1304,7 @@ expression: metrics "span.group": "c8e531abe96ff360", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1302,6 +1336,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1330,6 +1365,7 @@ expression: metrics "span.group": "c8e531abe96ff360", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1379,6 +1415,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1407,6 +1444,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1438,6 +1476,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1466,6 +1505,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1515,6 +1555,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1543,6 +1584,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1574,6 +1616,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -1602,6 +1645,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4482,6 +4526,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4509,6 +4554,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "d9dc18637d441612", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4539,6 +4585,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4566,6 +4613,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "d9dc18637d441612", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4614,6 +4662,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4641,6 +4690,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "25faf23529f71d3e", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4671,6 +4721,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4698,6 +4749,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "25faf23529f71d3e", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4746,6 +4798,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4773,6 +4826,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "488f09b46e5978be", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4803,6 +4857,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4830,6 +4885,7 @@ expression: metrics "span.domain": "domain.tld", "span.group": "488f09b46e5978be", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4877,6 +4933,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4903,6 +4960,7 @@ expression: metrics "span.description": "GET *", "span.group": "37e3d9fab1ae9162", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4932,6 +4990,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -4958,6 +5017,7 @@ expression: metrics "span.description": "GET *", "span.group": "37e3d9fab1ae9162", "span.op": "http.client", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5007,6 +5067,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5035,6 +5096,7 @@ expression: metrics "span.group": "464fe695f9cf639c", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5066,6 +5128,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5094,6 +5157,7 @@ expression: metrics "span.group": "464fe695f9cf639c", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5143,6 +5207,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5171,6 +5236,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5202,6 +5268,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5230,6 +5297,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5279,6 +5347,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5307,6 +5376,7 @@ expression: metrics "span.group": "72ab88b506cb04b2", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5338,6 +5408,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5366,6 +5437,7 @@ expression: metrics "span.group": "72ab88b506cb04b2", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5415,6 +5487,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5443,6 +5516,7 @@ expression: metrics "span.group": "c8e531abe96ff360", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5474,6 +5548,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5502,6 +5577,7 @@ expression: metrics "span.group": "c8e531abe96ff360", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5551,6 +5627,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5579,6 +5656,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5610,6 +5688,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5638,6 +5717,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5687,6 +5767,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5715,6 +5796,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5746,6 +5828,7 @@ expression: metrics "transaction": "gEt /api/:version/users/", "transaction.method": "POST", "transaction.op": "myop", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, @@ -5774,6 +5857,7 @@ expression: metrics "span.group": "86818d1c74ecfc66", "span.op": "http.client", "span.status_code": "200", + "user.geo.subregion": "155", }, metadata: BucketMetadata { merges: 1, From 2ea928a7c463f595a7284416f05fa2cefc031516 Mon Sep 17 00:00:00 2001 From: Dominik Buszowiecki Date: Fri, 6 Sep 2024 10:51:23 -0400 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd35f79d48..30f0c68da3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ - Remove the OTEL spans endpoint in favor of Envelopes. ([#3973](https://github.com/getsentry/relay/pull/3973)) - Remove the `generate-schema` tool. Relay no longer exposes JSON schema for the event protocol. Consult the Rust type documentation of the `relay-event-schema` crate instead. ([#3974](https://github.com/getsentry/relay/pull/3974)) - Allow creation of `SqliteEnvelopeBuffer` from config, and load existing stacks from db on startup. ([#3967](https://github.com/getsentry/relay/pull/3967)) +- Only tag `user.geo.subregion` on frontend and mobile projects. ([#4013](https://github.com/getsentry/relay/pull/4013)) ## 24.8.0