From f914dc72c2f8e11d41d8580e417227004160c054 Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Thu, 22 Aug 2024 12:08:36 +0200 Subject: [PATCH 1/3] feat: add dummy /status probe in metrics' module --- crates/metrics/src/provider.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/crates/metrics/src/provider.rs b/crates/metrics/src/provider.rs index ea9d9c45..f07f487a 100644 --- a/crates/metrics/src/provider.rs +++ b/crates/metrics/src/provider.rs @@ -41,7 +41,9 @@ impl MetricsProvider { info!("Starting metrics server on port {}", self.config.server_port); let router = - axum::Router::new().route("/metrics", get(handle_metrics)).with_state(self.registry); + axum::Router::new() + .route("/metrics", get(handle_metrics)).with_state(self.registry) + .route("/status", get(handle_status)); let address = SocketAddr::from(([0, 0, 0, 0], self.config.server_port)); let listener = TcpListener::bind(&address).await?; @@ -51,6 +53,10 @@ impl MetricsProvider { } } +async fn handle_status() -> &'static str { + "OK" +} + async fn handle_metrics(State(registry): State) -> Response { trace!("Handling metrics request"); From cdfa15c3f5169699bdf0245ea3ff191b94d28189 Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Thu, 22 Aug 2024 12:13:08 +0200 Subject: [PATCH 2/3] fix: lint --- crates/metrics/src/provider.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/metrics/src/provider.rs b/crates/metrics/src/provider.rs index f07f487a..e9e5b652 100644 --- a/crates/metrics/src/provider.rs +++ b/crates/metrics/src/provider.rs @@ -40,9 +40,9 @@ impl MetricsProvider { pub async fn run(self) -> eyre::Result<()> { info!("Starting metrics server on port {}", self.config.server_port); - let router = - axum::Router::new() - .route("/metrics", get(handle_metrics)).with_state(self.registry) + let router = axum::Router::new() + .route("/metrics", get(handle_metrics)) + .with_state(self.registry) .route("/status", get(handle_status)); let address = SocketAddr::from(([0, 0, 0, 0], self.config.server_port)); let listener = TcpListener::bind(&address).await?; From 55cdbe7b4ce477a4066181367bc3174fc9598b2e Mon Sep 17 00:00:00 2001 From: "s. rannou" Date: Thu, 22 Aug 2024 17:30:19 +0200 Subject: [PATCH 3/3] fix: address review comments --- crates/metrics/src/provider.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/metrics/src/provider.rs b/crates/metrics/src/provider.rs index e9e5b652..939b2b34 100644 --- a/crates/metrics/src/provider.rs +++ b/crates/metrics/src/provider.rs @@ -42,8 +42,8 @@ impl MetricsProvider { let router = axum::Router::new() .route("/metrics", get(handle_metrics)) - .with_state(self.registry) - .route("/status", get(handle_status)); + .route("/status", get(handle_status)) + .with_state(self.registry); let address = SocketAddr::from(([0, 0, 0, 0], self.config.server_port)); let listener = TcpListener::bind(&address).await?; @@ -53,8 +53,10 @@ impl MetricsProvider { } } -async fn handle_status() -> &'static str { - "OK" +async fn handle_status() -> Response { + trace!("Handling status request"); + + StatusCode::OK.into_response() } async fn handle_metrics(State(registry): State) -> Response {