disable metrics for tests (#769)

Author: MarinPostma

sqld/src/config.rs

@@ -109,6 +109,7 @@ impl<A> UserApiConfig<A> {
 pub struct AdminApiConfig<A = AddrIncoming, C = HttpsConnector<HttpConnector>> {
     pub acceptor: A,
     pub connector: C,
+    pub disable_metrics: bool,
 }
 
 #[derive(Clone)]

sqld/src/http/admin/mod.rs

@@ -27,21 +27,25 @@ type UserHttpServer<M> =
 
 #[derive(Clone)]
 struct Metrics {
-    handle: PrometheusHandle,
+    handle: Option<PrometheusHandle>,
+}
+
+impl Metrics {
+    fn render(&self) -> String {
+        self.handle.as_ref().map(|h| h.render()).unwrap_or_default()
+    }
 }
 
 struct AppState<M: MakeNamespace, C> {
     namespaces: NamespaceStore<M>,
     user_http_server: UserHttpServer<M>,
     connector: C,
-    metrics: PrometheusHandle,
+    metrics: Metrics,
 }
 
 impl<M: MakeNamespace, C> FromRef<Arc<AppState<M, C>>> for Metrics {
     fn from_ref(input: &Arc<AppState<M, C>>) -> Self {
-        Metrics {
-            handle: input.metrics.clone(),
-        }
+        input.metrics.clone()
     }
 }
 
@@ -50,13 +54,20 @@ pub async fn run<M, A, C>(
     user_http_server: UserHttpServer<M>,
     namespaces: NamespaceStore<M>,
     connector: C,
+    disable_metrics: bool,
 ) -> anyhow::Result<()>
 where
     A: crate::net::Accept,
     M: MakeNamespace,
     C: Connector,
 {
     use axum::routing::{get, post};
+    let metrics = Metrics {
+        handle: (!disable_metrics)
+            .then(|| PrometheusBuilder::new().install_recorder())
+            .transpose()
+            .unwrap(),
+    };
     let router = axum::Router::new()
         .route("/", get(handle_get_index))
         .route(
@@ -79,7 +90,7 @@ where
             namespaces,
             connector,
             user_http_server,
-            metrics: PrometheusBuilder::new().install_recorder().unwrap(),
+            metrics,
         }));
 
     hyper::server::Server::builder(acceptor)
@@ -94,7 +105,7 @@ async fn handle_get_index() -> &'static str {
 }
 
 async fn handle_metrics(State(metrics): State<Metrics>) -> String {
-    metrics.handle.render()
+    metrics.render()
 }
 
 async fn handle_get_config<M: MakeNamespace, C: Connector>(

sqld/src/lib.rs

@@ -161,13 +161,15 @@ where
         if let Some(AdminApiConfig {
             acceptor,
             connector,
+            disable_metrics,
         }) = self.admin_api_config
         {
             join_set.spawn(http::admin::run(
                 acceptor,
                 user_http_service,
                 self.namespaces,
                 connector,
+                disable_metrics,
             ));
         }
     }

sqld/src/main.rs

@@ -360,6 +360,7 @@ async fn make_admin_api_config(config: &Cli) -> anyhow::Result<Option<AdminApiCo
             Ok(Some(AdminApiConfig {
                 acceptor,
                 connector,
+                disable_metrics: false,
             }))
         }
         None => Ok(None),

sqld/tests/cluster/mod.rs

@@ -29,6 +29,7 @@ fn make_cluster(sim: &mut Sim, num_replica: usize, disable_namespaces: bool) {
                 admin_api_config: Some(AdminApiConfig {
                     acceptor: TurmoilAcceptor::bind(([0, 0, 0, 0], 9090)).await?,
                     connector: TurmoilConnector,
+                    disable_metrics: true,
                 }),
                 rpc_server_config: Some(RpcServerConfig {
                     acceptor: TurmoilAcceptor::bind(([0, 0, 0, 0], 4567)).await?,
@@ -59,6 +60,7 @@ fn make_cluster(sim: &mut Sim, num_replica: usize, disable_namespaces: bool) {
                     admin_api_config: Some(AdminApiConfig {
                         acceptor: TurmoilAcceptor::bind(([0, 0, 0, 0], 9090)).await?,
                         connector: TurmoilConnector,
+                        disable_metrics: true,
                     }),
                     rpc_client_config: Some(RpcClientConfig {
                         remote_url: "http://primary:4567".into(),

sqld/tests/namespaces/mod.rs

@@ -24,6 +24,7 @@ fn make_primary(sim: &mut Sim, path: PathBuf) {
                 admin_api_config: Some(AdminApiConfig {
                     acceptor: TurmoilAcceptor::bind(([0, 0, 0, 0], 9090)).await?,
                     connector: TurmoilConnector,
+                    disable_metrics: true,
                 }),
                 rpc_server_config: Some(RpcServerConfig {
                     acceptor: TurmoilAcceptor::bind(([0, 0, 0, 0], 4567)).await?,