feat: use reth-tracing-otlp

Author: therustmonk

Cargo.lock

@@ -51,6 +51,7 @@ reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "bc9
 reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "bc9722d9e2b880bda36eba367a05e6abc7f8cc9e" }
 reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "bc9722d9e2b880bda36eba367a05e6abc7f8cc9e" }
 reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "bc9722d9e2b880bda36eba367a05e6abc7f8cc9e" }
+reth-tracing-otlp = { path = "../reth/crates/tracing-otlp" }
 reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "bc9722d9e2b880bda36eba367a05e6abc7f8cc9e" }
 reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", rev = "bc9722d9e2b880bda36eba367a05e6abc7f8cc9e" }
 reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "bc9722d9e2b880bda36eba367a05e6abc7f8cc9e" }

Cargo.toml

@@ -34,7 +34,7 @@ reth-execution-types.workspace = true
 reth-metrics.workspace = true
 reth-provider.workspace = true
 reth-revm.workspace = true
-reth-tracing.workspace = true
+reth-tracing-otlp.workspace = true
 reth-trie.workspace = true
 reth-rpc-layer.workspace = true
 reth-payload-builder-primitives.workspace = true
@@ -93,10 +93,6 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
 
 # `flashblocks` branch
 rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "269f2b1da7dd8e00a7ee8944a3e7516b4232dfed" }
-opentelemetry_sdk = "0.29.0"
-tracing-opentelemetry = "0.30.0"
-opentelemetry = "0.29.1"
-opentelemetry-otlp = "0.29.0"
 
 [target.'cfg(unix)'.dependencies]
 tikv-jemallocator = { version = "0.6", optional = true }

crates/op-rbuilder/Cargo.toml

@@ -1,23 +1,24 @@
-use futures_util::Future;
-use futures_util::FutureExt;
-use reth::providers::BlockReaderIdExt;
-use reth::{providers::StateProviderFactory, tasks::TaskSpawner};
-use reth_basic_payload_builder::HeaderForPayload;
-use reth_basic_payload_builder::{BasicPayloadJobGeneratorConfig, PayloadConfig};
-use reth_node_api::PayloadBuilderAttributes;
-use reth_node_api::PayloadKind;
-use reth_payload_builder::PayloadJobGenerator;
-use reth_payload_builder::{KeepPayloadJobAlive, PayloadBuilderError, PayloadJob};
+use futures_util::{Future, FutureExt};
+use reth::{
+    providers::{BlockReaderIdExt, StateProviderFactory},
+    tasks::TaskSpawner,
+};
+use reth_basic_payload_builder::{BasicPayloadJobGeneratorConfig, HeaderForPayload, PayloadConfig};
+use reth_node_api::{PayloadBuilderAttributes, PayloadKind};
+use reth_payload_builder::{
+    KeepPayloadJobAlive, PayloadBuilderError, PayloadJob, PayloadJobGenerator,
+};
 use reth_payload_primitives::BuiltPayload;
 use reth_primitives_traits::HeaderTy;
 use reth_revm::cached::CachedReads;
-use std::sync::{Arc, Mutex};
-use std::time::SystemTime;
-use std::time::UNIX_EPOCH;
-use tokio::sync::oneshot;
-use tokio::sync::Notify;
-use tokio::time::Duration;
-use tokio::time::Sleep;
+use std::{
+    sync::{Arc, Mutex},
+    time::{SystemTime, UNIX_EPOCH},
+};
+use tokio::{
+    sync::{oneshot, Notify},
+    time::{Duration, Sleep},
+};
 use tokio_util::sync::CancellationToken;
 use tracing::info;
 
