pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 23:51:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

sc-consensus-beefy: fix metrics: use correct names (#13494)

Browse Source 
Signed-off-by: acatangiu <adrian@parity.io>
This commit is contained in:
Adrian Catangiu
2023-03-01 18:04:09 +02:00
committed by GitHub
parent 9720a8749a
commit a21880b76f
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/consensus/beefy/src/metrics.rs
+27 -7
View File
@@ -18,7 +18,8 @@
//! BEEFY Prometheus metrics definition //! BEEFY Prometheus metrics definition
use log::debug; use crate::LOG_TARGET;
use log::{debug, error};
use prometheus::{register, Counter, Gauge, PrometheusError, Registry, U64}; use prometheus::{register, Counter, Gauge, PrometheusError, Registry, U64};
/// Helper trait for registering BEEFY metrics to Prometheus registry. /// Helper trait for registering BEEFY metrics to Prometheus registry.
@@ -129,13 +130,13 @@ impl PrometheusRegister for VoterMetrics {
)?, )?,
beefy_equivocation_votes: register( beefy_equivocation_votes: register(
Counter::new( Counter::new(
"substrate_beefy_stale_votes", "substrate_beefy_equivocation_votes",
"Number of equivocation votes received", "Number of equivocation votes received",
)?, )?,
registry, registry,
)?, )?,
beefy_invalid_votes: register( beefy_invalid_votes: register(
Counter::new("substrate_beefy_stale_votes", "Number of invalid votes received")?, Counter::new("substrate_beefy_invalid_votes", "Number of invalid votes received")?,
registry, registry,
)?, )?,
beefy_stale_votes: register( beefy_stale_votes: register(
@@ -200,14 +201,14 @@ impl PrometheusRegister for BlockImportMetrics {
beefy_good_justification_imports: register( beefy_good_justification_imports: register(
Counter::new( Counter::new(
"substrate_beefy_good_justification_imports", "substrate_beefy_good_justification_imports",
"Number of Good Justification imports", "Number of good justifications on block-import",
)?, )?,
registry, registry,
)?, )?,
beefy_bad_justification_imports: register( beefy_bad_justification_imports: register(
Counter::new( Counter::new(
"substrate_beefy_bad_justification_imports", "substrate_beefy_bad_justification_imports",
"Number of Bad Justification imports", "Number of bad justifications on block-import",
)?, )?,
registry, registry,
)?, )?,
@@ -309,11 +310,16 @@ pub(crate) fn register_metrics<T: PrometheusRegister>(
) -> Option<T> { ) -> Option<T> {
prometheus_registry.as_ref().map(T::register).and_then(|result| match result { prometheus_registry.as_ref().map(T::register).and_then(|result| match result {
Ok(metrics) => { Ok(metrics) => {
debug!(target: "beefy", "🥩 Registered {} metrics", T::DESCRIPTION); debug!(target: LOG_TARGET, "🥩 Registered {} metrics", T::DESCRIPTION);
Some(metrics) Some(metrics)
}, },
Err(err) => { Err(err) => {
debug!(target: "beefy", "🥩 Failed to register {} metrics: {:?}", T::DESCRIPTION, err); error!(
target: LOG_TARGET,
"🥩 Failed to register {} metrics: {:?}",
T::DESCRIPTION,
err
);
None None
}, },
}) })
@@ -347,3 +353,17 @@ macro_rules! metric_get {
$self.metrics.as_ref().map(|metrics| metrics.$m.clone()) $self.metrics.as_ref().map(|metrics| metrics.$m.clone())
}}; }};
} }
#[cfg(test)]
pub(crate) mod tests {
use super::*;
#[test]
fn should_register_metrics() {
let registry = Some(Registry::new());
assert!(register_metrics::<VoterMetrics>(registry.clone()).is_some());
assert!(register_metrics::<BlockImportMetrics>(registry.clone()).is_some());
assert!(register_metrics::<OnDemandIncomingRequestsMetrics>(registry.clone()).is_some());
assert!(register_metrics::<OnDemandOutgoingRequestsMetrics>(registry.clone()).is_some());
}
}