Skip to content

Commit

Permalink
subscriber: fix max_level_hint for empty Option/Vec Layer imp…
Browse files Browse the repository at this point in the history
…ls (tokio-rs#2195)

## Motivation

These are incorrect: currently, when you have a `None` layer, the `None`
hint it returns causes the default `TRACE` to win, which is inaccurate.
Similarly, `Vec` should default to `OFF` if it has no `Layer`s in it

## Solution

Change the default hints to `Some(OFF)`

Co-authored-by: Eliza Weisman <[email protected]>
  • Loading branch information
2 people authored and kaffarell committed May 22, 2024
1 parent 8bdd972 commit 3d2f486
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
9 changes: 7 additions & 2 deletions tracing-subscriber/src/layer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,11 @@ where
fn max_level_hint(&self) -> Option<LevelFilter> {
match self {
Some(ref inner) => inner.max_level_hint(),
None => None,
None => {
// There is no inner layer, so this layer will
// never enable anything.
Some(LevelFilter::OFF)
}
}
}

Expand Down Expand Up @@ -1701,7 +1705,8 @@ feature! {
}

fn max_level_hint(&self) -> Option<LevelFilter> {
let mut max_level = LevelFilter::ERROR;
// Default to `OFF` if there are no inner layers.
let mut max_level = LevelFilter::OFF;
for l in self {
// NOTE(eliza): this is slightly subtle: if *any* layer
// returns `None`, we have to return `None`, assuming there is
Expand Down
7 changes: 7 additions & 0 deletions tracing-subscriber/tests/layer_filters/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,10 @@ fn all_filtered_max_level_hint() {

assert_eq!(subscriber.max_level_hint(), Some(LevelFilter::DEBUG));
}

#[test]
fn empty_vec() {
// Just a None means everything is off
let subscriber = tracing_subscriber::registry().with(Vec::<ExpectLayer>::new());
assert_eq!(subscriber.max_level_hint(), Some(LevelFilter::OFF));
}

0 comments on commit 3d2f486

Please sign in to comment.