subscriber: fix incorrect filtering for tracing-log events

tracing-subscriber/Cargo.toml

@@ -47,6 +47,8 @@ chrono = { version = "0.4", optional = true }
 
 [dev-dependencies]
 tracing = "0.1"
+log = "0.4"
+tracing-log = "0.1"
 
 [badges]
 azure-devops = { project = "tracing/tracing", pipeline = "tokio-rs.tracing", build = "1" }

tracing-subscriber/src/filter/env/mod.rs

@@ -231,11 +231,14 @@ impl<S: Subscriber> Layer<S> for EnvFilter {
                     }
                 }
 
-                // TODO: other filters...
-
-                false
+                // Otherwise, fall back to checking if the callsite is
+                // statically enabled.
+                // TODO(eliza): we *might* want to check this only if the `log`
+                // feature is enabled, since if this is a `tracing` event with a
+                // real callsite, it would already have been statically enabled...
+                self.statics.enabled(metadata)
             })
-            .unwrap_or(false)
+            .unwrap_or_else(|| self.statics.enabled(metadata))
     }
 
     fn new_span(&self, attrs: &span::Attributes<'_>, id: &span::Id, _: Context<'_, S>) {

tracing-subscriber/tests/filter_log.rs

@@ -0,0 +1,35 @@
+mod support;
+use self::support::*;
+use tracing::{self, subscriber::with_default, Level};
+use tracing_subscriber::{filter::EnvFilter, prelude::*};
+
+#[test]
+fn log_is_enabled() {
+    mod my_module {
+        pub(crate) fn do_test() {
+            log::trace!("this should be disabled");
+            log::info!("this shouldn't be");
+            log::debug!("this should be disabled");
+            log::warn!("this should be enabled");
+            log::warn!(target: "something else", "this shouldn't be enabled");
+            log::error!("this should be enabled too");
+        }
+    }
+    tracing_log::LogTracer::init().expect("logger should be unset");
+    let filter: EnvFilter = "filter_log::my_module=info"
+        .parse()
+        .expect("filter should parse");
+    let (subscriber, finished) = subscriber::mock()
+        .event(event::mock().at_level(Level::INFO))
+        .event(event::mock().at_level(Level::WARN))
+        .event(event::mock().at_level(Level::ERROR))
+        .done()
+        .run_with_handle();
+    let subscriber = subscriber.with(filter);
+
+    with_default(subscriber, || {
+        my_module::do_test();
+    });
+
+    finished.assert_finished();
+}