Skip to content

fix: prometheus graceful shutdown #8784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattsse merged 2 commits into from
Jun 12, 2024
Merged

fix: prometheus graceful shutdown #8784

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93ebcd0
fix: prometheus graceful shutdown
mattsse Jun 12, 2024
68a5cbe
rustmft
mattsse Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions crates/node-core/src/metrics/prometheus_exporter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use crate::metrics::version_metrics::register_version_metrics;
use eyre::WrapErr;
use futures::{future::FusedFuture, FutureExt};
use http::Response;
use metrics::describe_gauge;
use metrics_exporter_prometheus::{PrometheusBuilder, PrometheusHandle};
Expand Down Expand Up @@ -65,17 +66,14 @@ async fn start_endpoint<F: Hook + 'static>(
tokio::net::TcpListener::bind(listen_addr).await.wrap_err("Could not bind to address")?;

task_executor.spawn_with_graceful_shutdown_signal(|signal| async move {
let mut shutdown = signal.ignore_guard();
let mut shutdown = signal.ignore_guard().fuse();
loop {
let io = tokio::select! {
res = listener.accept() => match res {
Ok((stream, _remote_addr)) => stream,
Err(err) => {
tracing::error!(%err, "failed to accept connection");
continue;
}
},
_ = &mut shutdown => break,
let io = match listener.accept().await {
Ok((stream, _remote_addr)) => stream,
Err(err) => {
tracing::error!(%err, "failed to accept connection");
continue;
}
};

let handle = handle.clone();
Expand All @@ -89,7 +87,11 @@ async fn start_endpoint<F: Hook + 'static>(
if let Err(error) =
jsonrpsee::server::serve_with_graceful_shutdown(io, service, &mut shutdown).await
{
tracing::error!(%error, "metrics endpoint crashed")
tracing::debug!(%error, "failed to serve request")
}

if shutdown.is_terminated() {
break;
}
}
});
Expand Down