[DRAFT] registry part 2

examples/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 tracing = "0.1"
 tracing-core = "0.1"
 tracing-tower = { version = "0.1.0", path = "../tracing-tower" }
-tracing-subscriber = { version = "0.1", path = "../tracing-subscriber" }
+tracing-subscriber = { version = "0.1", path = "../tracing-subscriber", features = ["registry_unstable", "json", "chrono"] }
 tracing-futures = { version = "0.1.0", path = "../tracing-futures" }
 tracing-attributes =  "0.1.2"
 tracing-log = { path = "../tracing-log", version = "0.1.1", features = ["env_logger"] }
@@ -44,6 +44,9 @@ tower-hyper = "0.1"
 tower-http-util = "0.1"
 rand = "0.7"
 
+# TODO(david): remove, but this is handy for debugging crashes
+color-backtrace = { git = "https://github.com/athre0z/color-backtrace" }
+
 # sloggish example
 ansi_term = "0.11"
 humantime = "1.2"

examples/examples/attrs-args.rs

@@ -2,6 +2,10 @@
 
 use tracing::{debug, info};
 use tracing_attributes::instrument;
+use tracing_subscriber::{
+    registry::{FmtLayer, Registry},
+    EnvFilter, Layer,
+};
 
 #[instrument]
 fn nth_fibonacci(n: u64) -> u64 {
@@ -28,9 +32,9 @@ fn fibonacci_seq(to: u64) -> Vec<u64> {
 
 fn main() {
     use tracing_subscriber::fmt;
-    let subscriber = fmt::Subscriber::builder()
-        .with_env_filter("attrs_args=trace")
-        .finish();
+    let subscriber = FmtLayer::default()
+        .and_then(EnvFilter::try_new("attrs_basic=trace").unwrap())
+        .with_subscriber(Registry::default());
 
     tracing::subscriber::with_default(subscriber, || {
         let n = 5;

examples/examples/attrs-basic.rs

@@ -2,6 +2,7 @@
 
 use tracing::{debug, info, span, Level};
 use tracing_attributes::instrument;
+use tracing_subscriber::{EnvFilter, FmtLayer, Layer, Registry};
 
 #[instrument]
 #[inline]
@@ -11,9 +12,10 @@ fn suggest_band() -> String {
 }
 
 fn main() {
-    let subscriber = tracing_subscriber::fmt::Subscriber::builder()
-        .with_env_filter("attrs_basic=trace")
-        .finish();
+    let subscriber = FmtLayer::default()
+        .and_then(EnvFilter::try_new("attrs_basic=trace").unwrap())
+        .with_subscriber(Registry::default());
+
     tracing::subscriber::with_default(subscriber, || {
         let num_recs = 1;
 

examples/examples/fmt-layer.rs

@@ -0,0 +1,44 @@
+#![deny(rust_2018_idioms)]
+use std::io;
+use tracing::{debug, Level};
+use tracing_subscriber::{
+    fmt::format::Format,
+    fmt::time::ChronoUtc,
+    layer::Layer,
+    registry::{FmtLayer, Registry},
+};
+
+#[path = "fmt/yak_shave.rs"]
+mod yak_shave;
+
+fn main() {
+    color_backtrace::install();
+
+    let stderr = FmtLayer::builder()
+        .with_writer(io::stderr)
+        .with_event_formatter(
+            Format::default()
+                .with_timer(ChronoUtc::rfc3339())
+                .with_ansi(false)
+                .with_target(false)
+                .json(),
+        )
+        .build();
+
+    let stdout = FmtLayer::builder()
+        .with_writer(io::stdout)
+        .build();
+
+    let subscriber = stdout.and_then(stderr).with_subscriber(Registry::default());
+    tracing::subscriber::set_global_default(subscriber).expect("Could not set global default");
+
+    let number_of_yaks = 3;
+    debug!("preparing to shave {} yaks", number_of_yaks);
+
+    let number_shaved = yak_shave::shave_all(number_of_yaks);
+
+    debug!(
+        message = "yak shaving completed.",
+        all_yaks_shaved = number_shaved == number_of_yaks,
+    );
+}

examples/examples/fmt-stderr.rs

@@ -1,11 +1,13 @@
 #![deny(rust_2018_idioms)]
 use std::io;
 use tracing::error;
+use tracing_subscriber::{FmtLayer, Layer, Registry};
 
 fn main() {
-    let subscriber = tracing_subscriber::fmt::Subscriber::builder()
+    let subscriber = FmtLayer::builder()
         .with_writer(io::stderr)
-        .finish();
+        .build()
+        .with_subscriber(Registry::default());
 
     tracing::subscriber::with_default(subscriber, || {
         error!("This event will be printed to `stderr`.");

examples/examples/fmt/fmt.rs

@@ -1,20 +1,24 @@
 #![deny(rust_2018_idioms)]
-use tracing::debug;
+use std::io;
+use tracing::{debug, Level};
+use tracing_subscriber::{
+    layer::Layer,
+    registry::{FmtLayer, Registry},
+};
 
 mod yak_shave;
 
 fn main() {
     let subscriber = tracing_subscriber::fmt::Subscriber::new();
+    tracing::subscriber::set_global_default(subscriber).expect("Could not set global default");
 
-    tracing::subscriber::with_default(subscriber, || {
-        let number_of_yaks = 3;
-        debug!("preparing to shave {} yaks", number_of_yaks);
+    let number_of_yaks = 3;
+    debug!("preparing to shave {} yaks", number_of_yaks);
 
-        let number_shaved = yak_shave::shave_all(number_of_yaks);
+    let number_shaved = yak_shave::shave_all(number_of_yaks);
 
-        debug!(
-            message = "yak shaving completed.",
-            all_yaks_shaved = number_shaved == number_of_yaks,
-        );
-    });
+    debug!(
+        message = "yak shaving completed.",
+        all_yaks_shaved = number_shaved == number_of_yaks,
+    );
 }

examples/examples/futures-proxy-server.rs

@@ -17,11 +17,11 @@ use tokio::net::{TcpListener, TcpStream};
 use tokio::prelude::*;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    use tracing_subscriber::{fmt, EnvFilter};
+    use tracing_subscriber::{EnvFilter, Layer, FmtLayer, Registry};
 
-    let subscriber = fmt::Subscriber::builder()
-        .with_env_filter(EnvFilter::from_default_env())
-        .finish();
+    let subscriber = FmtLayer::default()
+        .and_then(EnvFilter::from_default_env())
+        .with_subscriber(Registry::default());
     tracing::subscriber::set_global_default(subscriber)?;
 
     let listen_addr = env::args()

examples/examples/futures-spawn.rs

@@ -32,10 +32,12 @@ fn subtask(number: usize) -> impl Future<Item = usize, Error = ()> {
 }
 
 fn main() {
-    use tracing_subscriber::fmt;
-    let subscriber = fmt::Subscriber::builder()
-        .with_max_level(Level::TRACE)
-        .finish();
+    use tracing_subscriber::{EnvFilter, FmtLayer, Layer, Registry};
+
+    let subscriber = FmtLayer::default()
+        .and_then(EnvFilter::try_new("futures-spawn=trace").unwrap())
+        .with_subscriber(Registry::default());
+
     let _ = tracing::subscriber::set_global_default(subscriber);
     tokio::run(parent_task(10));
 }

examples/examples/hyper-echo.rs

@@ -10,6 +10,10 @@ use std::str;
 
 use tracing::{debug, error, info, span, Level};
 use tracing_futures::{Instrument, Instrumented};
+use tracing_subscriber::{
+    layer::Layer,
+    registry::{FmtLayer, Registry},
+};
 
 type BoxFut = Box<dyn Future<Item = Response<Body>, Error = hyper::Error> + Send>;
 
@@ -109,16 +113,16 @@ fn echo(req: Request<Body>) -> Instrumented<BoxFut> {
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     use tracing_log::env_logger::BuilderExt;
 
-    let subscriber = tracing_subscriber::FmtSubscriber::builder()
-        .with_max_level(Level::TRACE)
-        .finish();
+    let stdout = FmtLayer::builder().build();
+    let subscriber = stdout.with_subscriber(Registry::default());
+
     let mut builder = env_logger::Builder::new();
     builder
         .filter(Some("hyper_echo"), log::LevelFilter::Off)
         .filter(Some("hyper"), log::LevelFilter::Trace)
         .emit_traces() // from `tracing_log::env_logger::BuilderExt`
         .try_init()?;
-    tracing::subscriber::set_global_default(subscriber)?;
+    tracing::subscriber::set_global_default(subscriber).expect("Could not set global default");
 
     let local_addr: std::net::SocketAddr = ([127, 0, 0, 1], 3000).into();
     let server_span = span!(Level::TRACE, "server", %local_addr);

examples/examples/subscriber-filter.rs

@@ -3,11 +3,14 @@
 mod yak_shave;
 
 fn main() {
-    use tracing_subscriber::{fmt, EnvFilter};
+    use tracing_subscriber::{
+        registry::{FmtLayer, Registry},
+        EnvFilter, Layer,
+    };
 
-    let subscriber = fmt::Subscriber::builder()
-        .with_env_filter(EnvFilter::from_default_env())
-        .finish();
+    let subscriber = FmtLayer::default()
+        .and_then(EnvFilter::from_default_env())
+        .with_subscriber(Registry::default());
 
     tracing::subscriber::with_default(subscriber, || {
         let number_of_yaks = 3;

examples/examples/tower-h2-client.rs

@@ -13,6 +13,7 @@ use tower_h2::{Body, RecvBody};
 use tower_service::Service;
 use tower_util::MakeService;
 use tracing_futures::Instrument;
+use tracing_subscriber::{FmtLayer, Layer, Registry};
 use tracing_tower::InstrumentableService;
 
 pub struct Conn(SocketAddr);
@@ -24,9 +25,10 @@ fn main() {
     let filter = EnvFilter::from_default_env()
         .add_directive("tower_h2_client=trace".parse().unwrap())
         .add_directive("tracing_tower=trace".parse().unwrap());
-    let subscriber = tracing_subscriber::FmtSubscriber::builder()
-        .with_env_filter(filter)
-        .finish();
+
+    let subscriber = FmtLayer::default()
+        .and_then(filter)
+        .with_subscriber(Registry::default());
     let _ = tracing::subscriber::set_global_default(subscriber);
 
     let mut rt = Runtime::new().unwrap();

examples/examples/tower-h2-server.rs

@@ -8,6 +8,7 @@ use tokio::net::TcpListener;
 use tower_h2::{Body, RecvBody, Server};
 use tower_service::Service;
 use tracing_futures::Instrument;
+use tracing_subscriber::{FmtLayer, Layer, Registry};
 use tracing_tower::InstrumentMake;
 
 type Response = http::Response<RspBody>;
@@ -99,9 +100,9 @@ fn main() {
     let filter = EnvFilter::from_default_env()
         .add_directive("tower_h2_server=trace".parse().unwrap())
         .add_directive("tracing_tower=trace".parse().unwrap());
-    let subscriber = tracing_subscriber::FmtSubscriber::builder()
-        .with_env_filter(filter)
-        .finish();
+    let subscriber = FmtLayer::default()
+        .and_then(filter)
+        .with_subscriber(Registry::default());
     let _ = tracing::subscriber::set_global_default(subscriber);
 
     let addr = "[::1]:8888".parse().unwrap();

examples/examples/tower-load.rs

@@ -32,15 +32,15 @@ use tower_hyper::server::Server;
 use std::{error::Error, fmt, net::SocketAddr};
 use tracing;
 use tracing_futures::Instrument;
-use tracing_subscriber::FmtSubscriber;
+use tracing_subscriber::{reload, EnvFilter, FmtLayer, Layer, Registry};
 
 fn main() {
-    let builder = FmtSubscriber::builder()
-        .with_env_filter("info,tower_load=debug")
-        .with_filter_reloading();
-    let handle = builder.reload_handle();
+    let filter = EnvFilter::try_new("info,tower_load=debug").unwrap();
+    let (filter, handle) = reload::Layer::new(filter);
+    let layer = filter.and_then(FmtLayer::default());
+    let subscriber = layer.with_subscriber(Registry::default());
 
-    let _ = tracing::subscriber::set_global_default(builder.finish());
+    let _ = tracing::subscriber::set_global_default(subscriber);
 
     let addr = "[::1]:3000".parse().unwrap();
     let admin_addr = "[::1]:3001".parse().unwrap();

tracing-subscriber/Cargo.toml

@@ -23,7 +23,7 @@ default = ["env-filter", "smallvec", "fmt", "ansi", "chrono", "tracing-log"]
 env-filter = ["matchers", "regex", "lazy_static"]
 fmt = ["owning_ref"]
 ansi = ["fmt", "ansi_term"]
-registry_unstable = []
+registry_unstable = ["sharded-slab"]
 json = ["tracing-serde", "serde", "serde_json"]
 
 # Alias for `env-filter`; renamed in version 0.1.2, and will be removed in 0.2.
@@ -49,9 +49,15 @@ serde_json = { version = "1.0", optional = true }
 serde = { version = "1.0", optional = true }
 tracing-serde = { path = "../tracing-serde", optional = true }
 
+# a hack, trying out a formatter
+humantime = "1.2"
+
 # opt-in deps
 parking_lot = { version = ">= 0.7, < 0.10", features = ["owning_ref"], optional = true }
 
+# registry
+sharded-slab = { git = "https://github.com/davidbarsky/sharded-slab", optional = true }
+
 [dev-dependencies]
 tracing = "0.1"
 log = "0.4"