Skip to content

Commit 9355c87

Browse files
wlawtwlawt
committed
tracing sub in each service
1 parent 65e4396 commit 9355c87

File tree

10 files changed

+85
-12
lines changed

10 files changed

+85
-12
lines changed

‎Cargo.lock‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/audit/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ aws-sdk-s3 = { workspace = true }
3333
aws-credential-types = { workspace = true }
3434
bytes = { workspace = true }
3535
tips-common = { workspace = true }
36+
tracing-opentelemetry.workspace = true
3637

3738
[dev-dependencies]
3839
testcontainers = { workspace = true }

‎crates/audit/src/bin/main.rs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ use tips_audit::{
99
};
1010
use tips_common::init_tracing;
1111
use tracing::{info, warn};
12+
use tracing_opentelemetry::OpenTelemetryLayer;
13+
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
1214

1315
#[derive(Debug, Clone, ValueEnum)]
1416
enum S3ConfigType {
@@ -79,12 +81,22 @@ async fn main() -> Result<()> {
7981
};
8082

8183
if args.tracing_enabled {
82-
init_tracing(
84+
let (trace_filter, tracer) = init_tracing(
8385
env!("CARGO_PKG_NAME").to_string(),
8486
env!("CARGO_PKG_VERSION").to_string(),
8587
args.tracing_otlp_endpoint.clone(),
8688
log_level.to_string(),
8789
)?;
90+
91+
tracing_subscriber::registry()
92+
.with(trace_filter)
93+
.with(OpenTelemetryLayer::new(tracer))
94+
.with(
95+
tracing_subscriber::EnvFilter::try_from_default_env()
96+
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())),
97+
)
98+
.with(tracing_subscriber::fmt::layer())
99+
.try_init()?;
88100
}
89101

