[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 = ["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"] }

examples/examples/attrs-args.rs

@@ -27,9 +27,9 @@ fn fibonacci_seq(to: u64) -> Vec<u64> {
 }
 
 fn main() {
-    use tracing_subscriber::fmt;
+    use tracing_subscriber::{fmt, EnvFilter};
     let subscriber = fmt::Subscriber::builder()
-        .with_env_filter("attrs_args=trace")
+        .with_env_filter(EnvFilter::try_new("attrs_basic=trace").unwrap())
         .finish();
 
     tracing::subscriber::with_default(subscriber, || {

examples/examples/attrs-basic.rs

@@ -11,9 +11,11 @@ fn suggest_band() -> String {
 }
 
 fn main() {
-    let subscriber = tracing_subscriber::fmt::Subscriber::builder()
-        .with_env_filter("attrs_basic=trace")
+    use tracing_subscriber::{EnvFilter, fmt};
+    let subscriber = fmt::Subscriber::builder()
+        .with_env_filter(EnvFilter::try_new("attrs_basic=trace").unwrap())
         .finish();
+
     tracing::subscriber::with_default(subscriber, || {
         let num_recs = 1;
 

examples/examples/fmt-layer.rs

@@ -0,0 +1,30 @@
+#![deny(rust_2018_idioms)]
+use std::io;
+use tracing::debug;
+use tracing_subscriber::{fmt::format::Format, fmt::time::ChronoUtc, fmt::Subscriber};
+
+#[path = "fmt/yak_shave.rs"]
+mod yak_shave;
+
+fn main() {
+    let format = Format::default()
+        .with_timer(ChronoUtc::rfc3339())
+        .with_ansi(false)
+        .with_target(false)
+        .json();
+    let subscriber = Subscriber::builder()
+        .with_writer(io::stdout)
+        .on_event(format)
+        .finish();
+    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,9 +1,10 @@
 #![deny(rust_2018_idioms)]
 use std::io;
 use tracing::error;
+use tracing_subscriber::fmt;
 
 fn main() {
-    let subscriber = tracing_subscriber::fmt::Subscriber::builder()
+    let subscriber = fmt::Subscriber::builder()
         .with_writer(io::stderr)
         .finish();
 

examples/examples/fmt/fmt.rs

@@ -1,20 +1,20 @@
 #![deny(rust_2018_idioms)]
-use tracing::debug;
+use std::io;
+use tracing::{debug, Level};
 
 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,12 +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, fmt};
 
-    let subscriber = fmt::Subscriber::builder()
+    fmt::Subscriber::builder()
         .with_env_filter(EnvFilter::from_default_env())
-        .finish();
-    tracing::subscriber::set_global_default(subscriber)?;
+        .try_init()?;
 
     let listen_addr = env::args()
         .nth(1)

examples/examples/futures-spawn.rs

@@ -32,10 +32,11 @@ 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();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+    use tracing_subscriber::{fmt, EnvFilter};
+
+    fmt::Subscriber::builder()
+        .with_env_filter(EnvFilter::try_new("futures-spawn=trace").unwrap())
+        .init();
+
     tokio::run(parent_task(10));
 }

examples/examples/hyper-echo.rs

@@ -10,6 +10,7 @@ use std::str;
 
 use tracing::{debug, error, info, span, Level};
 use tracing_futures::{Instrument, Instrumented};
+use tracing_subscriber::fmt::Subscriber;
 
 type BoxFut = Box<dyn Future<Item = Response<Body>, Error = hyper::Error> + Send>;
 
@@ -109,16 +110,14 @@ 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 subscriber = Subscriber::builder().with_writer(std::io::stdout).finish();
     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/tower-h2-client.rs

@@ -18,16 +18,16 @@ use tracing_tower::InstrumentableService;
 pub struct Conn(SocketAddr);
 
 fn main() {
-    use tracing_subscriber::filter::EnvFilter;
+    use tracing_subscriber::{fmt, EnvFilter};
     // Set the default subscriber to record all traces emitted by this example
     // and by the `tracing_tower` library's helpers.
     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()
+
+    fmt::Subscriber::builder()
         .with_env_filter(filter)
-        .finish();
-    let _ = tracing::subscriber::set_global_default(subscriber);
+        .init();
 
     let mut rt = Runtime::new().unwrap();
     let executor = rt.executor();

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::FmtSubscriber;
 use tracing_tower::InstrumentMake;
 
 type Response = http::Response<RspBody>;
@@ -99,9 +100,7 @@ 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 = FmtSubscriber::builder().with_env_filter(filter).finish();
     let _ = tracing::subscriber::set_global_default(subscriber);
 
     let addr = "[::1]:8888".parse().unwrap();

examples/examples/tower-load.rs

@@ -40,8 +40,6 @@ fn main() {
         .with_filter_reloading();
     let handle = builder.reload_handle();
 
-    let _ = tracing::subscriber::set_global_default(builder.finish());
-
     let addr = "[::1]:3000".parse().unwrap();
     let admin_addr = "[::1]:3001".parse().unwrap();
 

tracing-subscriber/Cargo.toml

@@ -21,9 +21,9 @@ keywords = ["logging", "tracing", "metrics", "subscriber"]
 
 default = ["env-filter", "smallvec", "fmt", "ansi", "chrono", "tracing-log"]
 env-filter = ["matchers", "regex", "lazy_static"]
-fmt = ["owning_ref"]
+fmt = ["owning_ref", "registry"]
 ansi = ["fmt", "ansi_term"]
-registry_unstable = []
+registry = ["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 = { version = "0.0.6", optional = true }
+
 [dev-dependencies]
 tracing = "0.1"
 log = "0.4"