-
Notifications
You must be signed in to change notification settings - Fork 161
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.
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
feat: prometheus metrics for RPC methods #4607
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
4cc1af6
basic metrics layer for rpc methods
lemmih d52949c
record rpc method histograms and failure rates
lemmih ca075e6
add changelog entry
lemmih aed8fc8
change wording.
lemmih 7dd062b
small comment
lemmih bac316a
remove old code, document the histogram bucket size
lemmih 1b103db
Merge branch 'main' into lemmih/rpc-metrics
lemmih File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
// Copyright 2019-2024 ChainSafe Systems | ||
// SPDX-License-Identifier: Apache-2.0, MIT | ||
|
||
use crate::metrics; | ||
use futures::future::BoxFuture; | ||
use futures::FutureExt; | ||
use jsonrpsee::server::middleware::rpc::RpcServiceT; | ||
use jsonrpsee::MethodResponse; | ||
use tower::Layer; | ||
|
||
// State-less jsonrpcsee layer for measuring RPC metrics | ||
#[derive(Clone)] | ||
pub struct MetricsLayer {} | ||
|
||
impl<S> Layer<S> for MetricsLayer { | ||
type Service = RecordMetrics<S>; | ||
|
||
fn layer(&self, service: S) -> Self::Service { | ||
RecordMetrics { service } | ||
} | ||
} | ||
|
||
#[derive(Clone)] | ||
pub struct RecordMetrics<S> { | ||
service: S, | ||
} | ||
|
||
impl<'a, S> RpcServiceT<'a> for RecordMetrics<S> | ||
where | ||
S: RpcServiceT<'a> + Send + Sync + Clone + 'static, | ||
{ | ||
type Future = BoxFuture<'a, MethodResponse>; | ||
|
||
fn call(&self, req: jsonrpsee::types::Request<'a>) -> Self::Future { | ||
let service = self.service.clone(); | ||
let method = metrics::RpcMethodLabel { | ||
method: req.method_name().to_owned(), | ||
}; | ||
|
||
async move { | ||
// Cannot use HistogramTimerExt::start_timer here since it would lock the metric. | ||
let start_time = std::time::Instant::now(); | ||
let req = service.call(req).await; | ||
|
||
metrics::RPC_METHOD_TIME | ||
.get_or_create(&method) | ||
.observe(start_time.elapsed().as_secs_f64()); | ||
|
||
if req.is_error() { | ||
metrics::RPC_METHOD_FAILURE.get_or_create(&method).inc(); | ||
} | ||
|
||
req | ||
} | ||
.boxed() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, I'm curious. Is there a particular reason we do not use
DEFAULT_REGISTRY.write()
here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the
default_registry()
hides the detail that the registry is under anRwLock
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But, I see that all other metrics use
DEFAULT_REGISTRY.write()
in this file.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
They likely shouldn't. :)