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

Add the global span to spawned network init tasks #1761

Merged
merged 1 commit into from
Feb 19, 2021
Merged

Add the global span to spawned network init tasks #1761

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions zebra-network/src/peer_set/initialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ use tower::{
buffer::Buffer, discover::Change, layer::Layer, load::peak_ewma::PeakEwmaDiscover,
util::BoxService, Service, ServiceExt,
};
use tracing::Span;
use tracing_futures::Instrument;

use crate::{
constants, peer, timestamp_collector::TimestampCollector, AddressBook, BoxError, Config,
Expand Down Expand Up @@ -133,7 +135,9 @@ where
);
}

let listen_guard = tokio::spawn(listen(config.listen_addr, listener, peerset_tx.clone()));
let listen_guard = tokio::spawn(
listen(config.listen_addr, listener, peerset_tx.clone()).instrument(Span::current()),
);

// 2. Initial peers, specified in the config.
let initial_peers_fut = {
Expand All @@ -148,7 +152,7 @@ where
.boxed()
};

let add_guard = tokio::spawn(initial_peers_fut);
let add_guard = tokio::spawn(initial_peers_fut.instrument(Span::current()));

// 3. Outgoing peers we connect to in response to load.
let mut candidates = CandidateSet::new(address_book.clone(), peer_set.clone());
Expand All @@ -165,14 +169,17 @@ where
let _ = demand_tx.try_send(());
}

let crawl_guard = tokio::spawn(crawl_and_dial(
config.new_peer_interval,
demand_tx,
demand_rx,
candidates,
connector,
peerset_tx,
));
let crawl_guard = tokio::spawn(
crawl_and_dial(
config.new_peer_interval,
demand_tx,
demand_rx,
candidates,
connector,
peerset_tx,
)
.instrument(Span::current()),
);

handle_tx
.send(vec![add_guard, listen_guard, crawl_guard])
Expand Down