subscriber: backport tracing-subscriber v0.3 changes

.github/workflows/CI.yml

@@ -243,9 +243,15 @@ jobs:
       working-directory: tracing
       # this skips running doctests under the `--no-default-features` flag,
       # as rustdoc isn't aware of cargo's feature flags.
-    - name: "Test tracing-subscriber with all features disabled"
+    - name: "Test tracing-subscriber no-std support"
       run: cargo test --lib --tests --no-default-features
       working-directory: tracing-subscriber
+    - name: "Test tracing-subscriber with liballoc only"
+      run: cargo test --lib --tests --no-default-features --features "alloc"
+      working-directory: tracing-subscriber
+    - name: "Test tracing-subscriber with no default features"
+      run: cargo test --lib --tests --no-default-features --features "std"
+      working-directory: tracing-subscriber
 
   style:
     # Check style.

.github/workflows/audit.yml

@@ -1,9 +1,7 @@
 name: Security audit
 on:
-  push:
-    paths:
-      - '**/Cargo.toml'
-      - '**/Cargo.lock'
+  schedule:
+    - cron: '0 0 * * *'
 jobs:
   security_audit:
     runs-on: ubuntu-latest

examples/Cargo.toml

@@ -15,7 +15,7 @@ tracing-core = { path = "../tracing-core", version = "0.1" }
 tracing-error = { path = "../tracing-error" }
 tracing-flame = { path = "../tracing-flame" }
 tracing-tower = { version = "0.1.0", path = "../tracing-tower" }
-tracing-subscriber = { path = "../tracing-subscriber", version = "0.2.13", features = ["json", "chrono"] }
+tracing-subscriber = { path = "../tracing-subscriber", version = "0.2", features = ["json", "env-filter"] }
 tracing-futures = { version = "0.2.1", path = "../tracing-futures", features = ["futures-01"] }
 tracing-attributes = { path = "../tracing-attributes", version = "0.1.2" }
 tracing-log = { path = "../tracing-log", version = "0.1.1", features = ["env_logger"] }

tracing-error/src/layer.rs

@@ -45,10 +45,9 @@ where
         if span.extensions().get::<FormattedFields<F>>().is_some() {
             return;
         }
-        let mut fields = String::new();
-        if self.format.format_fields(&mut fields, attrs).is_ok() {
-            span.extensions_mut()
-                .insert(FormattedFields::<F>::new(fields));
+        let mut fields = FormattedFields::<F>::new(String::new());
+        if self.format.format_fields(fields.as_writer(), attrs).is_ok() {
+            span.extensions_mut().insert(fields);
         }
     }
 

tracing-opentelemetry/Cargo.toml

@@ -25,7 +25,7 @@ default = ["tracing-log"]
 opentelemetry = { version = "0.16", default-features = false, features = ["trace"] }
 tracing = { path = "../tracing", version = "0.1", default-features = false, features = ["std"] }
 tracing-core = { path = "../tracing-core", version = "0.1" }
-tracing-subscriber = { path = "../tracing-subscriber", version = "0.2", default-features = false, features = ["registry"] }
+tracing-subscriber = { path = "../tracing-subscriber", version = "0.2", default-features = false, features = ["registry", "std"] }
 tracing-log = { path = "../tracing-log", version = "0.1", default-features = false, optional = true }
 
 [dev-dependencies]

tracing-subscriber/Cargo.toml

@@ -23,27 +23,32 @@ keywords = ["logging", "tracing", "metrics", "subscriber"]
 
 [features]
 
-default = ["env-filter", "smallvec", "fmt", "ansi", "chrono", "tracing-log", "json"]
-env-filter = ["matchers", "regex", "lazy_static", "tracing"]
-fmt = ["registry"]
+default = ["smallvec", "fmt", "ansi", "tracing-log", "std"]
+alloc = []
+std = ["alloc", "tracing-core/std"]
+env-filter = ["matchers", "regex", "lazy_static", "tracing", "std"]
+fmt = ["registry", "std"]
 ansi = ["fmt", "ansi_term"]
-registry = ["sharded-slab", "thread_local"]
+registry = ["sharded-slab", "thread_local", "std"]
 json = ["tracing-serde", "serde", "serde_json"]
+# Enables support for local time when using the `time` crate timestamp
+# formatters.
+local-time = ["time/local-offset"]
 
 [dependencies]
 tracing-core = { path = "../tracing-core", version = "0.1.20" }
 
 # only required by the filter feature
