Skip to content

Commit 58eb34a

Browse files
committed
fix tracing_sub for ingress-rpc first
1 parent 9355c87 commit 58eb34a

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

Cargo.lock

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

crates/ingress-rpc/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ alloy-signer-local.workspace = true
3737
reth-optimism-evm.workspace = true
3838
tips-common.workspace = true
3939
tracing-opentelemetry.workspace = true
40+
opentelemetry.workspace = true
41+
opentelemetry-otlp.workspace = true
42+
opentelemetry_sdk.workspace = true

crates/ingress-rpc/src/main.rs

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ mod service;
1717
mod validation;
1818
use queue::KafkaQueuePublisher;
1919
use service::{IngressApiServer, IngressService};
20+
use tracing_subscriber::Layer;
21+
use tracing_subscriber::filter::{LevelFilter, Targets};
2022

2123
#[derive(Parser, Debug)]
2224
#[command(author, version, about, long_about = None)]
@@ -60,7 +62,7 @@ struct Config {
6062
)]
6163
send_transaction_default_lifetime_seconds: u64,
6264

63-
#[arg(long, env = "TIPS_INGRESS_TRACING_ENABLED", default_value = "false")]
65+
#[arg(long, env = "TIPS_INGRESS_TRACING_ENABLED", default_value = "true")]
6466
tracing_enabled: bool,
6567

6668
#[arg(
@@ -100,15 +102,25 @@ async fn main() -> anyhow::Result<()> {
100102
log_level.to_string(),
101103
)?;
102104

105+
let log_filter = Targets::new()
106+
.with_default(LevelFilter::INFO)
107+
.with_target(env!("CARGO_PKG_NAME"), log_level);
108+
109+
let global_filter = Targets::new()
110+
.with_default(LevelFilter::INFO)
111+
.with_target(env!("CARGO_PKG_NAME"), LevelFilter::TRACE);
112+
103113
tracing_subscriber::registry()
104-
.with(trace_filter)
105-
.with(OpenTelemetryLayer::new(tracer))
106-
.with(
114+
.with(global_filter)
115+
.with(OpenTelemetryLayer::new(tracer).with_filter(trace_filter))
116+
/*.with(
107117
tracing_subscriber::EnvFilter::try_from_default_env()
108118
.unwrap_or_else(|_| tracing_subscriber::EnvFilter::new(log_level.to_string())),
109119
)
110120
.with(tracing_subscriber::fmt::layer())
111-
.try_init()?;
121+
*/
122+
.with(tracing_subscriber::fmt::layer().with_filter(log_filter))
123+
.init();
112124

113125
/*init_tracing(
114126
env!("CARGO_PKG_NAME").to_string(),

0 commit comments

Comments
 (0)