feat(statsd): add config parameter to control metrics aggregation (#4376

)

Adds a configuration flat to enable/disable local metric aggregation
through statsdproxy.

CHANGELOG.md

@@ -35,6 +35,7 @@
 - Promote some `span.data` fields to the top level. ([#4298](https://github.com/getsentry/relay/pull/4298))
 - Remove metrics summaries. ([#4278](https://github.com/getsentry/relay/pull/4278), [#4279](https://github.com/getsentry/relay/pull/4279), [#4296](https://github.com/getsentry/relay/pull/4296))
 - Use async `redis` for `projectconfig`. ([#4284](https://github.com/getsentry/relay/pull/4284))
+- Add config parameter to control metrics aggregation. ([#4376](https://github.com/getsentry/relay/pull/4376))
 
 ## 24.11.1
 

relay-config/src/config.rs

@@ -546,6 +546,10 @@ pub struct Metrics {
     /// Setting it to `0` seconds disables the periodic metrics.
     /// Defaults to 5 seconds.
     pub periodic_secs: u64,
+    /// Whether local metric aggregation using statdsproxy should be enabled.
+    ///
+    /// Defaults to `true`.
+    pub aggregate: bool,
 }
 
 impl Default for Metrics {
@@ -557,6 +561,7 @@ impl Default for Metrics {
             hostname_tag: None,
             sample_rate: 1.0,
             periodic_secs: 5,
+            aggregate: true,
         }
     }
 }
@@ -2030,6 +2035,11 @@ impl Config {
         self.values.metrics.sample_rate
     }
 
+    /// Returns whether local metric aggregation should be enabled.
+    pub fn metrics_aggregate(&self) -> bool {
+        self.values.metrics.aggregate
+    }
+
     /// Returns the interval for periodic metrics emitted from Relay.
     ///
     /// `None` if periodic metrics are disabled.

relay-statsd/src/lib.rs

@@ -23,7 +23,7 @@
 //! ```no_run
 //! # use std::collections::BTreeMap;
 //!
-//! relay_statsd::init("myprefix", "localhost:8125", BTreeMap::new(), 1.0);
+//! relay_statsd::init("myprefix", "localhost:8125", BTreeMap::new(), 1.0, true);
 //! ```
 //!
 //! ## Macro Usage
@@ -226,6 +226,7 @@ pub fn init<A: ToSocketAddrs>(
     host: A,
     default_tags: BTreeMap<String, String>,
     sample_rate: f32,
+    aggregate: bool,
 ) {
     let addrs: Vec<_> = host.to_socket_addrs().unwrap().collect();
     if !addrs.is_empty() {
@@ -243,7 +244,7 @@ pub fn init<A: ToSocketAddrs>(
         }
     );
 
-    let statsd_client = {
+    let statsd_client = if aggregate {
         let statsdproxy_sink = StatsdProxyMetricSink::new(move || {
             let upstream = statsdproxy::middleware::upstream::Upstream::new(addrs[0])
                 .expect("failed to create statsdproxy metric sink");
@@ -260,6 +261,12 @@ pub fn init<A: ToSocketAddrs>(
             )
         });
 
+        StatsdClient::from_sink(prefix, statsdproxy_sink)
+    } else {
+        let statsdproxy_sink = StatsdProxyMetricSink::new(move || {
+            statsdproxy::middleware::upstream::Upstream::new(addrs[0])
+                .expect("failed to create statsdproxy metric sind")
+        });
         StatsdClient::from_sink(prefix, statsdproxy_sink)
     };
 

relay/src/setup.rs

@@ -87,6 +87,7 @@ pub fn init_metrics(config: &Config) -> Result<()> {
         &addrs[..],
         default_tags,
         config.metrics_sample_rate(),
+        config.metrics_aggregate(),
     );
 
     Ok(())