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

Add one Jaeger span per relay parent (#2196)

Browse Source 
* Add one Jaeger span per relay parent

This adds one Jaeger span per relay parent, instead of always creating
new spans per relay parent. This should improve the UI view, because
subsystems are now grouped below one common span.

* Fix doc tests

* Replace `PerLeaveSpan` to `PerLeafSpan`

* More renaming

* Moare

* Update node/subsystem/src/lib.rs

Co-authored-by: Andronik Ordian <write@reusable.software>

* Skip the spans

* Increase `spec_version`

Co-authored-by: Andronik Ordian <write@reusable.software>
This commit is contained in:
Bastian Köcher
2021-01-05 15:09:25 +01:00
committed by GitHub
parent ceb9e2161c
commit 5be092894e
32 changed files with 535 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/node/network/pov-distribution/src/lib.rs
+4 -4
View File
@@ -40,7 +40,7 @@ use polkadot_node_subsystem_util::{
metrics::{self, prometheus},
};
use polkadot_node_network_protocol::{
v1 as protocol_v1, ReputationChange as Rep, NetworkBridgeEvent, PeerId, View,
v1 as protocol_v1, ReputationChange as Rep, NetworkBridgeEvent, PeerId, OurView,
};
use futures::prelude::*;
@@ -96,7 +96,7 @@ struct State {
peer_state: HashMap<PeerId, PeerState>,
/// Our own view.
our_view: View,
our_view: OurView,
/// Connect to relevant groups of validators at different relay parents.
connection_requests: validator_discovery::ConnectionRequests,
@@ -152,8 +152,8 @@ async fn handle_signal(
OverseerSignal::ActiveLeaves(ActiveLeavesUpdate { activated, deactivated }) => {
let _timer = state.metrics.time_handle_signal();
for relay_parent in activated {
match request_validators_ctx(relay_parent.clone(), ctx).await {
for (relay_parent, _span) in activated {
match request_validators_ctx(relay_parent, ctx).await {
Ok(vals_rx) => {
let n_validators = match vals_rx.await? {
Ok(v) => v.len(),
polkadot/node/network/pov-distribution/src/tests.rs
+35 -20
View File
@@ -1,11 +1,26 @@
// Copyright 2020-2021 Parity Technologies (UK) Ltd.
// This file is part of Polkadot.
// Polkadot is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Polkadot is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
use super::*;
use std::time::Duration;
use std::{time::Duration, sync::Arc};
use assert_matches::assert_matches;
use futures::executor;
use tracing::trace;
use smallvec::smallvec;
use sp_keyring::Sr25519Keyring;
@@ -13,10 +28,10 @@ use polkadot_primitives::v1::{
AuthorityDiscoveryId, BlockData, CoreState, GroupRotationInfo, Id as ParaId,
ScheduledCore, ValidatorIndex, SessionIndex, SessionInfo,
};
use polkadot_subsystem::messages::{RuntimeApiMessage, RuntimeApiRequest};
use polkadot_subsystem::{messages::{RuntimeApiMessage, RuntimeApiRequest}, JaegerSpan};
use polkadot_node_subsystem_test_helpers as test_helpers;
use polkadot_node_subsystem_util::TimeoutExt;
use polkadot_node_network_protocol::view;
use polkadot_node_network_protocol::{view, our_view};
fn make_pov(data: Vec<u8>) -> PoV {
PoV { block_data: BlockData(data) }
@@ -261,8 +276,8 @@ fn ask_validators_for_povs() {
overseer_signal(
&mut virtual_overseer,
OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
activated: smallvec![test_state.relay_parent.clone()],
deactivated: smallvec![],
activated: [(test_state.relay_parent, Arc::new(JaegerSpan::Disabled))][..].into(),
deactivated: [][..].into(),
}),
).await;
@@ -429,8 +444,8 @@ fn ask_validators_for_povs() {
overseer_signal(
&mut virtual_overseer,
OverseerSignal::ActiveLeaves(ActiveLeavesUpdate {
activated: smallvec![next_leaf.clone()],
deactivated: smallvec![current.clone()],
activated: [(next_leaf, Arc::new(JaegerSpan::Disabled))][..].into(),
deactivated: [current.clone()][..].into(),
})
).await;
@@ -583,7 +598,7 @@ fn distributes_to_those_awaiting_and_completes_local() {
s
},
our_view: view![hash_a, hash_b],
our_view: our_view![hash_a, hash_b],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -666,7 +681,7 @@ fn we_inform_peers_with_same_view_we_are_awaiting() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -840,7 +855,7 @@ fn peer_view_change_leads_to_us_informing() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -913,7 +928,7 @@ fn peer_complete_fetch_and_is_rewarded() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1003,7 +1018,7 @@ fn peer_punished_for_sending_bad_pov() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1068,7 +1083,7 @@ fn peer_punished_for_sending_unexpected_pov() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1131,7 +1146,7 @@ fn peer_punished_for_sending_pov_out_of_our_view() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1191,7 +1206,7 @@ fn peer_reported_for_awaiting_too_much() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1278,7 +1293,7 @@ fn peer_reported_for_awaiting_outside_their_view() {
s
},
our_view: view![hash_a, hash_b],
our_view: our_view![hash_a, hash_b],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1342,7 +1357,7 @@ fn peer_reported_for_awaiting_outside_our_view() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1421,7 +1436,7 @@ fn peer_complete_fetch_leads_to_us_completing_others() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};
@@ -1505,7 +1520,7 @@ fn peer_completing_request_no_longer_awaiting() {
s
},
our_view: view![hash_a],
our_view: our_view![hash_a],
metrics: Default::default(),
connection_requests: Default::default(),
};