Better RPC prometheus metrics. (#9358)

* Better RPC prometehus metrics.

* Add session metrics.

* Add counting requests as well.

* Fix type for web build.

* Fix browser-node

* Filter out unknown method names.

* Change Gauge to Counters

* Use micros instead of millis.

* cargo fmt

* Update client/rpc-servers/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* move log to separate lines.

* Fix compilation.

* cargo +nightly fmt --all

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Tomasz Drwięga
2021-08-24 12:48:23 +02:00
committed by GitHub
parent 3abe7cc4d0
commit d722c44248
4 changed files with 275 additions and 39 deletions
+194 -29
View File
@@ -18,41 +18,104 @@
//! Middleware for RPC requests.
use jsonrpc_core::{
FutureOutput, FutureResponse, Metadata, Middleware as RequestMiddleware, Request, Response,
};
use prometheus_endpoint::{register, CounterVec, Opts, PrometheusError, Registry, U64};
use std::collections::HashSet;
use futures::{future::Either, Future};
use jsonrpc_core::{FutureOutput, FutureResponse, Metadata, Middleware as RequestMiddleware};
use prometheus_endpoint::{
register, CounterVec, HistogramOpts, HistogramVec, Opts, PrometheusError, Registry, U64,
};
use futures::{future::Either, Future, FutureExt};
use pubsub::PubSubMetadata;
use crate::RpcHandler;
/// Metrics for RPC middleware
#[derive(Debug, Clone)]
pub struct RpcMetrics {
rpc_calls: Option<CounterVec<U64>>,
requests_started: CounterVec<U64>,
requests_finished: CounterVec<U64>,
calls_time: HistogramVec,
calls_started: CounterVec<U64>,
calls_finished: CounterVec<U64>,
}
impl RpcMetrics {
/// Create an instance of metrics
pub fn new(metrics_registry: Option<&Registry>) -> Result<Self, PrometheusError> {
Ok(Self {
rpc_calls: metrics_registry
.map(|r| {
register(
CounterVec::new(
Opts::new("rpc_calls_total", "Number of rpc calls received"),
&["protocol"],
)?,
r,
)
})
.transpose()?,
})
pub fn new(metrics_registry: Option<&Registry>) -> Result<Option<Self>, PrometheusError> {
if let Some(r) = metrics_registry {
Ok(Some(Self {
requests_started: register(
CounterVec::new(
Opts::new(
"rpc_requests_started",
"Number of RPC requests (not calls) received by the server.",
),
&["protocol"],
)?,
r,
)?,
requests_finished: register(
CounterVec::new(
Opts::new(
"rpc_requests_finished",
"Number of RPC requests (not calls) processed by the server.",
),
&["protocol"],
)?,
r,
)?,
calls_time: register(
HistogramVec::new(
HistogramOpts::new(
"rpc_calls_time",
"Total time [μs] of processed RPC calls",
),
&["protocol", "method"],
)?,
r,
)?,
calls_started: register(
CounterVec::new(
Opts::new(
"rpc_calls_started",
"Number of received RPC calls (unique un-batched requests)",
),
&["protocol", "method"],
)?,
r,
)?,
calls_finished: register(
CounterVec::new(
Opts::new(
"rpc_calls_finished",
"Number of processed RPC calls (unique un-batched requests)",
),
&["protocol", "method", "is_error"],
)?,
r,
)?,
}))
} else {
Ok(None)
}
}
}
/// Instantiates a dummy `IoHandler` given a builder function to extract supported method names.
pub fn method_names<F, M, E>(gen_handler: F) -> Result<HashSet<String>, E>
where
F: FnOnce(RpcMiddleware) -> Result<RpcHandler<M>, E>,
M: PubSubMetadata,
{
let io = gen_handler(RpcMiddleware::new(None, HashSet::new(), "dummy"))?;
Ok(io.iter().map(|x| x.0.clone()).collect())
}
/// Middleware for RPC calls
pub struct RpcMiddleware {
metrics: RpcMetrics,
metrics: Option<RpcMetrics>,
known_rpc_method_names: HashSet<String>,
transport_label: String,
}
@@ -61,8 +124,12 @@ impl RpcMiddleware {
///
/// - `metrics`: Will be used to report statistics.
/// - `transport_label`: The label that is used when reporting the statistics.
pub fn new(metrics: RpcMetrics, transport_label: &str) -> Self {
RpcMiddleware { metrics, transport_label: String::from(transport_label) }
pub fn new(
metrics: Option<RpcMetrics>,
known_rpc_method_names: HashSet<String>,
transport_label: &str,
) -> Self {
RpcMiddleware { metrics, known_rpc_method_names, transport_label: transport_label.into() }
}
}
@@ -70,15 +137,113 @@ impl<M: Metadata> RequestMiddleware<M> for RpcMiddleware {
type Future = FutureResponse;
type CallFuture = FutureOutput;
fn on_request<F, X>(&self, request: Request, meta: M, next: F) -> Either<FutureResponse, X>
fn on_request<F, X>(
&self,
request: jsonrpc_core::Request,
meta: M,
next: F,
) -> Either<Self::Future, X>
where
F: Fn(Request, M) -> X + Send + Sync,
X: Future<Output = Option<Response>> + Send + 'static,
F: Fn(jsonrpc_core::Request, M) -> X + Send + Sync,
X: Future<Output = Option<jsonrpc_core::Response>> + Send + 'static,
{
if let Some(ref rpc_calls) = self.metrics.rpc_calls {
rpc_calls.with_label_values(&[self.transport_label.as_str()]).inc();
let metrics = self.metrics.clone();
let transport_label = self.transport_label.clone();
if let Some(ref metrics) = metrics {
metrics.requests_started.with_label_values(&[transport_label.as_str()]).inc();
}
let r = next(request, meta);
Either::Left(
async move {
let r = r.await;
if let Some(ref metrics) = metrics {
metrics.requests_finished.with_label_values(&[transport_label.as_str()]).inc();
}
r
}
.boxed(),
)
}
Either::Right(next(request, meta))
fn on_call<F, X>(
&self,
call: jsonrpc_core::Call,
meta: M,
next: F,
) -> Either<Self::CallFuture, X>
where
F: Fn(jsonrpc_core::Call, M) -> X + Send + Sync,
X: Future<Output = Option<jsonrpc_core::Output>> + Send + 'static,
{
#[cfg(not(target_os = "unknown"))]
let start = std::time::Instant::now();
let name = call_name(&call, &self.known_rpc_method_names).to_owned();
let metrics = self.metrics.clone();
let transport_label = self.transport_label.clone();
log::trace!(target: "rpc_metrics", "[{}] {} call: {:?}", transport_label, name, &call);
if let Some(ref metrics) = metrics {
metrics
.calls_started
.with_label_values(&[transport_label.as_str(), name.as_str()])
.inc();
}
let r = next(call, meta);
Either::Left(
async move {
let r = r.await;
#[cfg(not(target_os = "unknown"))]
let micros = start.elapsed().as_micros();
// seems that std::time is not implemented for browser target
#[cfg(target_os = "unknown")]
let micros = 1;
if let Some(ref metrics) = metrics {
metrics
.calls_time
.with_label_values(&[transport_label.as_str(), name.as_str()])
.observe(micros as _);
metrics
.calls_finished
.with_label_values(&[
transport_label.as_str(),
name.as_str(),
if is_success(&r) { "true" } else { "false" },
])
.inc();
}
log::debug!(
target: "rpc_metrics",
"[{}] {} call took {} μs",
transport_label,
name,
micros,
);
r
}
.boxed(),
)
}
}
fn call_name<'a>(call: &'a jsonrpc_core::Call, known_methods: &HashSet<String>) -> &'a str {
// To prevent bloating metric with all invalid method names we filter them out here.
let only_known = |method: &'a String| {
if known_methods.contains(method) {
method.as_str()
} else {
"invalid method"
}
};
match call {
jsonrpc_core::Call::Invalid { .. } => "invalid call",
jsonrpc_core::Call::MethodCall(ref call) => only_known(&call.method),
jsonrpc_core::Call::Notification(ref notification) => only_known(&notification.method),
}
}
fn is_success(output: &Option<jsonrpc_core::Output>) -> bool {
match output {
Some(jsonrpc_core::Output::Success(..)) => true,
_ => false,
}
}