ash suggestions

Author: julio4

crates/op-rbuilder/src/builder/context.rs

@@ -401,7 +401,7 @@ impl OpPayloadBuilderCtx {
     ///
     /// Returns `Ok(Some(())` if the job was cancelled.
     #[expect(clippy::too_many_arguments)]
-    #[tracing::instrument(level = "info", name = "execute_pool_txs", skip_all)]
+    #[tracing::instrument(level = "info", skip_all)]
     pub(super) fn execute_best_transactions(
         &self,
         info: &mut ExecutionInfo,

crates/op-rbuilder/src/builder/generator.rs

@@ -331,8 +331,9 @@ where
                 cancel: cancellation,
             };
 
+            let payload_id = args.config.attributes.payload_id();
             if let Err(e) = builder.try_build(args, watch_tx).await {
-                tracing::error!("build task failed: {:?}", e);
+                tracing::error!(id = %payload_id, "build task failed: {:?}", e);
             }
         }));
     }

crates/op-rbuilder/src/builder/payload.rs

@@ -280,7 +280,7 @@ pub(super) struct OpPayloadBuilderInner<Pool, Client, BuilderTx, Tasks> {
     built_payload_tx: mpsc::Sender<OpBuiltPayload>,
     /// WebSocket publisher for broadcasting flashblocks
     /// to all connected subscribers.
-    ws_pub: Arc<WebSocketPublisher>,
+    ws_pub: WebSocketPublisher,
     /// System configuration for the builder
     config: BuilderConfig,
     /// The metrics for the builder
@@ -321,7 +321,7 @@ impl<Pool, Client, BuilderTx, Tasks> OpPayloadBuilder<Pool, Client, BuilderTx, T
         builder_tx: BuilderTx,
         built_fb_payload_tx: mpsc::Sender<OpBuiltPayload>,
         built_payload_tx: mpsc::Sender<OpBuiltPayload>,
-        ws_pub: Arc<WebSocketPublisher>,
+        ws_pub: WebSocketPublisher,
         metrics: Arc<OpRBuilderMetrics>,
         task_metrics: Arc<FlashblocksTaskMetrics>,
         executor: Tasks,

crates/op-rbuilder/src/builder/service.rs

@@ -109,14 +109,13 @@ impl FlashblocksServiceBuilder {
         let (built_fb_payload_tx, built_fb_payload_rx) = tokio::sync::mpsc::channel(16);
         let (built_payload_tx, built_payload_rx) = tokio::sync::mpsc::channel(16);
 
-        let ws_pub: Arc<WebSocketPublisher> = WebSocketPublisher::new(
+        let ws_pub = WebSocketPublisher::new(
             flashblocks_config.ws_addr,
             metrics.clone(),
             &task_metrics.websocket_publisher,
             flashblocks_config.ws_subscriber_limit,
         )
-        .wrap_err("failed to create ws publisher")?
-        .into();
+        .wrap_err("failed to create ws publisher")?;
         let payload_builder = OpPayloadBuilder::new(
             OpEvmConfig::optimism(ctx.chain_spec()),
             pool,
@@ -125,7 +124,7 @@ impl FlashblocksServiceBuilder {
             builder_tx,
             built_fb_payload_tx,
             built_payload_tx,
-            ws_pub.clone(),
+            ws_pub,
             metrics.clone(),
             task_metrics.clone(),
             ctx.task_executor().clone(),