From 216780d88b02ee5cd09ea99c77901dbf2fbe08fd Mon Sep 17 00:00:00 2001 From: David Herberth Date: Mon, 24 Jun 2024 14:46:32 +0200 Subject: [PATCH 1/2] ref(metrics): Remove unused sentry extra data --- relay-metrics/src/aggregator.rs | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/relay-metrics/src/aggregator.rs b/relay-metrics/src/aggregator.rs index d625b34aa0..df12cf4098 100644 --- a/relay-metrics/src/aggregator.rs +++ b/relay-metrics/src/aggregator.rs @@ -836,33 +836,10 @@ fn validate_metric_name( ) -> Result { let metric_name_length = key.metric_name.len(); if metric_name_length > aggregator_config.max_name_length { - relay_log::configure_scope(|scope| { - scope.set_extra( - "bucket.project_key", - key.project_key.as_str().to_owned().into(), - ); - scope.set_extra( - "bucket.metric_name.length", - metric_name_length.to_string().into(), - ); - scope.set_extra( - "aggregator_config.max_name_length", - aggregator_config.max_name_length.to_string().into(), - ); - }); return Err(AggregateMetricsErrorKind::InvalidStringLength(key.metric_name).into()); } - if let Err(err) = normalize_metric_name(&mut key) { - relay_log::configure_scope(|scope| { - scope.set_extra( - "bucket.project_key", - key.project_key.as_str().to_owned().into(), - ); - scope.set_extra("bucket.metric_name", key.metric_name.to_string().into()); - }); - return Err(err); - } + normalize_metric_name(&mut key)?; Ok(key) } From 6ffd002e9420a70596a4c63503e20139f74e3987 Mon Sep 17 00:00:00 2001 From: David Herberth Date: Mon, 24 Jun 2024 14:54:22 +0200 Subject: [PATCH 2/2] wait there is more --- relay-metrics/src/aggregator.rs | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/relay-metrics/src/aggregator.rs b/relay-metrics/src/aggregator.rs index df12cf4098..9bd4cece6d 100644 --- a/relay-metrics/src/aggregator.rs +++ b/relay-metrics/src/aggregator.rs @@ -836,6 +836,11 @@ fn validate_metric_name( ) -> Result { let metric_name_length = key.metric_name.len(); if metric_name_length > aggregator_config.max_name_length { + relay_log::debug!( + "Invalid metric name, too long (> {}): {:?}", + aggregator_config.max_name_length, + key.metric_name + ); return Err(AggregateMetricsErrorKind::InvalidStringLength(key.metric_name).into()); } @@ -869,29 +874,12 @@ fn normalize_metric_name(key: &mut BucketKey) -> Result<(), AggregateMetricsErro /// /// Tag values are validated with `protocol::validate_tag_value`. fn validate_metric_tags(mut key: BucketKey, aggregator_config: &AggregatorConfig) -> BucketKey { - let proj_key = key.project_key.as_str(); key.tags.retain(|tag_key, tag_value| { if tag_key.len() > aggregator_config.max_tag_key_length { - relay_log::configure_scope(|scope| { - scope.set_extra("bucket.project_key", proj_key.to_owned().into()); - scope.set_extra("bucket.metric.tag_key", tag_key.to_owned().into()); - scope.set_extra( - "aggregator_config.max_tag_key_length", - aggregator_config.max_tag_key_length.to_string().into(), - ); - }); relay_log::debug!("Invalid metric tag key"); return false; } if bytecount::num_chars(tag_value.as_bytes()) > aggregator_config.max_tag_value_length { - relay_log::configure_scope(|scope| { - scope.set_extra("bucket.project_key", proj_key.to_owned().into()); - scope.set_extra("bucket.metric.tag_value", tag_value.to_owned().into()); - scope.set_extra( - "aggregator_config.max_tag_value_length", - aggregator_config.max_tag_value_length.to_string().into(), - ); - }); relay_log::debug!("Invalid metric tag value"); return false; }