diff --git a/relay-metrics/src/aggregator.rs b/relay-metrics/src/aggregator.rs index e4a5c088d2..1a593a21f8 100644 --- a/relay-metrics/src/aggregator.rs +++ b/relay-metrics/src/aggregator.rs @@ -468,11 +468,11 @@ fn get_flush_time( let initial_flush = bucket_key.timestamp + config.bucket_interval() + config.initial_delay(); let backdated = initial_flush <= now; - let delay = now.as_secs() as i64 - bucket_key.timestamp.as_secs() as i64; - relay_statsd::metric!( - histogram(MetricHistograms::BucketsDelay) = delay as f64, - backdated = if backdated { "true" } else { "false" }, - ); + // let delay = now.as_secs() as i64 - bucket_key.timestamp.as_secs() as i64; + // relay_statsd::metric!( + // histogram(MetricHistograms::BucketsDelay) = delay as f64, + // backdated = if backdated { "true" } else { "false" }, + // ); let flush_timestamp = if backdated { // If the initial flush time has passed or can't be represented, we want to treat the diff --git a/relay-metrics/src/statsd.rs b/relay-metrics/src/statsd.rs index ae7976a1fa..42008d9d0c 100644 --- a/relay-metrics/src/statsd.rs +++ b/relay-metrics/src/statsd.rs @@ -98,6 +98,7 @@ pub enum MetricHistograms { /// This metric is tagged with: /// - `backdated`: A flag indicating whether the metric was reported within the `initial_delay` /// time period (`false`) or after the initial delay has expired (`true`). + #[allow(dead_code)] // TODO: Temporarily disabled for a performance measurement. BucketsDelay, /// Distribution of invalid bucket timestamps observed, relative to the time of observation. diff --git a/relay-server/src/services/metrics/aggregator.rs b/relay-server/src/services/metrics/aggregator.rs index 707d0eec72..2b64d2046e 100644 --- a/relay-server/src/services/metrics/aggregator.rs +++ b/relay-server/src/services/metrics/aggregator.rs @@ -220,10 +220,11 @@ impl AggregatorService { } fn handle_message(&mut self, message: Aggregator) { - let ty = message.variant(); - relay_statsd::metric!( - timer(RelayTimers::AggregatorServiceDuration), - message = ty, + // let ty = message.variant(); + // relay_statsd::metric!( + // timer(RelayTimers::AggregatorServiceDuration), + // message = ty, + { { match message { Aggregator::MergeBuckets(msg) => self.handle_merge_buckets(msg), @@ -233,7 +234,8 @@ impl AggregatorService { } } } - ) + } + // ) } fn handle_shutdown(&mut self, message: Shutdown) { diff --git a/relay-server/src/services/metrics/router.rs b/relay-server/src/services/metrics/router.rs index 522eb729f1..bc9b0a1c8f 100644 --- a/relay-server/src/services/metrics/router.rs +++ b/relay-server/src/services/metrics/router.rs @@ -105,10 +105,11 @@ impl StartedRouter { } fn handle_message(&mut self, message: Aggregator) { - let ty = message.variant(); - relay_statsd::metric!( - timer(RelayTimers::MetricRouterServiceDuration), - message = ty, + // let ty = message.variant(); + // relay_statsd::metric!( + // timer(RelayTimers::MetricRouterServiceDuration), + // message = ty, + { { match message { Aggregator::MergeBuckets(msg) => self.handle_merge_buckets(msg), @@ -116,7 +117,8 @@ impl StartedRouter { Aggregator::BucketCountInquiry(_, _sender) => (), // not supported } } - ) + } + // ) } fn handle_merge_buckets(&mut self, message: MergeBuckets) { diff --git a/relay-server/src/services/processor.rs b/relay-server/src/services/processor.rs index dbc8fef904..760bbe3ff4 100644 --- a/relay-server/src/services/processor.rs +++ b/relay-server/src/services/processor.rs @@ -2904,10 +2904,11 @@ impl EnvelopeProcessorService { } fn handle_message(&self, message: EnvelopeProcessor) { - let ty = message.variant(); + // let ty = message.variant(); let feature_weights = self.feature_weights(&message); - metric!(timer(RelayTimers::ProcessMessageDuration), message = ty, { + // metric!(timer(RelayTimers::ProcessMessageDuration), message = ty, { + { let mut cogs = self.inner.cogs.timed(ResourceId::Relay, feature_weights); match message { @@ -2924,7 +2925,8 @@ impl EnvelopeProcessorService { EnvelopeProcessor::SubmitEnvelope(m) => self.handle_submit_envelope(*m), EnvelopeProcessor::SubmitClientReports(m) => self.handle_submit_client_reports(*m), } - }); + } + // }); } fn feature_weights(&self, message: &EnvelopeProcessor) -> FeatureWeights { diff --git a/relay-server/src/services/project_cache.rs b/relay-server/src/services/project_cache.rs index 63413e99bf..2cfacf5462 100644 --- a/relay-server/src/services/project_cache.rs +++ b/relay-server/src/services/project_cache.rs @@ -1263,10 +1263,11 @@ impl ProjectCacheBroker { } fn handle_message(&mut self, message: ProjectCache) { - let ty = message.variant(); - metric!( - timer(RelayTimers::ProjectCacheMessageDuration), - message = ty, + // let ty = message.variant(); + // metric!( + // timer(RelayTimers::ProjectCacheMessageDuration), + // message = ty, + { { match message { ProjectCache::RequestUpdate(message) => self.handle_request_update(message), @@ -1291,7 +1292,8 @@ impl ProjectCacheBroker { } } } - ) + } + // ) } } diff --git a/relay-server/src/statsd.rs b/relay-server/src/statsd.rs index 1113d528fc..cb476d20f1 100644 --- a/relay-server/src/statsd.rs +++ b/relay-server/src/statsd.rs @@ -469,6 +469,7 @@ pub enum RelayTimers { /// /// This metric is tagged with: /// - `message`: The type of message that was processed. + #[allow(dead_code)] // TODO: Temporarily disabled for a performance measurement. ProjectCacheMessageDuration, /// Timing in milliseconds for processing a message in the buffer service. /// @@ -551,7 +552,9 @@ impl TimerMetric for RelayTimers { RelayTimers::HealthCheckDuration => "health.message.duration", #[cfg(feature = "processing")] RelayTimers::RateLimitBucketsDuration => "processor.rate_limit_buckets", + #[allow(dead_code)] // TODO: Temporarily disabled for a performance measurement. RelayTimers::AggregatorServiceDuration => "metrics.aggregator.message.duration", + #[allow(dead_code)] // TODO: Temporarily disabled for a performance measurement. RelayTimers::MetricRouterServiceDuration => "metrics.router.message.duration", #[cfg(feature = "processing")] RelayTimers::StoreServiceDuration => "store.message.duration",