chore: improve some spans (#21781)

crates/engine/tree/src/tree/payload_processor/mod.rs

@@ -513,7 +513,6 @@ where
     ) {
         let preserved_sparse_trie = self.sparse_state_trie.clone();
         let trie_metrics = self.trie_metrics.clone();
-        let span = Span::current();
         let disable_sparse_trie_as_cache = !config.enable_sparse_trie_as_cache();
         let prune_depth = self.sparse_trie_prune_depth;
         let max_storage_tries = self.sparse_trie_max_storage_tries;
@@ -521,7 +520,8 @@ where
             config.multiproof_chunking_enabled().then_some(config.multiproof_chunk_size());
 
         self.executor.spawn_blocking(move || {
-            let _enter = span.entered();
+            let _enter = debug_span!(target: "engine::tree::payload_processor", "sparse_trie_task")
+                .entered();
 
             // Reuse a stored SparseStateTrie if available, applying continuation logic.
             // If this payload's parent state root matches the preserved trie's anchor,

crates/engine/tree/src/tree/payload_processor/sparse_trie.rs

@@ -135,6 +135,7 @@ where
     /// Receives [`SparseTrieUpdate`]s until the channel is closed, applying each update
     /// to the trie. Once all updates are processed, computes and returns the final state root.
     #[instrument(
+        name = "SparseTrieTask::run",
         level = "debug",
         target = "engine::tree::payload_processor::sparse_trie",
         skip_all
@@ -338,6 +339,7 @@ where
     ///
     /// This concludes once the last state update has been received and processed.
     #[instrument(
+        name = "SparseTrieCacheTask::run",
         level = "debug",
         target = "engine::tree::payload_processor::sparse_trie",
         skip_all

crates/prune/prune/src/segments/user/account_history.rs

@@ -57,7 +57,12 @@ where
         PrunePurpose::User
     }
 
-    #[instrument(target = "pruner", skip(self, provider), ret(level = "trace"))]
+    #[instrument(
+        name = "AccountHistory::prune",
+        target = "pruner",
+        skip(self, provider),
+        ret(level = "trace")
+    )]
     fn prune(&self, provider: &Provider, input: PruneInput) -> Result<SegmentOutput, PrunerError> {
         let range = match input.get_next_block_range() {
             Some(range) => range,

crates/prune/prune/src/segments/user/bodies.rs

@@ -9,7 +9,7 @@ use reth_prune_types::{
     SegmentOutputCheckpoint,
 };
 use reth_static_file_types::StaticFileSegment;
-use tracing::debug;
+use tracing::{debug, instrument};
 
 /// Segment responsible for pruning transactions in static files.
 ///
@@ -103,6 +103,12 @@ where
         PrunePurpose::User
     }
 
+    #[instrument(
+        name = "Bodies::prune",
+        target = "pruner",
+        skip(self, provider),
+        ret(level = "trace")
+    )]
     fn prune(&self, provider: &Provider, input: PruneInput) -> Result<SegmentOutput, PrunerError> {
         let Some(to_block) = self.next_bodies_prune_target(provider, &input)? else {
             debug!(

crates/prune/prune/src/segments/user/receipts.rs

@@ -44,7 +44,12 @@ where
         PrunePurpose::User
     }
 
-    #[instrument(target = "pruner", skip(self, provider), ret(level = "trace"))]
+    #[instrument(
+        name = "Receipts::prune",
+        target = "pruner",
+        skip(self, provider),
+        ret(level = "trace")
+    )]
     fn prune(&self, provider: &Provider, input: PruneInput) -> Result<SegmentOutput, PrunerError> {
         crate::segments::receipts::prune(provider, input)
     }

crates/prune/prune/src/segments/user/receipts_by_logs.rs

@@ -45,7 +45,12 @@ where
         PrunePurpose::User
     }
 
-    #[instrument(target = "pruner", skip(self, provider), ret(level = "trace"))]
+    #[instrument(
+        name = "ReceiptsByLogs::prune",
+        target = "pruner",
+        skip(self, provider),
+        ret(level = "trace")
+    )]
     fn prune(&self, provider: &Provider, input: PruneInput) -> Result<SegmentOutput, PrunerError> {
         // Contract log filtering removes every receipt possible except the ones in the list. So,
         // for the other receipts it's as if they had a `PruneMode::Distance()` of

crates/prune/prune/src/segments/user/sender_recovery.rs

@@ -45,7 +45,12 @@ where
         PrunePurpose::User
     }
 
-    #[instrument(target = "pruner", skip(self, provider), ret(level = "trace"))]
+    #[instrument(
+        name = "SenderRecovery::prune",
+        target = "pruner",
+        skip(self, provider),
+        ret(level = "trace")
+    )]
     fn prune(&self, provider: &Provider, input: PruneInput) -> Result<SegmentOutput, PrunerError> {
         if EitherWriterDestination::senders(provider).is_static_file() {
             debug!(target: "pruner", "Pruning transaction senders from static files.");

crates/prune/prune/src/segments/user/storage_history.rs

@@ -58,7 +58,12 @@ where
         PrunePurpose::User
     }
 
-    #[instrument(target = "pruner", skip(self, provider), ret(level = "trace"))]
+    #[instrument(
+        name = "StorageHistory::prune",
+        target = "pruner",
+        skip(self, provider),
+        ret(level = "trace")
+    )]
     fn prune(&self, provider: &Provider, input: PruneInput) -> Result<SegmentOutput, PrunerError> {
         let range = match input.get_next_block_range() {
             Some(range) => range,

crates/prune/prune/src/segments/user/transaction_lookup.rs

@@ -49,7 +49,12 @@ where
         PrunePurpose::User
     }
 
-    #[instrument(target = "pruner", skip(self, provider), ret(level = "trace"))]
+    #[instrument(
+        name = "TransactionLookup::prune",
+        target = "pruner",
+        skip(self, provider),
+        ret(level = "trace")
+    )]
     fn prune(
         &self,
         provider: &Provider,

crates/trie/sparse/src/state.rs

@@ -1038,7 +1038,12 @@ where
     ///
     /// - Clears `revealed_account_paths` and `revealed_paths` for all storage tries
     #[cfg(feature = "std")]
-    #[instrument(target = "trie::sparse", skip_all, fields(max_depth, max_storage_tries))]
+    #[instrument(
+        name = "SparseStateTrie::prune",
+        target = "trie::sparse",
+        skip_all,
+        fields(max_depth, max_storage_tries)
+    )]
     pub fn prune(&mut self, max_depth: usize, max_storage_tries: usize) {
         // Prune state and storage tries in parallel
         rayon::join(