feat(server): Use global config from file if provided

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 **Features**:
 
+- Use static global configuration if file is provided. ([#2453](https://github.com/getsentry/relay/pull/2453))
 - Tag keys in error events and transaction events can now be up to `200` ASCII characters long. Before, tag keys were limited to 32 characters. ([#2453](https://github.com/getsentry/relay/pull/2453))
 
 **Bug Fixes**:

relay-config/Cargo.toml

@@ -20,6 +20,7 @@ num_cpus = "1.13.0"
 relay-auth = { path = "../relay-auth" }
 relay-common = { path = "../relay-common" }
 relay-kafka = { path = "../relay-kafka" }
+relay-dynamic-config = { path = "../relay-dynamic-config" }
 relay-log = { path = "../relay-log", features = ["init"] }
 relay-metrics = { path = "../relay-metrics" }
 relay-redis = { path = "../relay-redis" }

relay-config/src/config.rs

@@ -5,12 +5,14 @@ use std::io::Write;
 use std::net::{IpAddr, SocketAddr, ToSocketAddrs};
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
+use std::sync::Arc;
 use std::time::Duration;
 use std::{env, fmt, fs, io};
 
 use anyhow::Context;
 use relay_auth::{generate_key_pair, generate_relay_id, PublicKey, RelayId, SecretKey};
 use relay_common::Dsn;
+use relay_dynamic_config::GlobalConfig;
 use relay_kafka::{
     ConfigError as KafkaConfigError, KafkaConfig, KafkaConfigParam, KafkaTopic, TopicAssignments,
 };
@@ -1250,6 +1252,7 @@ impl ConfigObject for ConfigValues {
 pub struct Config {
     values: ConfigValues,
     credentials: Option<Credentials>,
+    global_config: Option<Arc<GlobalConfig>>,
     path: PathBuf,
 }
 
@@ -1263,6 +1266,11 @@ impl fmt::Debug for Config {
 }
 
 impl Config {
+    /// globconf
+    pub fn global_config(&self) -> Option<Arc<GlobalConfig>> {
+        self.global_config.clone()
+    }
+
     /// Loads a config from a given config folder.
     pub fn from_path<P: AsRef<Path>>(path: P) -> anyhow::Result<Config> {
         let path = env::current_dir()
@@ -1276,6 +1284,7 @@ impl Config {
             } else {
                 None
             },
+            global_config: GlobalConfig::from_file()?.map(Arc::new),
             path: path.clone(),
         };
 
@@ -1294,6 +1303,7 @@ impl Config {
             values: serde_json::from_value(value)
                 .with_context(|| ConfigError::new(ConfigErrorKind::BadJson))?,
             credentials: None,
+            global_config: GlobalConfig::from_file()?.map(Arc::new),
             path: PathBuf::new(),
         })
     }
@@ -2022,6 +2032,7 @@ impl Default for Config {
             values: ConfigValues::default(),
             credentials: None,
             path: PathBuf::new(),
+            global_config: None,
         }
     }
 }

relay-dynamic-config/src/global.rs

@@ -7,3 +7,22 @@ use serde::{Deserialize, Serialize};
 #[derive(Default, Clone, Debug, Serialize, Deserialize)]
 #[serde(default, rename_all = "camelCase")]
 pub struct GlobalConfig {}
+
+impl GlobalConfig {
+    /// load it from a file
+    pub fn from_file() -> anyhow::Result<Option<GlobalConfig>> {
+        let path = std::env::current_dir()?
+            .join(".relay")
+            .join("global_config.json");
+
+        match path.exists() {
+            true => {
+                let file_contents = std::fs::read_to_string(path)?;
+                let global_config = serde_json::from_str::<GlobalConfig>(file_contents.as_str())?;
+
+                Ok(Some(global_config))
+            }
+            false => Ok(None),
+        }
+    }
+}

relay-server/src/actors/global_config.rs

@@ -148,6 +148,7 @@ impl GlobalConfigService {
     pub fn new(config: Arc<Config>, upstream: Addr<UpstreamRelay>) -> Self {
         let (global_config_watch, _) = watch::channel(Arc::default());
         let (internal_tx, internal_rx) = mpsc::channel(1);
+
         Self {
             config,
             global_config_watch,
@@ -181,6 +182,7 @@ impl GlobalConfigService {
     /// Requests a new global config from upstream.
     ///
     /// We check if we have credentials before sending,
+    ///
     /// otherwise we would log an [`UpstreamRequestError::NoCredentials`] error.
     fn update_global_config(&mut self) {
         self.fetch_handle.reset();
@@ -243,17 +245,25 @@ impl Service for GlobalConfigService {
 
     fn spawn_handler(mut self, mut rx: relay_system::Receiver<Self::Interface>) {
         tokio::spawn(async move {
-            relay_log::info!("global config service starting");
-
-            if self.config.has_credentials() {
-                // NOTE(iker): if this first request fails it's possible the default
-                // global config is forwarded. This is not ideal, but we accept it
-                // for now.
-                self.update_global_config();
-            } else {
-                // NOTE(iker): not making a request results in the sleep handler
-                // not being reset, so no new requests are made.
-                relay_log::info!("fetching global configs disabled: no credentials configured");
+            match (self.config.has_credentials(), self.config.global_config()) {
+                (true, None) => {
+                    // NOTE(iker): if this first request fails it's possible the default
+                    // global config is forwarded. This is not ideal, but we accept it
+                    // for now.
+                    relay_log::info!("global config service starting");
+                    self.update_global_config();
+                }
+                (false, None) => {
+                    // NOTE(iker): not making a request results in the sleep handler
+                    // not being reset, so no new requests are made.
+                    relay_log::info!("global config service starting with fetching disabled: no credentials configured");
+                }
+                (_, Some(global_config)) => {
+                    relay_log::info!("global config service starting with fetching disabled: using static global config");
+                    self.global_config_watch
+                        .send(global_config.clone())
+                        .unwrap();
+                }
             }
 
             loop {