@@ -424,14 +425,15 @@ mod tests {
     use reth::tasks::TokioTaskExecutor;
     use reth_chain_state::ExecutedBlockWithTrieUpdates;
     use reth_node_api::NodePrimitives;
-    use reth_optimism_payload_builder::payload::OpPayloadBuilderAttributes;
-    use reth_optimism_payload_builder::OpPayloadPrimitives;
+    use reth_optimism_payload_builder::{payload::OpPayloadBuilderAttributes, OpPayloadPrimitives};
     use reth_optimism_primitives::OpPrimitives;
     use reth_primitives::SealedBlock;
     use reth_provider::test_utils::MockEthProvider;
     use reth_testing_utils::generators::{random_block_range, BlockRangeParams};
-    use tokio::task;
-    use tokio::time::{sleep, Duration};
+    use tokio::{
+        task,
+        time::{sleep, Duration},
+    };
 
     #[tokio::test]
     async fn test_block_cell_wait_for_value() {

crates/op-rbuilder/src/generator.rs

@@ -1,32 +1,32 @@
 use alloy_consensus::TxEip1559;
-use alloy_eips::BlockNumberOrTag;
-use alloy_eips::{eip1559::MIN_PROTOCOL_BASE_FEE, eip2718::Encodable2718};
+use alloy_eips::{eip1559::MIN_PROTOCOL_BASE_FEE, eip2718::Encodable2718, BlockNumberOrTag};
 use alloy_provider::{Identity, Provider, ProviderBuilder};
 use op_alloy_consensus::OpTypedTransaction;
 use op_alloy_network::Optimism;
 use op_rbuilder::OpRbuilderConfig;
 use op_reth::OpRethConfig;
 use parking_lot::Mutex;
-use std::cmp::max;
-use std::collections::HashSet;
-use std::future::Future;
-use std::net::TcpListener;
-use std::path::Path;
-use std::sync::LazyLock;
 use std::{
+    cmp::max,
+    collections::HashSet,
     fs::{File, OpenOptions},
+    future::Future,
     io,
     io::prelude::*,
-    path::PathBuf,
+    net::TcpListener,
+    path::{Path, PathBuf},
     process::{Child, Command},
+    sync::LazyLock,
     time::{Duration, SystemTime},
 };
 use time::{format_description, OffsetDateTime};
 use tokio::time::sleep;
 use uuid::Uuid;
 
-use crate::tester::{BlockGenerator, EngineApi};
-use crate::tx_signer::Signer;
+use crate::{
+    tester::{BlockGenerator, EngineApi},
+    tx_signer::Signer,
+};
 
 /// Default JWT token for testing purposes
 pub const DEFAULT_JWT_TOKEN: &str =

crates/op-rbuilder/src/integration/mod.rs

@@ -1,14 +1,10 @@
 use clap::Parser;
+use eyre::Result;
 use monitoring::Monitoring;
-use opentelemetry::trace::TracerProvider;
-use opentelemetry_otlp::SpanExporter;
-use opentelemetry_sdk::trace::SdkTracerProvider;
 use reth::providers::CanonStateSubscriptions;
 use reth_cli_commands::launcher::FnLauncher;
 use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli};
-use reth_optimism_node::node::OpAddOnsBuilder;
-use reth_optimism_node::OpNode;
-use reth_tracing::Layers;
+use reth_optimism_node::{node::OpAddOnsBuilder, OpNode};
 
 #[cfg(feature = "flashblocks")]
 use payload_builder::CustomOpPayloadBuilder;
@@ -39,17 +35,13 @@ use monitor_tx_pool::monitor_tx_pool;
 #[global_allocator]
 static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
 
-fn main() {
-    let mut cli = Cli::<OpChainSpecParser, args::OpRbuilderArgs>::parse().configure();
+fn main() -> Result<()> {
+    let mut cli_app = Cli::<OpChainSpecParser, args::OpRbuilderArgs>::parse().configure();
 
-    let mut layers = Layers::new();
-    let provider = init_tracer_provider();
-    let tracer = provider.tracer("readme_example");
-    let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
-    layers.add_layer(telemetry);
-    cli.set_layers(layers);
+    let otlp = reth_tracing_otlp::layer();
+    cli_app.access_tracing_layers()?.add_layer(otlp);
 
-    cli.run(FnLauncher::new::<OpChainSpecParser, args::OpRbuilderArgs>(
+    cli_app.run(FnLauncher::new::<OpChainSpecParser, args::OpRbuilderArgs>(
         |builder, builder_args| async move {
             let rollup_args = builder_args.rollup_args;
 
@@ -97,14 +89,7 @@ fn main() {
 
             handle.node_exit_future.await
         },
-    ))
-    .unwrap();
-}
-
-fn init_tracer_provider() -> SdkTracerProvider {
-    let exporter = SpanExporter::builder().with_http().build().unwrap();
+    ))?;
 
-    SdkTracerProvider::builder()
-        .with_batch_exporter(exporter)
-        .build()
+    Ok(())
 }

crates/op-rbuilder/src/main.rs

@@ -1,4 +1,7 @@
-use reth_metrics::{metrics::Counter, metrics::Gauge, metrics::Histogram, Metrics};
+use reth_metrics::{
+    metrics::{Counter, Gauge, Histogram},
+    Metrics,
+};
 
 /// op-rbuilder metrics
 #[derive(Metrics, Clone)]