Skip to content

fix(engine): payload processor tracing event targets #19223

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
shekhirin merged 2 commits into from
Oct 23, 2025
Merged

fix(engine): payload processor tracing event targets #19223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ae51ec
fix(engine): payload processor tracing event targets
shekhirin Oct 22, 2025
30709d8
Merge remote-tracking branch 'origin/main' into alexey/payload-proces…
shekhirin Oct 23, 2025
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
48 changes: 24 additions & 24 deletions crates/engine/tree/src/tree/payload_processor/multiproof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ pub(crate) fn evm_state_to_hashed_post_state(update: EvmState) -> HashedPostStat
for (address, account) in update {
if account.is_touched() {
let hashed_address = keccak256(address);
trace!(target: "engine::root", ?address, ?hashed_address, "Adding account to state update");
trace!(target: "engine::tree::payload_processor::multiproof", ?address, ?hashed_address, "Adding account to state update");

let destroyed = account.is_selfdestructed();
let info = if destroyed { None } else { Some(account.info.into()) };
Expand Down Expand Up @@ -456,7 +456,7 @@ impl MultiproofManager {
let storage_targets = proof_targets.len();

trace!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
proof_sequence_number,
?proof_targets,
storage_targets,
Expand All @@ -475,7 +475,7 @@ impl MultiproofManager {
.storage_proof(hashed_address, proof_targets);
let elapsed = start.elapsed();
trace!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
proof_sequence_number,
?elapsed,
?source,
Expand Down Expand Up @@ -529,7 +529,7 @@ impl MultiproofManager {
let storage_targets = proof_targets.values().map(|slots| slots.len()).sum::<usize>();

trace!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
proof_sequence_number,
?proof_targets,
account_targets,
Expand Down Expand Up @@ -567,7 +567,7 @@ impl MultiproofManager {
})();
let elapsed = start.elapsed();
trace!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
proof_sequence_number,
?elapsed,
?source,
Expand Down Expand Up @@ -781,7 +781,7 @@ impl MultiProofTask {
proofs_processed >= state_update_proofs_requested + prefetch_proofs_requested;
let no_pending = !self.proof_sequencer.has_pending();
trace!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
proofs_processed,
state_update_proofs_requested,
prefetch_proofs_requested,
Expand Down Expand Up @@ -836,7 +836,7 @@ impl MultiProofTask {
}

if duplicates > 0 {
trace!(target: "engine::root", duplicates, "Removed duplicate prefetch proof targets");
trace!(target: "engine::tree::payload_processor::multiproof", duplicates, "Removed duplicate prefetch proof targets");
}

targets
Expand Down Expand Up @@ -998,55 +998,55 @@ impl MultiProofTask {
let mut updates_finished_time = None;

loop {
trace!(target: "engine::root", "entering main channel receiving loop");
trace!(target: "engine::tree::payload_processor::multiproof", "entering main channel receiving loop");
match self.rx.recv() {
Ok(message) => match message {
MultiProofMessage::PrefetchProofs(targets) => {
trace!(target: "engine::root", "processing MultiProofMessage::PrefetchProofs");
trace!(target: "engine::tree::payload_processor::multiproof", "processing MultiProofMessage::PrefetchProofs");
if first_update_time.is_none() {
// record the wait time
self.metrics
.first_update_wait_time_histogram
.record(start.elapsed().as_secs_f64());
first_update_time = Some(Instant::now());
debug!(target: "engine::root", "Started state root calculation");
debug!(target: "engine::tree::payload_processor::multiproof", "Started state root calculation");
}

let account_targets = targets.len();
let storage_targets =
targets.values().map(|slots| slots.len()).sum::<usize>();
prefetch_proofs_requested += self.on_prefetch_proof(targets);
trace!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
account_targets,
storage_targets,
prefetch_proofs_requested,
"Prefetching proofs"
);
}
MultiProofMessage::StateUpdate(source, update) => {
trace!(target: "engine::root", "processing MultiProofMessage::StateUpdate");
trace!(target: "engine::tree::payload_processor::multiproof", "processing MultiProofMessage::StateUpdate");
if first_update_time.is_none() {
// record the wait time
self.metrics
.first_update_wait_time_histogram
.record(start.elapsed().as_secs_f64());
first_update_time = Some(Instant::now());
debug!(target: "engine::root", "Started state root calculation");
debug!(target: "engine::tree::payload_processor::multiproof", "Started state root calculation");
}

let len = update.len();
state_update_proofs_requested += self.on_state_update(source, update);
trace!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
?source,
len,
?state_update_proofs_requested,
"Received new state update"
);
}
MultiProofMessage::FinishedStateUpdates => {
trace!(target: "engine::root", "processing MultiProofMessage::FinishedStateUpdates");
trace!(target: "engine::tree::payload_processor::multiproof", "processing MultiProofMessage::FinishedStateUpdates");
updates_finished = true;
updates_finished_time = Some(Instant::now());
if self.is_done(
Expand All @@ -1056,14 +1056,14 @@ impl MultiProofTask {
updates_finished,
) {
debug!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
"State updates finished and all proofs processed, ending calculation"
);
break
}
}
MultiProofMessage::EmptyProof { sequence_number, state } => {
trace!(target: "engine::root", "processing MultiProofMessage::EmptyProof");
trace!(target: "engine::tree::payload_processor::multiproof", "processing MultiProofMessage::EmptyProof");

proofs_processed += 1;

Expand All @@ -1081,14 +1081,14 @@ impl MultiProofTask {
updates_finished,
) {
debug!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
"State updates finished and all proofs processed, ending calculation"
);
break
}
}
MultiProofMessage::ProofCalculated(proof_calculated) => {
trace!(target: "engine::root", "processing
trace!(target: "engine::tree::payload_processor::multiproof", "processing
MultiProofMessage::ProofCalculated");

// we increment proofs_processed for both state updates and prefetches,
Expand All @@ -1100,7 +1100,7 @@ impl MultiProofTask {
.record(proof_calculated.elapsed);

trace!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
sequence = proof_calculated.sequence_number,
total_proofs = proofs_processed,
"Processing calculated proof"
Expand All @@ -1121,14 +1121,14 @@ impl MultiProofTask {
updates_finished,
) {
debug!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
"State updates finished and all proofs processed, ending calculation");
break
}
}
MultiProofMessage::ProofCalculationError(err) => {
error!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
?err,
"proof calculation error"
);
Expand All @@ -1138,14 +1138,14 @@ impl MultiProofTask {
Err(_) => {
// this means our internal message channel is closed, which shouldn't happen
// in normal operation since we hold both ends
error!(target: "engine::root", "Internal message channel closed unexpectedly");
error!(target: "engine::tree::payload_processor::multiproof", "Internal message channel closed unexpectedly");
return
}
}
}

debug!(
target: "engine::root",
target: "engine::tree::payload_processor::multiproof",
total_updates = state_update_proofs_requested,
total_proofs = proofs_processed,
total_time = ?first_update_time.map(|t|t.elapsed()),
Expand Down
16 changes: 8 additions & 8 deletions crates/engine/tree/src/tree/payload_processor/prewarm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ where
let (actions_tx, actions_rx) = channel();

trace!(
target: "engine::tree::prewarm",
target: "engine::tree::payload_processor::prewarm",
max_concurrency,
transaction_count_hint,
"Initialized prewarm task"
Expand Down Expand Up @@ -185,7 +185,7 @@ where
for handle in &handles {
if let Err(err) = handle.send(indexed_tx.clone()) {
warn!(
target: "engine::tree::prewarm",
target: "engine::tree::payload_processor::prewarm",
tx_hash = %first_tx_hash,
error = %err,
"Failed to send deposit transaction to worker"
Expand All @@ -196,7 +196,7 @@ where
// Not a deposit, send to first worker via round-robin
if let Err(err) = handles[0].send(indexed_tx) {
warn!(
target: "engine::tree::prewarm",
target: "engine::tree::payload_processor::prewarm",
task_idx = 0,
error = %err,
"Failed to send transaction to worker"
Expand All @@ -213,7 +213,7 @@ where
let task_idx = executing % workers_needed;
if let Err(err) = handles[task_idx].send(indexed_tx) {
warn!(
target: "engine::tree::prewarm",
target: "engine::tree::payload_processor::prewarm",
task_idx,
error = %err,
"Failed to send transaction to worker"
Expand Down Expand Up @@ -329,7 +329,7 @@ where
self.send_multi_proof_targets(proof_targets);
}
PrewarmTaskEvent::Terminate { block_output } => {
trace!(target: "engine::tree::prewarm", "Received termination signal");
trace!(target: "engine::tree::payload_processor::prewarm", "Received termination signal");
final_block_output = Some(block_output);

if finished_execution {
Expand All @@ -338,7 +338,7 @@ where
}
}
PrewarmTaskEvent::FinishedTxExecution { executed_transactions } => {
trace!(target: "engine::tree::prewarm", "Finished prewarm execution signal");
trace!(target: "engine::tree::payload_processor::prewarm", "Finished prewarm execution signal");
self.ctx.metrics.transactions.set(executed_transactions as f64);
self.ctx.metrics.transactions_histogram.record(executed_transactions as f64);

Expand All @@ -352,7 +352,7 @@ where
}
}

debug!(target: "engine::tree::prewarm", "Completed prewarm execution");
debug!(target: "engine::tree::payload_processor::prewarm", "Completed prewarm execution");

// save caches and finish
if let Some(Some(state)) = final_block_output {
Expand Down Expand Up @@ -488,7 +488,7 @@ where
Ok(res) => res,
Err(err) => {
trace!(
target: "engine::tree::prewarm",
target: "engine::tree::payload_processor::prewarm",
%err,
tx_hash=%tx.tx().tx_hash(),
sender=%tx.signer(),
Expand Down
Loading