-tracing = { optional = true, path = "../tracing", version = "0.1", default-features = false, features = ["std"] }
-matchers = { optional = true, version = "0.0.1" }
+tracing = { optional = true, path = "../tracing", version = "0.1", default-features = false }
+matchers = { optional = true, version = "0.1.0" }
 regex = { optional = true, version = "1", default-features = false, features = ["std"] }
 smallvec = { optional = true, version = "1" }
 lazy_static = { optional = true, version = "1" }
 
 # fmt
 tracing-log = { path = "../tracing-log", version = "0.1.2", optional = true, default-features = false, features = ["log-tracer", "std"] }
 ansi_term = { version = "0.12", optional = true }
-chrono = { version = "0.4.16", optional = true, default-features = false, features = ["clock", "std"] }
+time = { version = "0.3", features = ["formatting"], optional = true }
 
 # only required by the json feature
 serde_json = { version = "1.0", optional = true }
@@ -65,6 +70,8 @@ criterion = { version = "0.3", default_features = false }
 regex = { version = "1", default-features = false, features = ["std"] }
 tracing-futures = { path = "../tracing-futures", version = "0.2", default-features = false, features = ["std-future", "std"] }
 tokio = { version = "0.2", features = ["rt-core", "macros"] }
+# Enable the `time` crate's `macros` feature, for examples.
+time = { version = "0.3", features = ["formatting", "macros"] }
 
 [badges]
 maintenance = { status = "experimental" }

tracing-subscriber/src/field/debug.rs

@@ -1,8 +1,8 @@
 //! `MakeVisitor` wrappers for working with `fmt::Debug` fields.
-use super::{MakeVisitor, VisitFmt, VisitOutput, VisitWrite};
+use super::{MakeVisitor, VisitFmt, VisitOutput};
 use tracing_core::field::{Field, Visit};
 
-use std::{fmt, io};
+use core::fmt;
 
 /// A visitor wrapper that ensures any `fmt::Debug` fields are formatted using
 /// the alternate (`:#`) formatter.
@@ -84,13 +84,19 @@ where
     }
 }
 
-impl<V> VisitWrite for Alt<V>
-where
-    V: VisitWrite,
-{
-    #[inline]
-    fn writer(&mut self) -> &mut dyn io::Write {
-        self.0.writer()
+feature! {
+    #![feature = "std"]
+    use super::VisitWrite;
+    use std::io;
+
+    impl<V> VisitWrite for Alt<V>
+    where
+        V: VisitWrite,
+    {
+        #[inline]
+        fn writer(&mut self) -> &mut dyn io::Write {
+            self.0.writer()
+        }
     }
 }
 

tracing-subscriber/src/field/delimited.rs

@@ -1,7 +1,7 @@
 //! A `MakeVisitor` wrapper that separates formatted fields with a delimiter.
 use super::{MakeVisitor, VisitFmt, VisitOutput};
 
-use std::fmt;
+use core::fmt;
 use tracing_core::field::{Field, Visit};
 
 /// A `MakeVisitor` wrapper that wraps a visitor that writes formatted output so
@@ -133,6 +133,7 @@ where
 }
 
 #[cfg(test)]
+#[cfg(all(test, feature = "alloc"))]
 mod test {
     use super::*;
     use crate::field::test_util::*;

tracing-subscriber/src/field/display.rs

@@ -1,8 +1,8 @@
 //! `MakeVisitor` wrappers for working with `fmt::Display` fields.
-use super::{MakeVisitor, VisitFmt, VisitOutput, VisitWrite};
+use super::{MakeVisitor, VisitFmt, VisitOutput};
 use tracing_core::field::{Field, Visit};
 
-use std::{fmt, io};
+use core::fmt;
 
 /// A visitor wrapper that ensures any strings named "message" are formatted
 /// using `fmt::Display`
@@ -90,13 +90,19 @@ where
     }
 }
 