90102
info!(

‎crates/common/src/lib.rs‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ use anyhow::Context;
22
use opentelemetry::trace::TracerProvider;
33
use opentelemetry::{global, KeyValue};
44
use opentelemetry_otlp::SpanExporter;
5+
use opentelemetry_sdk::trace::SdkTracer;
56
use opentelemetry_sdk::{propagation::TraceContextPropagator, trace::SdkTracerProvider, Resource};
6-
use tracing_opentelemetry::OpenTelemetryLayer;
77
use tracing_subscriber::{
88
filter::{LevelFilter, Targets},
9-
layer::SubscriberExt,
9+
//layer::SubscriberExt,
1010
};
1111

1212
// from: https://github.com/flashbots/rollup-boost/blob/08ebd3e75a8f4c7ebc12db13b042dee04e132c05/crates/rollup-boost/src/tracing.rs#L127
1313
pub fn init_tracing(
1414
service_name: String,
1515
service_version: String,
1616
_otlp_endpoint: String,
17-
log_level: String,
18-
) -> anyhow::Result<()> {
17+
_log_level: String,
18+
) -> anyhow::Result<(Targets, SdkTracer)> {
1919
global::set_text_map_propagator(TraceContextPropagator::new());
2020

2121
let otlp_exporter = SpanExporter::builder()
@@ -41,7 +41,17 @@ pub fn init_tracing(
4141
.with_default(LevelFilter::OFF)
4242
.with_target(service_name, LevelFilter::TRACE);
4343

44-
tracing::subscriber::set_global_default(
44+
/*
45+
tracing_subscriber::registry()
46+
.with(
47+
tracing_subscriber::EnvFilter::try_from_default_env()
48+
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())),
49+
)
50+
.with(tracing_subscriber::fmt::layer())
51+
.init();
52+
*/
53+
54+
/*tracing::subscriber::set_global_default(
4555
tracing_subscriber::registry()
4656
.with(trace_filter)
4757
.with(OpenTelemetryLayer::new(tracer))
@@ -50,7 +60,7 @@ pub fn init_tracing(
5060
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level)),
5161
)
5262
.with(tracing_subscriber::fmt::layer()),
53-
)?;
63+
)?;*/
5464

55-
Ok(())
65+
Ok((trace_filter, tracer))
5666
}

‎crates/ingress-rpc/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ revm-context-interface.workspace = true
3636
alloy-signer-local.workspace = true
3737
reth-optimism-evm.workspace = true
3838
tips-common.workspace = true
39+
tracing-opentelemetry.workspace = true

‎crates/ingress-rpc/src/main.rs‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ use std::fs;
88
use std::net::IpAddr;
99
use tips_common::init_tracing;
1010
use tracing::{info, trace, warn};
11+
use tracing_opentelemetry::OpenTelemetryLayer;
12+
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
1113
use url::Url;
1214

1315
mod queue;
@@ -91,12 +93,29 @@ async fn main() -> anyhow::Result<()> {
9193
};
9294

9395
if config.tracing_enabled {
94-
init_tracing(
96+
let (trace_filter, tracer) = init_tracing(
9597
env!("CARGO_PKG_NAME").to_string(),
9698
env!("CARGO_PKG_VERSION").to_string(),
9799
config.tracing_otlp_endpoint,
98100
log_level.to_string(),
99101
)?;
102+
103+
tracing_subscriber::registry()
104+
.with(trace_filter)
105+
.with(OpenTelemetryLayer::new(tracer))
106+
.with(
107+
tracing_subscriber::EnvFilter::try_from_default_env()
108+
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())),
109+
)
110+
.with(tracing_subscriber::fmt::layer())
111+
.try_init()?;
112+
113+
/*init_tracing(
114+
env!("CARGO_PKG_NAME").to_string(),
115+
env!("CARGO_PKG_VERSION").to_string(),
116+
config.tracing_otlp_endpoint,
117+
log_level.to_string(),
118+
)?;*/
100119
}
101120
trace!(
102121
message = "Starting ingress service",

‎crates/ingress-writer/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ serde_json.workspace = true
2626
backon.workspace = true
2727
uuid.workspace = true
2828
tips-common.workspace = true
29+
tracing-opentelemetry.workspace = true

‎crates/ingress-writer/src/main.rs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ use tips_common::init_tracing;
1414
use tips_datastore::{BundleDatastore, postgres::PostgresDatastore};
1515
use tokio::time::Duration;
1616
use tracing::{debug, error, info, warn};
17+
use tracing_opentelemetry::OpenTelemetryLayer;
18+
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
1719
use uuid::Uuid;
1820

1921
#[derive(Parser)]
@@ -145,12 +147,22 @@ async fn main() -> Result<()> {
145147
let kafka_producer: FutureProducer = config.create()?;
146148

147149
if args.tracing_enabled {
148-
init_tracing(
150+
let (trace_filter, tracer) = init_tracing(
149151
env!("CARGO_PKG_NAME").to_string(),
150152
env!("CARGO_PKG_VERSION").to_string(),
151153
args.tracing_otlp_endpoint,
152-
args.log_level.to_string(),
154+
args.log_level.clone().to_string(),
153155
)?;
156+
157+
tracing_subscriber::registry()
158+
.with(trace_filter)
159+
.with(OpenTelemetryLayer::new(tracer))
160+
.with(
161+
tracing_subscriber::EnvFilter::try_from_default_env()
162+
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(args.log_level.clone())),
163+
)
164+
.with(tracing_subscriber::fmt::layer())
165+
.try_init()?;
154166
}
155167

156168
let publisher = KafkaBundleEventPublisher::new(kafka_producer, args.audit_topic.clone());

‎crates/maintenance/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ base-reth-flashblocks-rpc.workspace = true
3333
alloy-rpc-types-mev.workspace = true
3434
sqlx.workspace = true
3535
tips-common.workspace = true
36+
tracing-opentelemetry.workspace = true

‎crates/maintenance/src/main.rs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ use tips_audit::KafkaBundleEventPublisher;
1515
use tips_common::init_tracing;
1616
use tips_datastore::PostgresDatastore;
1717
use tracing::{info, warn};
18+
use tracing_opentelemetry::OpenTelemetryLayer;
19+
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
1820
use url::Url;
1921

2022
#[derive(Parser, Clone)]
@@ -101,12 +103,22 @@ async fn main() -> Result<()> {
101103
info!("Starting maintenance service");
102104

103105
if args.tracing_enabled {
104-
init_tracing(
106+
let (trace_filter, tracer) = init_tracing(
105107
env!("CARGO_PKG_NAME").to_string(),
106108
env!("CARGO_PKG_VERSION").to_string(),
107109
args.tracing_otlp_endpoint.clone(),
108110
log_level.to_string(),
109111
)?;
112+
113+
tracing_subscriber::registry()
114+
.with(trace_filter)
115+
.with(OpenTelemetryLayer::new(tracer))
116+
.with(
117+
tracing_subscriber::EnvFilter::try_from_default_env()
118+
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())),
119+
)
120+
.with(tracing_subscriber::fmt::layer())
121+
.try_init()?;
110122
}
111123

112124
let provider: RootProvider<Optimism> = ProviderBuilder::new()

0 commit comments

Comments
 (0)