chore(builder): move op-rbuilder primitives into shared base-primitives crate

crates/builder/op-rbuilder/Cargo.toml

@@ -14,6 +14,7 @@ workspace = true
 base-builder-cli.workspace = true
 base-bundles.workspace = true
 base-flashtypes.workspace = true
+base-primitives = { workspace = true, features = ["op-rbuilder"] }
 
 reth-optimism-node.workspace = true
 reth-optimism-cli.workspace = true
@@ -58,7 +59,7 @@ reth-rpc-api.workspace = true
 reth-rpc-eth-types.workspace = true
 reth-optimism-rpc.workspace = true
 reth-tasks.workspace = true
-reth-tracing-otlp.workspace = true
+reth-tracing-otlp = { workspace = true, optional = true }
 
 alloy-primitives.workspace = true
 alloy-consensus.workspace = true
@@ -199,6 +200,11 @@ interop = []
 
 custom-engine-api = []
 
+telemetry = [
+	"dep:opentelemetry",
+	"dep:reth-tracing-otlp",
+]
+
 [[bin]]
 name = "tester"
 required-features = ["testing"]

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

@@ -7,6 +7,7 @@ use alloy_evm::Database;
 use alloy_op_evm::block::receipt_builder::OpReceiptBuilder;
 use alloy_primitives::{BlockHash, Bytes, U256};
 use alloy_rpc_types_eth::Withdrawals;
+use base_primitives::op_rbuilder::reth::{ExecutionInfo, TxnExecutionResult};
 use op_alloy_consensus::OpDepositReceipt;
 use op_revm::OpSpecId;
 use reth_basic_payload_builder::PayloadConfig;
@@ -43,7 +44,6 @@ use tracing::{debug, info, trace};
 use crate::{
     flashblocks::payload::FlashblocksExecutionInfo,
     metrics::OpRBuilderMetrics,
-    primitives::reth::{ExecutionInfo, TxnExecutionResult},
     traits::PayloadTxsBounds,
     tx_data_store::{TxData, TxDataStore},
 };

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

@@ -13,6 +13,7 @@ use alloy_primitives::{B256, U256};
 use base_flashtypes::{
     ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1, FlashblocksPayloadV1,
 };
+use base_primitives::op_rbuilder::reth::ExecutionInfo;
 use eyre::WrapErr as _;
 use reth_basic_payload_builder::BuildOutcome;
 use reth_chain_state::ExecutedBlock;
@@ -52,7 +53,6 @@ use crate::{
         generator::{BlockCell, BuildArguments, PayloadBuilder},
     },
     metrics::OpRBuilderMetrics,
-    primitives::reth::ExecutionInfo,
     traits::{ClientBounds, PoolBounds},
 };
 

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

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use base_builder_cli::{Cli, CliExt, CliVersionInfo, OpRbuilderArgs};
+use base_primitives::op_rbuilder::reth::engine_api_builder::OpEngineApiBuilder;
 use eyre::Result;
 use reth_cli_commands::launcher::Launcher;
 use reth_db::mdbx::DatabaseEnv;
@@ -17,7 +18,6 @@ use reth_optimism_txpool::OpPooledTransaction;
 use crate::{
     flashblocks::{BuilderConfig, FlashblocksServiceBuilder},
     metrics::{LONG_VERSION, SHORT_VERSION, VERSION},
-    primitives::reth::engine_api_builder::OpEngineApiBuilder,
     tx_data_store::{BaseApiExtServer, TxDataStoreExt},
 };
 
@@ -47,9 +47,16 @@ pub fn launch() -> Result<()> {
 
     // Only setup telemetry if an OTLP endpoint is provided
     if telemetry_args.otlp_endpoint.is_some() {
-        use crate::primitives::telemetry::setup_telemetry_layer;
-        let telemetry_layer = setup_telemetry_layer(&telemetry_args)?;
-        cli_app.access_tracing_layers()?.add_layer(telemetry_layer);
+        #[cfg(feature = "telemetry")]
+        {
+            use crate::telemetry::setup_telemetry_layer;
+            let telemetry_layer = setup_telemetry_layer(&telemetry_args)?;
+            cli_app.access_tracing_layers()?.add_layer(telemetry_layer);
+        }
+        #[cfg(not(feature = "telemetry"))]
+        {
+            return Err(eyre::eyre!("telemetry feature is disabled"));
+        }
     }
 
     tracing::info!("Starting OP builder in flashblocks mode");

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

@@ -7,7 +7,8 @@
 pub mod flashblocks;
 pub mod launcher;
 pub mod metrics;
-pub mod primitives;
+#[cfg(feature = "telemetry")]
+pub mod telemetry;
 pub mod traits;
 pub mod tx_data_store;
 pub mod tx_signer;