diff options
| author | Alex <alex@adnab.me> | 2024-01-16 11:33:27 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-01-16 11:33:27 +0000 |
| commit | 707d85f60293099e75e5aa821c0ee66796fdaa5b (patch) | |
| tree | 09f2dbdd30f8464c2d1f27532a690a46258aedb9 /src/garage/server.rs | |
| parent | d91a1de7315373271bce72088a4c73007f2154e8 (diff) | |
| parent | 4c5be79b8015510618ad1df7451c50e3f2659978 (diff) | |
| download | garage-707d85f60293099e75e5aa821c0ee66796fdaa5b.tar.gz garage-707d85f60293099e75e5aa821c0ee66796fdaa5b.zip | |
Merge pull request 'sync garage v0.9 with garage v0.8' (#657) from sync-08-09 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/657
Diffstat (limited to 'src/garage/server.rs')
| -rw-r--r-- | src/garage/server.rs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/garage/server.rs b/src/garage/server.rs index 3ad10b72..ac76a44d 100644 --- a/src/garage/server.rs +++ b/src/garage/server.rs @@ -15,9 +15,9 @@ use garage_web::WebServer; use garage_api::k2v::api_server::K2VApiServer; use crate::admin::*; +use crate::secrets::{fill_secrets, Secrets}; #[cfg(feature = "telemetry-otlp")] use crate::tracing_setup::*; -use crate::{fill_secrets, Secrets}; async fn wait_from(mut chan: watch::Receiver<bool>) { while !*chan.borrow() { @@ -29,12 +29,19 @@ async fn wait_from(mut chan: watch::Receiver<bool>) { pub async fn run_server(config_file: PathBuf, secrets: Secrets) -> Result<(), Error> { info!("Loading configuration..."); - let config = fill_secrets(read_config(config_file)?, secrets); + let config = fill_secrets(read_config(config_file)?, secrets)?; // ---- Initialize Garage internals ---- #[cfg(feature = "metrics")] - let metrics_exporter = opentelemetry_prometheus::exporter().init(); + let metrics_exporter = opentelemetry_prometheus::exporter() + .with_default_summary_quantiles(vec![0.25, 0.5, 0.75, 0.9, 0.95, 0.99]) + .with_default_histogram_boundaries(vec![ + 0.001, 0.0015, 0.002, 0.003, 0.005, 0.007, 0.01, 0.015, 0.02, 0.03, 0.05, 0.07, 0.1, + 0.15, 0.2, 0.3, 0.5, 0.7, 1., 1.5, 2., 3., 5., 7., 10., 15., 20., 30., 40., 50., 60., + 70., 100., + ]) + .init(); info!("Initializing Garage main data store..."); let garage = Garage::new(config.clone())?; |