ref(options): migrate runtime config to sentry-options (Python RPC/query + Rust killswitches)

pyproject.toml

@@ -31,6 +31,7 @@ dependencies = [
     "sentry-arroyo>=2.39.2",
     "sentry-conventions>=0.12.0",
     "sentry-kafka-schemas>=2.1.35",
+    "sentry-options>=1.1.1",
     "sentry-protos>=0.32.0",
     "sentry-redis-tools>=0.5.1",
     "sentry-relay>=0.9.25",

rust_snuba/src/processors/generic_metrics.rs

@@ -1,14 +1,14 @@
 use adler::Adler32;
-use anyhow::{anyhow, Context, Error};
+use anyhow::{anyhow, Context};
 use chrono::DateTime;
 use serde::{
     de::value::{MapAccessDeserializer, SeqAccessDeserializer},
     Deserialize, Deserializer, Serialize,
 };
+use sentry_options::options;
 use std::{collections::BTreeMap, marker::PhantomData, vec};
 
 use crate::{
-    runtime_config::get_str_config,
     types::{CogsData, InsertBatch, RowData},
     KafkaMessageMetadata, ProcessorConfig,
 };
@@ -339,8 +339,8 @@ impl Parse for CountersRawRow {
     }
 }
 
-fn should_use_killswitch(config: Result<Option<String>, Error>, use_case: &MessageUseCase) -> bool {
-    if let Some(killswitch) = config.ok().flatten() {
+fn should_use_killswitch(config: Option<String>, use_case: &MessageUseCase) -> bool {
+    if let Some(killswitch) = config {
         return killswitch.contains(use_case.use_case_id.as_str());
     }
 
@@ -355,7 +355,10 @@ where
     T: Parse + Serialize,
 {
     let payload_bytes = payload.payload().context("Expected payload")?;
-    let killswitch_config = get_str_config("generic_metrics_use_case_killswitch");
+    let killswitch_config = options("snuba")
+        .ok()
+        .and_then(|o| o.get("generic_metrics_use_case_killswitch").ok())
+        .and_then(|v| v.as_str().map(String::from));
     let use_case: MessageUseCase = serde_json::from_slice(payload_bytes)?;
 
     if should_use_killswitch(killswitch_config, &use_case) {
@@ -1358,7 +1361,7 @@ mod tests {
 
     #[test]
     fn test_shouldnt_killswitch() {
-        let fake_config = Ok(Some("[custom]".to_string()));
+        let fake_config = Some("[custom]".to_string());
         let use_case = MessageUseCase {
             use_case_id: "transactions".to_string(),
         };
@@ -1371,7 +1374,7 @@ mod tests {
         let use_case = MessageUseCase {
             use_case_id: "transactions".to_string(),
         };
-        let fake_config = Ok(Some("[transactions]".to_string()));
+        let fake_config = Some("[transactions]".to_string());
 
         assert!(should_use_killswitch(fake_config, &use_case));
     }
@@ -1381,7 +1384,7 @@ mod tests {
         let use_case = MessageUseCase {
             use_case_id: "transactions".to_string(),
         };
-        let fake_config = Ok(Some("[transactions, custom]".to_string()));
+        let fake_config = Some("[transactions, custom]".to_string());
 
         assert!(should_use_killswitch(fake_config, &use_case));
     }
@@ -1391,7 +1394,7 @@ mod tests {
         let use_case = MessageUseCase {
             use_case_id: "transactions".to_string(),
         };
-        let fake_config = Ok(Some("[]".to_string()));
+        let fake_config = Some("[]".to_string());
 
         assert!(!should_use_killswitch(fake_config, &use_case));
     }
@@ -1401,7 +1404,7 @@ mod tests {
         let use_case = MessageUseCase {
             use_case_id: "transactions".to_string(),
         };
-        let fake_config = Ok(Some("".to_string()));
+        let fake_config = Some("".to_string());
 
         assert!(!should_use_killswitch(fake_config, &use_case));
     }
@@ -1411,7 +1414,7 @@ mod tests {
         let use_case = MessageUseCase {
             use_case_id: "transactions".to_string(),
         };
-        let fake_config = Ok(None);
+        let fake_config: Option<String> = None;
 
         assert!(!should_use_killswitch(fake_config, &use_case));
     }

rust_snuba/src/processors/utils.rs

@@ -1,6 +1,6 @@
 use crate::config::EnvConfig;
-use crate::runtime_config::get_str_config;
 use crate::types::item_type_name;
+use sentry_options::options;
 use chrono::{DateTime, NaiveDateTime, Utc};
 use schemars::JsonSchema;
 use sentry_arroyo::counter;
@@ -16,7 +16,7 @@ pub const INVALID_TIMESTAMP_FUTURE_INTERVAL_SECONDS: i64 = 7 * 24 * 60 * 60;
 /// timestamp dropping is enabled.
 pub const INVALID_TIMESTAMP_PAST_INTERVAL_SECONDS: i64 = 30 * 24 * 60 * 60;
 
-/// Runtime config key. When set to `"1"`, the eap-items consumer skips messages
+/// sentry-options key. When `true`, the eap-items consumer skips messages
 /// whose event `timestamp` is more than one week in the future or more than
 /// thirty days in the past (see `out_of_valid_interval_secs`).
 pub const DROP_INVALID_TIMESTAMPS_KEY: &str = "eap_items_drop_invalid_timestamps";
@@ -34,10 +34,10 @@ pub fn out_of_valid_interval_secs(ts: DateTime<Utc>, now: DateTime<Utc>) -> bool
 }
 
 pub fn get_drop_invalid_timestamps_enabled() -> bool {
-    get_str_config(DROP_INVALID_TIMESTAMPS_KEY)
+    options("snuba")
         .ok()
-        .flatten()
-        .map(|s| s == "1")
+        .and_then(|o| o.get(DROP_INVALID_TIMESTAMPS_KEY).ok())
+        .and_then(|v| v.as_bool())
         .unwrap_or(false)
 }
 

rust_snuba/src/strategies/healthcheck.rs

@@ -7,7 +7,7 @@ use sentry_arroyo::processing::strategies::{
 };
 use sentry_arroyo::types::Message;
 
-use crate::runtime_config::get_str_config;
+use sentry_options::options;
 
 const TOUCH_INTERVAL: Duration = Duration::from_secs(1);
 
@@ -57,11 +57,11 @@ where
     fn poll(&mut self) -> Result<Option<CommitRequest>, StrategyError> {
         let poll_result = self.next_step.poll();
 
-        if get_str_config("experimental_healthcheck")
+        if options("snuba")
             .ok()
-            .flatten()
-            .unwrap_or("0".to_string())
-            == "1"
+            .and_then(|o| o.get("experimental_healthcheck").ok())
+            .and_then(|v| v.as_bool())
+            .unwrap_or(false)
         {
             // If we are receiving a commit request, it means we are making progress and this can be considered a healthy state
             if let Ok(Some(_commit_request)) = poll_result.as_ref() {
@@ -97,16 +97,24 @@ where
 #[cfg(test)]
 mod tests {
     use super::HealthCheck;
-    use crate::runtime_config::patch_str_config_for_test;
     use sentry_arroyo::processing::strategies::{
         CommitRequest, ProcessingStrategy, StrategyError, SubmitError,
     };
     use sentry_arroyo::types::Message;
+    use sentry_options::init_with_schemas;
+    use sentry_options::testing::override_options;
+    use serde_json::json;
     use std::collections::HashMap;
     use std::fs;
     use std::path::Path;
+    use std::sync::Once;
     use std::time::Duration;
 
+    static INIT: Once = Once::new();
+    fn init_config() {
+        INIT.call_once(|| init_with_schemas(&[("snuba", crate::SNUBA_SCHEMA)]).unwrap());
+    }
+
     // Mock strategy that can be configured to return commit requests
     struct MockStrategy {
         return_commit_request: bool,
@@ -148,7 +156,9 @@ mod tests {
     #[test]
     fn test_file_created_when_making_progress() {
         // Setup
-        patch_str_config_for_test("experimental_healthcheck", Some("1"));
+        init_config();
+        let _guard =
+            override_options(&[("snuba", "experimental_healthcheck", json!(true))]).unwrap();
         let file_path = format!("/tmp/healthcheck_test_{}", uuid::Uuid::new_v4());
 
         // Create a mock strategy that returns a commit request
@@ -167,7 +177,9 @@ mod tests {
     #[test]
     fn test_not_making_progress() {
         // Setup
-        patch_str_config_for_test("experimental_healthcheck", Some("1"));
+        init_config();
+        let _guard =
+            override_options(&[("snuba", "experimental_healthcheck", json!(true))]).unwrap();
         let file_path = format!("/tmp/healthcheck_test_{}", uuid::Uuid::new_v4());
 
         // Create a mock strategy that doesn't return a commit request