Skip to content

Commit

Permalink
Add env filter back in
Browse files Browse the repository at this point in the history
  • Loading branch information
NyCodeGHG committed Jul 2, 2023
1 parent f6fa88a commit a7e4e77
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/telemetry.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
use anyhow::Result;
use opentelemetry::sdk::propagation::TraceContextPropagator;
use opentelemetry_otlp::{HasExportConfig, Protocol, WithExportConfig};
use tracing::Level;
use tracing_subscriber::{prelude::*, EnvFilter};

pub fn configure_telemetry(enable_otlp: bool) -> Result<()> {
let fmt_layer = tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env());
let fmt_layer = tracing_subscriber::fmt::layer();
let filter = EnvFilter::builder()
.with_default_directive(Level::INFO.into())
.from_env_lossy();

if enable_otlp {
let mut exporter = opentelemetry_otlp::new_exporter().tonic().with_env();
Expand All @@ -23,11 +27,15 @@ pub fn configure_telemetry(enable_otlp: bool) -> Result<()> {
let telemetry_layer = tracing_opentelemetry::layer().with_tracer(tracer);
tracing_subscriber::registry()
.with(fmt_layer)
.with(filter)
.with(telemetry_layer)
.init();
tracing::info!(endpoint = config.endpoint, protocol = ?config.protocol, "OpenTelemetry is enabled.");
} else {
tracing_subscriber::registry().with(fmt_layer).init();
tracing_subscriber::registry()
.with(fmt_layer)
.with(filter)
.init();
tracing::warn!("OpenTelemetry is not enabled.");
};
Ok(())
Expand Down

0 comments on commit a7e4e77

Please sign in to comment.