ops: make sentry sampling rates configurable

Author: matt-codecov

objectstore-server/src/config.rs

@@ -31,6 +31,13 @@ pub enum Storage {
     },
 }
 
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct Sentry {
+    pub dsn: String,
+    pub sample_rate: Option<f32>,
+    pub traces_sample_rate: Option<f32>,
+}
+
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct Config {
     // server addr config
@@ -41,7 +48,7 @@ pub struct Config {
     pub long_term_storage: Storage,
 
     // others
-    pub sentry_dsn: Option<String>,
+    pub sentry: Option<Sentry>,
     pub datadog_key: Option<String>,
     pub metric_tags: BTreeMap<String, String>,
 }
@@ -58,7 +65,7 @@ impl Default for Config {
                 path: PathBuf::from("data"),
             },
 
-            sentry_dsn: None,
+            sentry: None,
             datadog_key: None,
             metric_tags: Default::default(),
         }
@@ -106,6 +113,9 @@ mod tests {
             jail.set_env("fss_long_term_storage__bucket", "whatever");
             jail.set_env("fss_metric_tags__foo", "bar");
             jail.set_env("fss_metric_tags__baz", "qux");
+            jail.set_env("fss_sentry__dsn", "abcde");
+            jail.set_env("fss_sentry__sample_rate", "0.5");
+            jail.set_env("fss_sentry__traces_sample_rate", "0.5");
 
             let config = Config::from_args(Args::default()).unwrap();
 
@@ -120,6 +130,15 @@ mod tests {
                 [("foo".into(), "bar".into()), ("baz".into(), "qux".into())].into()
             );
 
+            let Sentry {
+                dsn,
+                sample_rate,
+                traces_sample_rate,
+            } = &dbg!(&config).sentry.as_ref().unwrap();
+            assert_eq!(dsn, "abcde");
+            assert_eq!(sample_rate, &Some(0.5));
+            assert_eq!(traces_sample_rate, &Some(0.5));
+
             Ok(())
         });
     }
@@ -134,6 +153,10 @@ mod tests {
                 type: s3compatible
                 endpoint: http://localhost:8888
                 bucket: whatever
+            sentry:
+                dsn: abcde
+                sample_rate: 0.5
+                traces_sample_rate: 0.5
             "#,
             )
             .unwrap();
@@ -143,10 +166,19 @@ mod tests {
         };
         let config = Config::from_args(args).unwrap();
 
-        let Storage::S3Compatible { endpoint, bucket } = dbg!(config).long_term_storage else {
+        let Storage::S3Compatible { endpoint, bucket } = &dbg!(&config).long_term_storage else {
             panic!("expected s3 storage");
         };
         assert_eq!(endpoint, "http://localhost:8888");
         assert_eq!(bucket, "whatever");
+
+        let Sentry {
+            dsn,
+            sample_rate,
+            traces_sample_rate,
+        } = &dbg!(&config).sentry.as_ref().unwrap();
+        assert_eq!(dsn, "abcde");
+        assert_eq!(sample_rate, &Some(0.5));
+        assert_eq!(traces_sample_rate, &Some(0.5));
     }
 }

objectstore-server/src/observability.rs

@@ -22,12 +22,12 @@ pub fn maybe_initialize_metrics(config: &Config) -> std::io::Result<Option<merni
 }
 
 pub fn maybe_initialize_sentry(config: &Config) -> Option<sentry::ClientInitGuard> {
-    config.sentry_dsn.as_ref().map(|sentry_dsn| {
+    config.sentry.as_ref().map(|sentry_config| {
         sentry::init(sentry::ClientOptions {
-            dsn: sentry_dsn.parse().ok(),
+            dsn: sentry_config.dsn.parse().ok(),
             enable_logs: true,
-            sample_rate: 1.0,
-            traces_sample_rate: 1.0,
+            sample_rate: sentry_config.sample_rate.unwrap_or(1.0),
+            traces_sample_rate: sentry_config.traces_sample_rate.unwrap_or(0.01),
             ..Default::default()
         })
     })
@@ -36,7 +36,7 @@ pub fn maybe_initialize_sentry(config: &Config) -> Option<sentry::ClientInitGuar
 pub fn initialize_tracing(config: &Config) {
     // Same as the default filter, except it converts warnings into events
     // and also sends everything at or above INFO as logs instead of breadcrumbs.
-    let sentry_layer = config.sentry_dsn.as_ref().map(|_| {
+    let sentry_layer = config.sentry.as_ref().map(|_| {
         sentry_tracing::layer().event_filter(|metadata| match *metadata.level() {
             Level::ERROR | Level::WARN => {
                 sentry_tracing::EventFilter::Event | sentry_tracing::EventFilter::Log