-impl<V> VisitWrite for Messages<V>
-where
-    V: VisitWrite,
-{
-    #[inline]
-    fn writer(&mut self) -> &mut dyn io::Write {
-        self.0.writer()
+feature! {
+    #![feature = "std"]
+    use super::VisitWrite;
+    use std::io;
+
+    impl<V> VisitWrite for Messages<V>
+    where
+        V: VisitWrite,
+    {
+        #[inline]
+        fn writer(&mut self) -> &mut dyn io::Write {
+            self.0.writer()
+        }
     }
 }
 

tracing-subscriber/src/field/mod.rs

@@ -1,8 +1,8 @@
 //! Utilities for working with [fields] and [field visitors].
 //!
-//! [fields]: https://docs.rs/tracing-core/latest/tracing_core/field/index.html
-//! [field visitors]: https://docs.rs/tracing-core/latest/tracing_core/field/trait.Visit.html
-use std::{fmt, io};
+//! [fields]: tracing_core::field
+//! [field visitors]: tracing_core::field::Visit
+use core::{fmt, marker::PhantomData};
 pub use tracing_core::field::Visit;
 use tracing_core::{
     span::{Attributes, Record},
@@ -108,11 +108,16 @@ where
     }
 }
 
-/// Extension trait implemented by visitors to indicate that they write to an
-/// `io::Write` instance, and allow access to that writer.
-pub trait VisitWrite: VisitOutput<Result<(), io::Error>> {
-    /// Returns the writer that this visitor writes to.
-    fn writer(&mut self) -> &mut dyn io::Write;
+feature! {
+    #![feature = "std"]
+    use std::io;
+
+    /// Extension trait implemented by visitors to indicate that they write to an
+    /// `io::Write` instance, and allow access to that writer.
+    pub trait VisitWrite: VisitOutput<Result<(), io::Error>> {
+        /// Returns the writer that this visitor writes to.
+        fn writer(&mut self) -> &mut dyn io::Write;
+    }
 }
 
 /// Extension trait implemented by visitors to indicate that they write to a
@@ -223,7 +228,7 @@ where
 #[derive(Debug)]
 #[doc(hidden)]
 pub struct MakeExtMarker<T> {
-    _p: std::marker::PhantomData<T>,
+    _p: PhantomData<T>,
 }
 
 #[derive(Debug)]
@@ -232,10 +237,11 @@ pub struct RecordFieldsMarker {
     _p: (),
 }
 
-#[cfg(test)]
+#[cfg(all(test, feature = "alloc"))]
 #[macro_use]
 pub(in crate::field) mod test_util {
     use super::*;
+    pub(in crate::field) use alloc::string::String;
     use tracing_core::{
         callsite::Callsite,
         field::{Field, Value},

tracing-subscriber/src/filter/directive.rs

@@ -1,5 +1,10 @@
 use crate::filter::level::{self, LevelFilter};
-use std::{cmp::Ordering, error::Error, fmt, iter::FromIterator, str::FromStr};
+#[cfg(not(feature = "smallvec"))]
+use alloc::vec;
+#[cfg(not(feature = "std"))]
+use alloc::{string::String, vec::Vec};
+
+use core::{cmp::Ordering, fmt, iter::FromIterator, slice, str::FromStr};
 use tracing_core::Metadata;
 /// Indicates that a string could not be parsed as a filtering directive.
 #[derive(Debug)]
@@ -35,19 +40,21 @@ pub(in crate::filter) trait Match {
 
 #[derive(Debug)]
 enum ParseErrorKind {
-    Field(Box<dyn Error + Send + Sync>),
+    #[cfg(feature = "std")]
+    Field(Box<dyn std::error::Error + Send + Sync>),
     Level(level::ParseError),
     Other(Option<&'static str>),
 }
 
 // === impl DirectiveSet ===
 
 impl<T> DirectiveSet<T> {
+    #[cfg(feature = "env-filter")]
     pub(crate) fn is_empty(&self) -> bool {
         self.directives.is_empty()
     }
 
-    pub(crate) fn iter(&self) -> std::slice::Iter<'_, T> {
+    pub(crate) fn iter(&self) -> slice::Iter<'_, T> {
         self.directives.iter()
     }
 }
@@ -118,7 +125,7 @@ impl<T> IntoIterator for DirectiveSet<T> {
     #[cfg(feature = "smallvec")]
     type IntoIter = smallvec::IntoIter<[T; 8]>;
     #[cfg(not(feature = "smallvec"))]
-    type IntoIter = std::vec::IntoIter<T>;
+    type IntoIter = vec::IntoIter<T>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.directives.into_iter()
@@ -358,6 +365,7 @@ impl FromStr for StaticDirective {
 // === impl ParseError ===
 
 impl ParseError {
+    #[cfg(feature = "env-filter")]
     pub(crate) fn new() -> Self {
         ParseError {
             kind: ParseErrorKind::Other(None),
@@ -377,17 +385,19 @@ impl fmt::Display for ParseError {
             ParseErrorKind::Other(None) => f.pad("invalid filter directive"),
             ParseErrorKind::Other(Some(msg)) => write!(f, "invalid filter directive: {}", msg),
             ParseErrorKind::Level(ref l) => l.fmt(f),
+            #[cfg(feature = "std")]
             ParseErrorKind::Field(ref e) => write!(f, "invalid field filter: {}", e),
         }
     }
 }
 
-impl Error for ParseError {
+#[cfg(feature = "std")]
+impl std::error::Error for ParseError {
     fn description(&self) -> &str {
         "invalid filter directive"
     }
 
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match self.kind {
             ParseErrorKind::Other(_) => None,
             ParseErrorKind::Level(ref l) => Some(l),
@@ -396,8 +406,9 @@ impl Error for ParseError {
     }
 }
 
-impl From<Box<dyn Error + Send + Sync>> for ParseError {
-    fn from(e: Box<dyn Error + Send + Sync>) -> Self {
+#[cfg(feature = "std")]
+impl From<Box<dyn std::error::Error + Send + Sync>> for ParseError {
+    fn from(e: Box<dyn std::error::Error + Send + Sync>) -> Self {
         Self {
             kind: ParseErrorKind::Field(e),
         }

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

@@ -28,7 +28,7 @@ use tracing_core::{
 ///
 /// # Directives
 ///
-/// A filter consists of one or more directives which match on [`Span`]s and [`Event`]s.
+/// A filter consists of one or more comma-separated directives which match on [`Span`]s and [`Event`]s.
 /// Each directive may have a corresponding maximum verbosity [`level`] which
 /// enables (e.g., _selects for_) spans and events that match. Like `log`,
 /// `tracing` considers less exclusive levels (like `trace` or `info`) to be more
@@ -77,6 +77,9 @@ use tracing_core::{
 /// - `tokio::net=info` will enable all spans or events that:
 ///    - have the `tokio::net` target,
 ///    - at the level `info` or above.
+/// - `warn,tokio::net=info` will enable all spans and events that:
+///    - are at the level `warn` or above, *or*
+///    - have the `tokio::net` target at the level `info` or above.
 /// - `my_crate[span_a]=trace` will enable all spans and events that:
 ///    - are within the `span_a` span or named `span_a` _if_ `span_a` has the target `my_crate`,
 ///    - at the level `trace` or above.
@@ -91,16 +94,13 @@ use tracing_core::{
 /// without filtering on field values. When these features are not required,
 /// [`Targets`] provides a lighter-weight alternative to [`EnvFilter`].
 ///
-/// [`Layer`]: ../layer/trait.Layer.html
-/// [`env_logger`]: https://docs.rs/env_logger/0.7.1/env_logger/#enabling-logging
-/// [`Span`]: https://docs.rs/tracing-core/latest/tracing_core/span/index.html
-/// [fields]: https://docs.rs/tracing-core/latest/tracing_core/struct.Field.html
-/// [`Event`]: https://docs.rs/tracing-core/latest/tracing_core/struct.Event.html
-/// [`level`]: https://docs.rs/tracing-core/latest/tracing_core/struct.Level.html
-/// [`Metadata`]: https://docs.rs/tracing-core/latest/tracing_core/struct.Metadata.html
+/// [`Span`]: tracing_core::span
+/// [fields]: tracing_core::Field
+/// [`Event`]: tracing_core::Event
+/// [`level`]: tracing_core::Level
+/// [`Metadata`]: tracing_core::Metadata
 /// [`Targets`]: crate::filter::Targets
-#[cfg(feature = "env-filter")]
-#[cfg_attr(docsrs, doc(cfg(feature = "env-filter")))]
+#[cfg_attr(docsrs, doc(cfg(all(feature = "env-filter", feature = "std"))))]
 #[derive(Debug)]
 pub struct EnvFilter {
     statics: directive::Statics,
@@ -118,7 +118,7 @@ type FieldMap<T> = HashMap<Field, T>;
 
 /// Indicates that an error occurred while parsing a `EnvFilter` from an
 /// environment variable.
-#[cfg_attr(docsrs, doc(cfg(feature = "env-filter")))]
+#[cfg_attr(docsrs, doc(cfg(all(feature = "env-filter", feature = "std"))))]
 #[derive(Debug)]
 pub struct FromEnvError {
     kind: ErrorKind,