Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove jaeger from approval-voting and approval-distribution #5830

Merged
merged 7 commits into from
Sep 27, 2024
Merged

Remove jaeger from approval-voting and approval-distribution #5830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
73579ba
Remove approval-voting jaeger
alexggh Sep 25, 2024
21e858e
Remove jaeger spans from approval-distribution
alexggh Sep 25, 2024
dc7913c
Fix unittests
alexggh Sep 25, 2024
590e297
Merge branch 'master' into alexggh/remove_jeager
alexggh Sep 26, 2024
2615e7e
Add new benchmark numbers from CI job
alexggh Sep 27, 2024
87d9e37
Merge remote-tracking branch 'origin/master' into alexggh/remove_jeager
alexggh Sep 27, 2024
c3718be
Add prdoc
alexggh Sep 27, 2024
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
2 changes: 0 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion polkadot/node/core/approval-voting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ polkadot-node-subsystem-util = { workspace = true, default-features = true }
polkadot-overseer = { workspace = true, default-features = true }
polkadot-primitives = { workspace = true, default-features = true }
polkadot-node-primitives = { workspace = true, default-features = true }
polkadot-node-jaeger = { workspace = true, default-features = true }

sc-keystore = { workspace = true }
sp-consensus = { workspace = true }
Expand Down
5 changes: 3 additions & 2 deletions polkadot/node/core/approval-voting/benches/approval-voting-regression-bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,9 @@ fn main() -> Result<(), String> {
("Sent to peers", 63995.2200, 0.01),
]));
messages.extend(average_usage.check_cpu_usage(&[
("approval-distribution", 12.2736, 0.1),
("approval-voting", 2.7174, 0.1),
("approval-distribution", 0.1, 0.1),
("approval-voting", 0.1, 0.1),
("approval-voting-parallel", 18.0758, 0.1),
]));

if messages.is_empty() {
Expand Down
9 changes: 0 additions & 9 deletions polkadot/node/core/approval-voting/src/import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
//!
//! We maintain a rolling window of session indices. This starts as empty

use polkadot_node_jaeger as jaeger;
use polkadot_node_primitives::{
approval::{
self as approval_types,
Expand Down Expand Up @@ -348,13 +347,6 @@ pub(crate) async fn handle_new_head<
finalized_number: &Option<BlockNumber>,
) -> SubsystemResult<Vec<BlockImportedCandidates>> {
const MAX_HEADS_LOOK_BACK: BlockNumber = MAX_FINALITY_LAG;
let _handle_new_head_span = state
.spans
.get(&head)
.map(|span| span.child("handle-new-head"))
.unwrap_or_else(|| jaeger::Span::new(head, "handle-new-head"))
.with_string_tag("head", format!("{:?}", head))
.with_stage(jaeger::Stage::ApprovalChecking);

let header = {
let (h_tx, h_rx) = oneshot::channel();
Expand Down Expand Up @@ -666,7 +658,6 @@ pub(crate) mod tests {
slot_duration_millis: 6_000,
clock: Arc::new(MockClock::default()),
assignment_criteria: Box::new(MockAssignmentCriteria::default()),
spans: HashMap::new(),
per_block_assignments_gathering_times: LruMap::new(ByLength::new(
MAX_BLOCKS_WITH_ASSIGNMENT_TIMESTAMPS,
)),
Expand Down
Loading