From 368d69e94041735dc13e167e0b9d048037de9152 Mon Sep 17 00:00:00 2001 From: Riccardo Busetti Date: Mon, 8 Jul 2024 15:25:39 +0200 Subject: [PATCH] ref(metrics): Remove option for controlling metrics summaries calculation (#3797) --- relay-dynamic-config/src/global.rs | 8 ------ relay-server/src/metrics_extraction/event.rs | 28 ++----------------- relay-server/src/services/processor.rs | 1 - .../src/services/processor/span/processing.rs | 9 +----- tests/integration/test_spans.py | 8 ------ 5 files changed, 4 insertions(+), 50 deletions(-) diff --git a/relay-dynamic-config/src/global.rs b/relay-dynamic-config/src/global.rs index ecb972a929..35e950da7a 100644 --- a/relay-dynamic-config/src/global.rs +++ b/relay-dynamic-config/src/global.rs @@ -214,14 +214,6 @@ pub struct Options { )] pub span_extraction_sample_rate: Option, - /// Overall sampling of metrics summaries computation. - #[serde( - rename = "relay.compute-metrics-summaries.sample-rate", - deserialize_with = "default_on_error", - skip_serializing_if = "is_default" - )] - pub compute_metrics_summaries_sample_rate: Option, - /// The maximum duplication factor used to extrapolate distribution metrics from sampled data. /// /// This applies as long as Relay duplicates distribution values to extrapolate. The default is diff --git a/relay-server/src/metrics_extraction/event.rs b/relay-server/src/metrics_extraction/event.rs index 2fb5a22037..3528990009 100644 --- a/relay-server/src/metrics_extraction/event.rs +++ b/relay-server/src/metrics_extraction/event.rs @@ -52,20 +52,11 @@ pub fn extract_metrics( config: CombinedMetricExtractionConfig<'_>, max_tag_value_size: usize, span_extraction_sample_rate: Option, - compute_metrics_summaries_sample_rate: Option, ) -> Vec { let mut metrics = generic::extract_metrics(event, config); // If spans were already extracted for an event, we rely on span processing to extract metrics. if !spans_extracted && sample(span_extraction_sample_rate.unwrap_or(1.0)) { - let compute_metrics_summaries_sample_rate = - compute_metrics_summaries_sample_rate.unwrap_or(1.0); - extract_span_metrics_for_event( - event, - config, - max_tag_value_size, - &mut metrics, - compute_metrics_summaries_sample_rate, - ); + extract_span_metrics_for_event(event, config, max_tag_value_size, &mut metrics); } metrics @@ -76,17 +67,12 @@ fn extract_span_metrics_for_event( config: CombinedMetricExtractionConfig<'_>, max_tag_value_size: usize, output: &mut Vec, - compute_metrics_summaries_sample_rate: f32, ) { - let compute_metrics_summaries = sample(compute_metrics_summaries_sample_rate); - relay_statsd::metric!(timer(RelayTimers::EventProcessingSpanMetricsExtraction), { if let Some(transaction_span) = extract_transaction_span(event, max_tag_value_size) { let (metrics, metrics_summary) = metrics_summary::extract_and_summarize_metrics(&transaction_span, config); - if compute_metrics_summaries { - metrics_summary.apply_on(&mut event._metrics_summary); - } + metrics_summary.apply_on(&mut event._metrics_summary); output.extend(metrics); } @@ -95,9 +81,7 @@ fn extract_span_metrics_for_event( if let Some(span) = annotated_span.value_mut() { let (metrics, metrics_summary) = metrics_summary::extract_and_summarize_metrics(span, config); - if compute_metrics_summaries { - metrics_summary.apply_on(&mut span._metrics_summary); - } + metrics_summary.apply_on(&mut span._metrics_summary); output.extend(metrics); } } @@ -1211,7 +1195,6 @@ mod tests { combined_config(features, None).combined(), 200, None, - None, ) } @@ -1414,7 +1397,6 @@ mod tests { combined_config([Feature::ExtractCommonSpanMetricsFromEvent], None).combined(), 200, None, - None, ); insta::assert_debug_snapshot!((&event.value().unwrap().spans, metrics)); } @@ -1472,7 +1454,6 @@ mod tests { combined_config([Feature::ExtractCommonSpanMetricsFromEvent], None).combined(), 200, None, - None, ); // When transaction.op:ui.load and mobile:true, HTTP spans still get both @@ -1505,7 +1486,6 @@ mod tests { combined_config([Feature::ExtractCommonSpanMetricsFromEvent], None).combined(), 200, None, - None, ); let usage_metrics = metrics @@ -1729,7 +1709,6 @@ mod tests { combined_config([Feature::ExtractCommonSpanMetricsFromEvent], None).combined(), 200, None, - None, ); assert_eq!(metrics.len(), 4); @@ -1872,7 +1851,6 @@ mod tests { config, 200, None, - None, ); insta::assert_debug_snapshot!(&event.value().unwrap()._metrics_summary); diff --git a/relay-server/src/services/processor.rs b/relay-server/src/services/processor.rs index e866866119..a756d05489 100644 --- a/relay-server/src/services/processor.rs +++ b/relay-server/src/services/processor.rs @@ -1428,7 +1428,6 @@ impl EnvelopeProcessorService { .aggregator .max_tag_value_length, global.options.span_extraction_sample_rate, - global.options.compute_metrics_summaries_sample_rate, ); state diff --git a/relay-server/src/services/processor/span/processing.rs b/relay-server/src/services/processor/span/processing.rs index f57238f0f5..5102301eda 100644 --- a/relay-server/src/services/processor/span/processing.rs +++ b/relay-server/src/services/processor/span/processing.rs @@ -158,14 +158,7 @@ pub fn process( span, CombinedMetricExtractionConfig::new(global_metrics_config, config), ); - if sample( - global_config - .options - .compute_metrics_summaries_sample_rate - .unwrap_or(1.0), - ) { - metrics_summary.apply_on(&mut span._metrics_summary) - } + metrics_summary.apply_on(&mut span._metrics_summary); state .extracted_metrics diff --git a/tests/integration/test_spans.py b/tests/integration/test_spans.py index efd38336de..32000f4fc5 100644 --- a/tests/integration/test_spans.py +++ b/tests/integration/test_spans.py @@ -2062,10 +2062,6 @@ def test_metrics_summary_with_extracted_spans( relay_with_processing, metrics_summaries_consumer, ): - mini_sentry.global_config["options"] = { - "relay.compute-metrics-summaries.sample-rate": 1.0 - } - metrics_summaries_consumer = metrics_summaries_consumer() relay = relay_with_processing() @@ -2139,10 +2135,6 @@ def test_metrics_summary_with_standalone_spans( relay_with_processing, metrics_summaries_consumer, ): - mini_sentry.global_config["options"] = { - "relay.compute-metrics-summaries.sample-rate": 1.0 - } - metrics_summaries_consumer = metrics_summaries_consumer() relay = relay_with_processing()