Skip to content

chore(trie): use instrument instead of manual span #18239

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
mattsse merged 1 commit into from
Sep 3, 2025
Merged

chore(trie): use instrument instead of manual span #18239

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
6 changes: 2 additions & 4 deletions crates/trie/trie/src/trie.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use alloy_rlp::{BufMut, Encodable};
use alloy_trie::proof::AddedRemovedKeys;
use reth_execution_errors::{StateRootError, StorageRootError};
use reth_primitives_traits::Account;
use tracing::{debug, trace, trace_span};
use tracing::{debug, instrument, trace};

/// The default updates after which root algorithms should return intermediate progress rather than
/// finishing the computation.
Expand Down Expand Up @@ -611,10 +611,8 @@ where
///
/// The storage root, number of walked entries and trie updates
/// for a given address if requested.
#[instrument(skip_all, target = "trie::storage_root", name = "Storage trie", fields(hashed_address = ?self.hashed_address))]
pub fn calculate(self, retain_updates: bool) -> Result<StorageRootProgress, StorageRootError> {
let span = trace_span!(target: "trie::storage_root", "Storage trie", hashed_address = ?self.hashed_address);
let _enter = span.enter();

trace!(target: "trie::storage_root", "calculating storage root");

let mut hashed_storage_cursor =
Expand Down