Skip to content

Commit

Permalink
subscriber: Move the default EnvFilter to CollectorBuilder
Browse files Browse the repository at this point in the history
This resolves the disparity between fmt::init() and fmt().init().

Unfortunately, this involves a change to type signature and therefore
is a breaking change.

Close tokio-rs#1329
  • Loading branch information
ishitatsuyuki committed Dec 16, 2021
1 parent 2e84c0b commit 98eb4cc
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions tracing-subscriber/src/fmt/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,8 +472,14 @@ impl Collector {
pub const DEFAULT_MAX_LEVEL: LevelFilter = LevelFilter::INFO;

/// Returns a new `CollectorBuilder` for configuring a format subscriber.
pub fn builder() -> CollectorBuilder {
CollectorBuilder::default()
pub fn builder() -> CollectorBuilder<format::DefaultFields,
format::Format, impl subscribe::Subscribe<Formatter> + Send + Sync + 'static> {
let builder = CollectorBuilder::default();

#[cfg(feature = "env-filter")]
let builder = builder.with_env_filter(crate::EnvFilter::from_default_env());

builder
}

/// Returns a new format subscriber with the default configuration.
Expand Down Expand Up @@ -1167,10 +1173,6 @@ impl<N, E, F, W> CollectorBuilder<N, E, F, W> {
/// ../filter/struct.EnvFilter.html#associatedconstant.DEFAULT_ENV
pub fn try_init() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
let builder = Collector::builder();

#[cfg(feature = "env-filter")]
let builder = builder.with_env_filter(crate::EnvFilter::from_default_env());

builder.try_init()
}

Expand Down

0 comments on commit 98eb4cc

Please sign in to comment.