pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-21 15:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus Metrics: Turn notifications_total counter into notifications_sizes histogram (#5535)

Browse Source 
* Turn notifications_total into notifications_sizes

* Address review
This commit is contained in:
Pierre Krieger
2020-04-06 18:36:46 +02:00
committed by GitHub
parent 84a9c17b4e
commit dba0fcbaea
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/service.rs
+18 -10
View File
@@ -43,7 +43,7 @@ use libp2p::{kad::record, Multiaddr, PeerId};
use log::{error, info, trace, warn}; use log::{error, info, trace, warn};
use parking_lot::Mutex; use parking_lot::Mutex;
use prometheus_endpoint::{ use prometheus_endpoint::{
register, Counter, CounterVec, Gauge, GaugeVec, HistogramOpts, HistogramVec, Opts, PrometheusError, Registry, U64, register, Counter, Gauge, GaugeVec, HistogramOpts, HistogramVec, Opts, PrometheusError, Registry, U64,
}; };
use sc_peerset::PeersetHandle; use sc_peerset::PeersetHandle;
use sp_consensus::import_queue::{BlockImportError, BlockImportResult, ImportQueue, Link}; use sp_consensus::import_queue::{BlockImportError, BlockImportResult, ImportQueue, Link};
@@ -824,7 +824,7 @@ struct Metrics {
kbuckets_num_nodes: Gauge<U64>, kbuckets_num_nodes: Gauge<U64>,
network_per_sec_bytes: GaugeVec<U64>, network_per_sec_bytes: GaugeVec<U64>,
notifications_queues_size: HistogramVec, notifications_queues_size: HistogramVec,
notifications_total: CounterVec<U64>, notifications_sizes: HistogramVec,
num_event_stream_channels: Gauge<U64>, num_event_stream_channels: Gauge<U64>,
opened_notification_streams: GaugeVec<U64>, opened_notification_streams: GaugeVec<U64>,
peers_count: Gauge<U64>, peers_count: Gauge<U64>,
@@ -879,11 +879,15 @@ impl Metrics {
}, },
&["protocol"] &["protocol"]
)?, registry)?, )?, registry)?,
notifications_total: register(CounterVec::new( notifications_sizes: register(HistogramVec::new(
Opts::new( HistogramOpts {
"sub_libp2p_notifications_total", common_opts: Opts::new(
"Number of notification received from all nodes" "sub_libp2p_notifications_sizes",
), "Sizes of the notifications send to and received from all nodes"
),
buckets: prometheus_endpoint::exponential_buckets(64.0, 4.0, 8)
.expect("parameters are always valid values; qed"),
},
&["direction", "protocol"] &["direction", "protocol"]
)?, registry)?, )?, registry)?,
num_event_stream_channels: register(Gauge::new( num_event_stream_channels: register(Gauge::new(
@@ -921,8 +925,10 @@ impl Metrics {
self.opened_notification_streams.with_label_values(&[&engine_id_to_string(&engine_id)]).dec(); self.opened_notification_streams.with_label_values(&[&engine_id_to_string(&engine_id)]).dec();
}, },
Event::NotificationsReceived { messages, .. } => { Event::NotificationsReceived { messages, .. } => {
for (engine_id, _) in messages { for (engine_id, message) in messages {
self.notifications_total.with_label_values(&["in", &engine_id_to_string(&engine_id)]).inc(); self.notifications_sizes
.with_label_values(&["in", &engine_id_to_string(&engine_id)])
.observe(message.len() as f64);
} }
}, },
_ => {} _ => {}
@@ -983,7 +989,9 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
this.event_streams.push(sender), this.event_streams.push(sender),
ServiceToWorkerMsg::WriteNotification { message, engine_id, target } => { ServiceToWorkerMsg::WriteNotification { message, engine_id, target } => {
if let Some(metrics) = this.metrics.as_ref() { if let Some(metrics) = this.metrics.as_ref() {
metrics.notifications_total.with_label_values(&["out", &engine_id_to_string(&engine_id)]).inc(); metrics.notifications_sizes
.with_label_values(&["out", &engine_id_to_string(&engine_id)])
.observe(message.len() as f64);
} }
this.network_service.user_protocol_mut().write_notification(target, engine_id, message) this.network_service.user_protocol_mut().write_notification(target, engine_id, message)
}, },
substrate/utils/prometheus/src/lib.rs
+1
View File
@@ -19,6 +19,7 @@ pub use prometheus::{
self, self,
Registry, Error as PrometheusError, Opts, Registry, Error as PrometheusError, Opts,
Histogram, HistogramOpts, HistogramVec, Histogram, HistogramOpts, HistogramVec,
exponential_buckets,
core::{ core::{
GenericGauge as Gauge, GenericCounter as Counter, GenericGauge as Gauge, GenericCounter as Counter,
GenericGaugeVec as GaugeVec, GenericCounterVec as CounterVec, GenericGaugeVec as GaugeVec, GenericCounterVec as CounterVec,