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

Add details to legacy requests #6747

Merged
2 commits merged into from
Aug 3, 2020
Merged

Add details to legacy requests #6747

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b8efa4
Add details to legacy requests
tomaka Jul 28, 2020
b50eee6
Merge remote-tracking branch 'upstream/master' into details-legacy-rqs
tomaka Aug 3, 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
30 changes: 18 additions & 12 deletions client/network/src/protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ use sp_runtime::traits::{
use sp_arithmetic::traits::SaturatedConversion;
use message::{BlockAnnounce, Message};
use message::generic::{Message as GenericMessage, Roles};
use prometheus_endpoint::{Registry, Gauge, Counter, GaugeVec, PrometheusError, Opts, register, U64};
use prometheus_endpoint::{
Registry, Gauge, Counter, CounterVec, GaugeVec,
PrometheusError, Opts, register, U64
};
use sync::{ChainSync, SyncState};
use std::borrow::Cow;
use std::collections::{BTreeMap, HashMap, HashSet, VecDeque, hash_map::Entry};
Expand Down Expand Up @@ -142,7 +145,7 @@ struct Metrics {
finality_proofs: GaugeVec<U64>,
justifications: GaugeVec<U64>,
propagated_transactions: Counter<U64>,
legacy_requests_received: Counter<U64>,
legacy_requests_received: CounterVec<U64>,
}

impl Metrics {
Expand Down Expand Up @@ -188,9 +191,12 @@ impl Metrics {
"sync_propagated_transactions",
"Number of transactions propagated to at least one peer",
)?, r)?,
legacy_requests_received: register(Counter::new(
"sync_legacy_requests_received",
"Number of block/finality/light-client requests received on the legacy substream",
legacy_requests_received: register(CounterVec::new(
Opts::new(
"sync_legacy_requests_received",
"Number of block/finality/light-client requests received on the legacy substream",
),
&["kind"]
)?, r)?,
})
}
Expand Down Expand Up @@ -719,7 +725,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {

fn on_block_request(&mut self, peer: PeerId, request: message::BlockRequest<B>) {
if let Some(metrics) = &self.metrics {
metrics.legacy_requests_received.inc();
metrics.legacy_requests_received.with_label_values(&["block-request"]).inc();
}

trace!(target: "sync", "BlockRequest {} from {}: from {:?} to {:?} max {:?} for {:?}",
Expand Down Expand Up @@ -1395,7 +1401,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
);

if let Some(metrics) = &self.metrics {
metrics.legacy_requests_received.inc();
metrics.legacy_requests_received.with_label_values(&["remote-call"]).inc();
}

let proof = match self.context_data.chain.execution_proof(
Expand Down Expand Up @@ -1519,7 +1525,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
request: message::RemoteReadRequest<B::Hash>,
) {
if let Some(metrics) = &self.metrics {
metrics.legacy_requests_received.inc();
metrics.legacy_requests_received.with_label_values(&["remote-read"]).inc();
}

if request.keys.is_empty() {
Expand Down Expand Up @@ -1572,7 +1578,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
request: message::RemoteReadChildRequest<B::Hash>,
) {
if let Some(metrics) = &self.metrics {
metrics.legacy_requests_received.inc();
metrics.legacy_requests_received.with_label_values(&["remote-child"]).inc();
}

if request.keys.is_empty() {
Expand Down Expand Up @@ -1632,7 +1638,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
request: message::RemoteHeaderRequest<NumberFor<B>>,
) {
if let Some(metrics) = &self.metrics {
metrics.legacy_requests_received.inc();
metrics.legacy_requests_received.with_label_values(&["remote-header"]).inc();
}

trace!(target: "sync", "Remote header proof request {} from {} ({})",
Expand Down Expand Up @@ -1666,7 +1672,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
request: message::RemoteChangesRequest<B::Hash>,
) {
if let Some(metrics) = &self.metrics {
metrics.legacy_requests_received.inc();
metrics.legacy_requests_received.with_label_values(&["remote-changes"]).inc();
}

trace!(target: "sync", "Remote changes proof request {} from {} for key {} ({}..{})",
Expand Down Expand Up @@ -1733,7 +1739,7 @@ impl<B: BlockT, H: ExHashT> Protocol<B, H> {
request: message::FinalityProofRequest<B::Hash>,
) {
if let Some(metrics) = &self.metrics {
metrics.legacy_requests_received.inc();
metrics.legacy_requests_received.with_label_values(&["finality-proof"]).inc();
}

trace!(target: "sync", "Finality proof request from {} for {}", who, request.block);
Expand Down