Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

client/network/service: Add primary dimension to connection metrics #6472

Merged
gavofyork merged 6 commits into from
Jun 23, 2020
Merged

client/network/service: Add primary dimension to connection metrics #6472

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
68c4f31
client/network/service: Add primary dimension to connection metrics
mxinden Jun 22, 2020
2d2f93e
.maintain/monitoring: Ensure to sum over all connections_closed variants
mxinden Jun 22, 2020
2ca29a8
client/network/service: Rename is_primary to is_first
mxinden Jun 23, 2020
b03b12d
client/network/service: Split by metric name with two additional metrics
mxinden Jun 23, 2020
9f3f33e
Revert ".maintain/monitoring: Ensure to sum over all connections_clos…
mxinden Jun 23, 2020
779a06e
client/network/service: Remove labels from distinct metrics
mxinden Jun 23, 2020
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
Prev Previous commit
client/network/service: Remove labels from distinct metrics
  • Loading branch information
@mxinden
mxinden committed Jun 23, 2020
commit 779a06ebf1af7727925690e77fbef40b3ce1118c
25 changes: 8 additions & 17 deletions client/network/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,8 +854,8 @@ struct Metrics {
// This list is ordered alphabetically
connections_closed_total: CounterVec<U64>,
connections_opened_total: CounterVec<U64>,
distinct_peers_connections_closed_total: CounterVec<U64>,
distinct_peers_connections_opened_total: CounterVec<U64>,
distinct_peers_connections_closed_total: Counter<U64>,
distinct_peers_connections_opened_total: Counter<U64>,
import_queue_blocks_submitted: Counter<U64>,
import_queue_finality_proofs_submitted: Counter<U64>,
import_queue_justifications_submitted: Counter<U64>,
Expand Down Expand Up @@ -902,19 +902,13 @@ impl Metrics {
),
&["direction"]
)?, registry)?,
distinct_peers_connections_closed_total: register(CounterVec::new(
Opts::new(
distinct_peers_connections_closed_total: register(Counter::new(
"sub_libp2p_distinct_peers_connections_closed_total",
"Total number of connections closed with distinct peers, by direction and reason"
),
&["direction", "reason"]
"Total number of connections closed with distinct peers"
)?, registry)?,
distinct_peers_connections_opened_total: register(CounterVec::new(
Opts::new(
distinct_peers_connections_opened_total: register(Counter::new(
"sub_libp2p_distinct_peers_connections_opened_total",
"Total number of connections opened with distinct peers by direction"
),
&["direction"]
"Total number of connections opened with distinct peers"
)?, registry)?,
import_queue_blocks_submitted: register(Counter::new(
"import_queue_blocks_submitted",
Expand Down Expand Up @@ -1238,11 +1232,10 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
ConnectedPoint::Dialer { .. } => "out",
ConnectedPoint::Listener { .. } => "in",
};

metrics.connections_opened_total.with_label_values(&[direction]).inc();

if num_established.get() == 1 {
metrics.distinct_peers_connections_opened_total.with_label_values(&[direction]).inc();
metrics.distinct_peers_connections_opened_total.inc();
}
}
},
Expand All @@ -1253,7 +1246,6 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
ConnectedPoint::Dialer { .. } => "out",
ConnectedPoint::Listener { .. } => "in",
};

let reason = match cause {
ConnectionError::IO(_) => "transport-error",
ConnectionError::Handler(NodeHandlerWrapperError::Handler(EitherError::A(EitherError::A(
Expand All @@ -1265,12 +1257,11 @@ impl<B: BlockT + 'static, H: ExHashT> Future for NetworkWorker<B, H> {
ConnectionError::Handler(NodeHandlerWrapperError::Handler(_)) => "protocol-error",
ConnectionError::Handler(NodeHandlerWrapperError::KeepAliveTimeout) => "keep-alive-timeout",
};

metrics.connections_closed_total.with_label_values(&[direction, reason]).inc();

// `num_established` represents the number of *remaining* connections.
if num_established == 0 {
metrics.distinct_peers_connections_closed_total.with_label_values(&[direction, reason]).inc();
metrics.distinct_peers_connections_closed_total.inc();
}
}
},
Expand Down