move to own crate

Author: wlawt

Cargo.lock

@@ -1,12 +1,13 @@
 [workspace]
-members = ["crates/datastore", "crates/audit", "crates/ingress-rpc", "crates/maintenance", "crates/ingress-writer"]
+members = ["crates/datastore", "crates/audit", "crates/ingress-rpc", "crates/maintenance", "crates/ingress-writer", "crates/tracing"]
 resolver = "2"
 
 [workspace.dependencies]
 tips-datastore = { path = "crates/datastore" }
 tips-audit = { path = "crates/audit" }
 tips-maintenance = { path = "crates/maintenance" }
 tips-ingress-writer = { path = "crates/ingress-writer" }
+tips-tracing = { path = "crates/tracing" }
 
 
 # Reth

Cargo.toml

@@ -10,6 +10,7 @@ path = "src/main.rs"
 [dependencies]
 tips-datastore.workspace = true
 tips-audit.workspace = true
+tips-tracing.workspace = true
 jsonrpsee.workspace = true
 alloy-rpc-types-mev.workspace = true
 alloy-primitives.workspace = true
@@ -36,8 +37,4 @@ revm-context-interface.workspace = true
 alloy-signer-local.workspace = true
 reth-optimism-evm.workspace = true
 reth-errors.workspace = true
-opentelemetry.workspace = true
-opentelemetry-otlp.workspace = true
-opentelemetry_sdk.workspace = true
-tracing-opentelemetry.workspace = true
 

crates/ingress-rpc/Cargo.toml

@@ -1,22 +1,12 @@
 use alloy_provider::{ProviderBuilder, RootProvider};
-use anyhow::Context as _;
 use clap::Parser;
 use jsonrpsee::server::Server;
 use op_alloy_network::Optimism;
-use opentelemetry::trace::TracerProvider;
-use opentelemetry::{KeyValue, global};
-use opentelemetry_otlp::SpanExporter;
-use opentelemetry_otlp::WithExportConfig;
-use opentelemetry_sdk::Resource;
-use opentelemetry_sdk::propagation::TraceContextPropagator;
-use opentelemetry_sdk::trace::SdkTracerProvider;
 use rdkafka::ClientConfig;
 use rdkafka::producer::FutureProducer;
 use std::net::IpAddr;
 use tracing::{info, warn};
-use tracing_opentelemetry::OpenTelemetryLayer;
-use tracing_subscriber::filter::LevelFilter;
-use tracing_subscriber::filter::Targets;
+use tips_tracing::init_tracing;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 use url::Url;
 
@@ -114,35 +104,11 @@ async fn main() -> anyhow::Result<()> {
         mempool_url = %config.mempool_url
     );
 
-    // from https://github.com/flashbots/rollup-boost/blob/08ebd3e75a8f4c7ebc12db13b042dee04e132c05/crates/rollup-boost/src/tracing.rs#L127
     if config.tracing_enabled {
-        global::set_text_map_propagator(TraceContextPropagator::new());
-        let otlp_exporter = SpanExporter::builder()
-            .with_tonic()
-            .with_endpoint(&config.tracing_otlp_endpoint)
-            .build()
-            .context("Failed to create OTLP exporter")?;
-        let provider_builder = SdkTracerProvider::builder()
-            .with_batch_exporter(otlp_exporter)
-            .with_resource(
-                Resource::builder_empty()
-                    .with_attributes([
-                        KeyValue::new("service.name", env!("CARGO_PKG_NAME")),
-                        KeyValue::new("service.version", env!("CARGO_PKG_VERSION")),
-                    ])
-                    .build(),
-            );
-        let provider = provider_builder.build();
-        let tracer = provider.tracer(env!("CARGO_PKG_NAME"));
-
-        let trace_filter = Targets::new()
-            .with_default(LevelFilter::OFF)
-            .with_target(env!("CARGO_PKG_NAME"), LevelFilter::TRACE);
-
-        tracing::subscriber::set_global_default(
-            tracing_subscriber::registry()
-                .with(trace_filter)
-                .with(OpenTelemetryLayer::new(tracer)),
+        init_tracing(
+            env!("CARGO_PKG_NAME").to_string(),
+            env!("CARGO_PKG_VERSION").to_string(),
+            config.tracing_otlp_endpoint,
         )?;
     }
 

crates/ingress-rpc/src/main.rs

@@ -0,0 +1,13 @@
+[package]
+name = "tips-tracing"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+anyhow.workspace = true
+opentelemetry.workspace = true
+opentelemetry-otlp.workspace = true
+opentelemetry_sdk.workspace = true
+tracing.workspace = true
+tracing-opentelemetry.workspace = true
+tracing-subscriber.workspace = true

crates/tracing/Cargo.toml

@@ -0,0 +1,47 @@
+use anyhow::Context;
+use opentelemetry::{global, KeyValue};
+use opentelemetry_otlp::{SpanExporter, WithExportConfig};
+use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::SdkTracerProvider, Resource};
+use tracing_opentelemetry::OpenTelemetryLayer;
+use tracing_subscriber::{filter::{LevelFilter, Targets}, layer::SubscriberExt};
+use opentelemetry::trace::TracerProvider;
+
+pub fn init_tracing(
+    service_name: String,
+    service_version: String,
+    otlp_endpoint: String,
+) -> anyhow::Result<()> {
+    global::set_text_map_propagator(TraceContextPropagator::new());
+
+    let otlp_exporter = SpanExporter::builder()
+        .with_tonic()
+        .with_endpoint(otlp_endpoint)
+        .build()
+        .context("Failed to create OTLP exporter")?;
+
+    let provider_builder = SdkTracerProvider::builder()
+        .with_batch_exporter(otlp_exporter)
+        .with_resource(
+            Resource::builder_empty()
+                .with_attributes([
+                    KeyValue::new("service.name", service_name.clone()),
+                    KeyValue::new("service.version", service_version),
+                ])
+                .build(),
+        );
+
+    let provider = provider_builder.build();
+    let tracer = provider.tracer(service_name.clone());
+
+    let trace_filter = Targets::new()
+        .with_default(LevelFilter::OFF)
+        .with_target(service_name, LevelFilter::TRACE);
+
+    tracing::subscriber::set_global_default(
+        tracing_subscriber::registry()
+            .with(trace_filter)
+            .with(OpenTelemetryLayer::new(tracer)),
+    )?;
+
+    Ok(())
+}