init tracing_subscriber once

Author: wlawt

crates/audit/src/bin/main.rs

@@ -9,7 +9,6 @@ use tips_audit::{
 };
 use tips_common::init_tracing;
 use tracing::{info, warn};
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
 #[derive(Debug, Clone, ValueEnum)]
 enum S3ConfigType {
@@ -79,29 +78,22 @@ async fn main() -> Result<()> {
         }
     };
 
-    tracing_subscriber::registry()
-        .with(
-            tracing_subscriber::EnvFilter::try_from_default_env()
-                .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())),
-        )
-        .with(tracing_subscriber::fmt::layer())
-        .init();
-
-    info!(
-        kafka_properties_file = %args.kafka_properties_file,
-        kafka_topic = %args.kafka_topic,
-        s3_bucket = %args.s3_bucket,
-        "Starting audit archiver"
-    );
-
     if args.tracing_enabled {
         init_tracing(
             env!("CARGO_PKG_NAME").to_string(),
             env!("CARGO_PKG_VERSION").to_string(),
             args.tracing_otlp_endpoint.clone(),
+            log_level.to_string(),
         )?;
     }
 
+    info!(
+        kafka_properties_file = %args.kafka_properties_file,
+        kafka_topic = %args.kafka_topic,
+        s3_bucket = %args.s3_bucket,
+        "Starting audit archiver"
+    );
+
     let consumer = create_kafka_consumer(&args.kafka_properties_file)?;
     consumer.subscribe(&[&args.kafka_topic])?;
 

crates/common/src/lib.rs

@@ -14,6 +14,7 @@ pub fn init_tracing(
     service_name: String,
     service_version: String,
     _otlp_endpoint: String,
+    log_level: String,
 ) -> anyhow::Result<()> {
     global::set_text_map_propagator(TraceContextPropagator::new());
 
@@ -43,7 +44,12 @@ pub fn init_tracing(
     tracing::subscriber::set_global_default(
         tracing_subscriber::registry()
             .with(trace_filter)
-            .with(OpenTelemetryLayer::new(tracer)),
+            .with(OpenTelemetryLayer::new(tracer))
+            .with(
+                tracing_subscriber::EnvFilter::try_from_default_env()
+                    .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level)),
+            )
+            .with(tracing_subscriber::fmt::layer()),
     )?;
 
     Ok(())

crates/ingress-rpc/src/main.rs

@@ -8,7 +8,6 @@ use std::fs;
 use std::net::IpAddr;
 use tips_common::init_tracing;
 use tracing::{info, warn};
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 use url::Url;
 
 mod queue;
@@ -91,27 +90,20 @@ async fn main() -> anyhow::Result<()> {
         }
     };
 
-    tracing_subscriber::registry()
-        .with(
-            tracing_subscriber::EnvFilter::try_from_default_env()
-                .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())),
-        )
-        .with(tracing_subscriber::fmt::layer())
-        .init();
-    info!(
-        message = "Starting ingress service",
-        address = %config.address,
-        port = config.port,
-        mempool_url = %config.mempool_url
-    );
-
     if config.tracing_enabled {
         init_tracing(
             env!("CARGO_PKG_NAME").to_string(),
             env!("CARGO_PKG_VERSION").to_string(),
             config.tracing_otlp_endpoint,
+            log_level.to_string(),
         )?;
     }
+    info!(
+        message = "Starting ingress service",
+        address = %config.address,
+        port = config.port,
+        mempool_url = %config.mempool_url
+    );
 
     let provider: RootProvider<Optimism> = ProviderBuilder::new()
         .disable_recommended_fillers()

crates/ingress-writer/src/main.rs

@@ -141,10 +141,6 @@ async fn main() -> Result<()> {
     dotenvy::dotenv().ok();
     let args = Args::parse();
 
-    tracing_subscriber::fmt()
-        .with_env_filter(&args.log_level)
-        .init();
-
     let config = load_kafka_config_from_file(&args.kafka_properties_file)?;
     let kafka_producer: FutureProducer = config.create()?;
 
@@ -153,6 +149,7 @@ async fn main() -> Result<()> {
             env!("CARGO_PKG_NAME").to_string(),
             env!("CARGO_PKG_VERSION").to_string(),
             args.tracing_otlp_endpoint,
+            args.log_level.to_string(),
         )?;
     }
 

crates/maintenance/src/main.rs

@@ -15,7 +15,6 @@ use tips_audit::KafkaBundleEventPublisher;
 use tips_common::init_tracing;
 use tips_datastore::PostgresDatastore;
 use tracing::{info, warn};
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 use url::Url;
 
 #[derive(Parser, Clone)]
@@ -99,21 +98,14 @@ async fn main() -> Result<()> {
         }
     };
 
-    tracing_subscriber::registry()
-        .with(
-            tracing_subscriber::EnvFilter::try_from_default_env()
-                .unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())),
-        )
-        .with(tracing_subscriber::fmt::layer())
-        .init();
-
     info!("Starting maintenance service");
 
     if args.tracing_enabled {
         init_tracing(
             env!("CARGO_PKG_NAME").to_string(),
             env!("CARGO_PKG_VERSION").to_string(),
             args.tracing_otlp_endpoint.clone(),
+            log_level.to_string(),
         )?;
     }