fix metrics

Author: cody-wang-cb

crates/op-rbuilder/src/payload_builder.rs

@@ -398,17 +398,17 @@ where
             .build();
 
         let mut info = execute_pre_steps(&mut db, &ctx)?;
-        ctx.metrics
+        self.metrics
             .sequencer_tx_duration
             .record(sequencer_tx_start_time.elapsed());
 
-        let (payload, fb_payload, mut bundle_state) = build_block(db, &ctx, &mut info)?;
+        let (payload, fb_payload, mut bundle_state) = build_block(db, &ctx, &mut info, &self.metrics)?;
 
         best_payload.set(payload.clone());
         let _ = self.send_message(serde_json::to_string(&fb_payload).unwrap_or_default());
 
         tracing::info!(target: "payload_builder", "Fallback block built");
-        ctx.metrics
+        self.metrics
             .payload_num_tx
             .record(info.executed_transactions.len() as f64);
 
@@ -517,7 +517,7 @@ where
                         self.pool
                             .best_transactions_with_attributes(ctx.best_transaction_attributes()),
                     );
-                    ctx.metrics
+                    self.metrics
                         .transaction_pool_fetch_duration
                         .record(best_txs_start_time.elapsed());
 
@@ -528,7 +528,7 @@ where
                         best_txs,
                         total_gas_per_batch.min(ctx.block_gas_limit()),
                     )?;
-                    ctx.metrics
+                    self.metrics
                         .payload_tx_simulation_duration
                         .record(tx_execution_start_time.elapsed());
 
@@ -542,8 +542,8 @@ where
                     }
 
                     let total_block_built_duration = Instant::now();
-                    let build_result = build_block(db, &ctx, &mut info);
-                    ctx.metrics
+                    let build_result = build_block(db, &ctx, &mut info, &self.metrics);
+                    self.metrics
                         .total_block_built_duration
                         .record(total_block_built_duration.elapsed());
 
@@ -570,10 +570,10 @@ where
                             self.metrics
                                 .flashblock_build_duration
                                 .record(flashblock_build_start_time.elapsed());
-                            ctx.metrics
+                            self.metrics
                                 .payload_byte_size
                                 .record(new_payload.block().size() as f64);
-                            ctx.metrics
+                            self.metrics
                                 .payload_num_tx
                                 .record(info.executed_transactions.len() as f64);
 
@@ -620,6 +620,7 @@ pub fn build_block<ChainSpec, DB, P>(
     mut state: State<DB>,
     ctx: &OpPayloadBuilderCtx<ChainSpec>,
     info: &mut ExecutionInfo<OpPrimitives>,
+    metrics: &OpRBuilderMetrics,
 ) -> Result<(OpBuiltPayload, FlashblocksPayloadV1, BundleState), PayloadBuilderError>
 where
     ChainSpec: EthChainSpec + OpHardforks,
@@ -631,7 +632,7 @@ where
     // and 4788 contract call
     let state_merge_start_time = Instant::now();
     state.merge_transitions(BundleRetention::Reverts);
-    ctx.metrics
+    metrics
         .state_transition_merge_duration
         .record(state_merge_start_time.elapsed());
 
@@ -677,7 +678,7 @@ where
                 );
             })?
     };
-    ctx.metrics
+    metrics
         .state_root_calculation_duration
         .record(state_root_start_time.elapsed());