Skip to content

refactor: unify logging on tracing #635

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

Merged
xdustinface merged 1 commit into from
Apr 9, 2026
Merged

refactor: unify logging on tracing #635

Show file tree
Hide file tree
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
4 changes: 0 additions & 4 deletions dash-spv/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ dashcore-rpc = { path = "../rpc-client", optional = true }
# DNS (trust-dns-resolver was renamed to hickory_resolver)
hickory-resolver = "0.25"

# Also add log to main dependencies for consistency
log = "0.4"

[dev-dependencies]
dash-spv = { path = ".", features = ["test-utils"] }
dashcore = { path = "../dash", features = ["test-utils"] }
Expand All @@ -63,7 +60,6 @@ key-wallet-manager = { path = "../key-wallet-manager", features = ["test-utils"]
criterion = { version = "0.8.1", features = ["async_tokio"] }
tempfile = "3.0"
tokio-test = "0.4"
env_logger = "0.10"
hex = "0.4"
test-case = "3.3"

Expand Down
2 changes: 1 addition & 1 deletion dash-spv/src/client/lifecycle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ impl<W: WalletInterface, N: NetworkManager, S: StorageManager, H: EventHandler>
// Shut down sync coordinator: signals cancellation and waits for manager
// tasks to drain before we tear down the network and storage layers.
if let Err(e) = self.sync_coordinator.lock().await.shutdown().await {
log::warn!("Error shutting down sync coordinator: {}", e);
tracing::warn!("Error shutting down sync coordinator: {}", e);
}

// Disconnect from network
Expand Down
10 changes: 5 additions & 5 deletions dash-spv/src/network/addrv2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl AddrV2Handler {
/// Handle SendAddrV2 message indicating peer support
pub async fn handle_sendaddrv2(&self, peer_addr: SocketAddr) {
self.supports_addrv2.write().await.insert(peer_addr);
log::debug!("Peer {} supports AddrV2", peer_addr);
tracing::debug!("Peer {} supports AddrV2", peer_addr);
}

/// Handle incoming AddrV2 messages
Expand All @@ -55,7 +55,7 @@ impl AddrV2Handler {
let now = SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap_or_else(|e| {
log::error!("System time error in handle_addrv2: {}", e);
tracing::error!("System time error in handle_addrv2: {}", e);
Duration::from_secs(0)
})
.as_secs() as u32;
Expand All @@ -68,7 +68,7 @@ impl AddrV2Handler {
// Accept addresses seen within the last week. Older addresses are likely stale.
// Also, reject timestamps more than 10 minutes in the future which are invalid.
if msg.time < now.saturating_sub(ONE_WEEK) || msg.time > now + TEN_MINUTES {
log::trace!("Ignoring AddrV2 with invalid timestamp: {}", msg.time);
tracing::trace!("Ignoring AddrV2 with invalid timestamp: {}", msg.time);
continue;
}

Expand All @@ -87,7 +87,7 @@ impl AddrV2Handler {

evict_if_needed(&mut known_peers);

log::info!(
tracing::info!(
"Processed AddrV2 messages: received {}, added {}, updated {}, total known peers: {}",
received,
added,
Expand Down Expand Up @@ -129,7 +129,7 @@ impl AddrV2Handler {
let now = SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap_or_else(|e| {
log::error!("System time error in add_known_address: {}", e);
tracing::error!("System time error in add_known_address: {}", e);
Duration::from_secs(0)
})
.as_secs() as u32;
Expand Down
10 changes: 5 additions & 5 deletions dash-spv/src/network/discovery.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,27 @@ impl DnsDiscovery {
Network::Mainnet => (MAINNET_DNS_SEEDS, 9999),
Network::Testnet => (TESTNET_DNS_SEEDS, 19999),
_ => {
log::debug!("No DNS seeds for {:?} network", network);
tracing::debug!("No DNS seeds for {:?} network", network);
return vec![];
}
};

let mut addresses = Vec::new();

for seed in seeds {
log::debug!("Querying DNS seed: {}", seed);
tracing::debug!("Querying DNS seed: {}", seed);

match self.resolver.lookup_ip(*seed).await {
Ok(lookup) => {
let ips: Vec<IpAddr> = lookup.iter().collect();
log::info!("DNS seed {} returned {} addresses", seed, ips.len());
tracing::info!("DNS seed {} returned {} addresses", seed, ips.len());

for ip in ips {
addresses.push(SocketAddr::new(ip, port));
}
}
Err(e) => {
log::warn!("Failed to resolve DNS seed {}: {}", seed, e);
tracing::warn!("Failed to resolve DNS seed {}: {}", seed, e);
}
}
}
Expand All @@ -64,7 +64,7 @@ impl DnsDiscovery {
addresses.sort();
addresses.dedup();

log::info!("Discovered {} unique peer addresses from DNS seeds", addresses.len());
tracing::info!("Discovered {} unique peer addresses from DNS seeds", addresses.len());
addresses
}

Expand Down
Loading
Loading