Skip to content

Use execute_block_with_transaction_closure for metrics #19927

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

Closed
austinchandra wants to merge 2 commits into from
Closed

Use execute_block_with_transaction_closure for metrics #19927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
635acb4
Use execute_block_with_transaction_closure for metrics
austinchandra Nov 23, 2025
7601d13
Refactor to pass iterator of results
austinchandra Nov 26, 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
37 changes: 19 additions & 18 deletions crates/engine/tree/src/tree/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,28 +73,29 @@ impl EngineApiMetrics {
// they are globally registered so that the data recorded in the hook will
// be accessible.
let wrapper = MeteredStateHook { metrics: self.executor.clone(), inner_hook: state_hook };

let mut executor = executor.with_state_hook(Some(Box::new(wrapper)));

let f = || {
executor.apply_pre_execution_changes()?;
for tx in transactions {
let tx = tx?;
let span =
debug_span!(target: "engine::tree", "execute tx", tx_hash=?tx.tx().tx_hash());
let enter = span.entered();
trace!(target: "engine::tree", "Executing transaction");
let gas_used = executor.execute_transaction(tx)?;

// record the tx gas used
enter.record("gas_used", gas_used);
}
executor.finish().map(|(evm, result)| (evm.into_db(), result))
let executor = executor.with_state_hook(Some(Box::new(wrapper)));

let execute_block = || {
executor.execute_block_with_transaction_closure(
transactions,
|executor, tx| {
let span =
debug_span!(target: "engine::tree", "execute tx", tx_hash=?tx.tx().tx_hash());
let enter = span.entered();
trace!(target: "engine::tree", "Executing transaction");
let gas_used = executor.execute_transaction(tx)?;

// record the tx gas used
enter.record("gas_used", gas_used);

Ok(gas_used)
}
).map(|(evm, result)| (evm.into_db(), result))
};

// Use metered to execute and track timing/gas metrics
let (mut db, result) = self.metered(|| {
let res = f();
let res = execute_block();
let gas_used = res.as_ref().map(|r| r.1.gas_used).unwrap_or(0);
(gas_used, res)
})?;
Expand Down