diff --git a/tonic-interop/Cargo.toml b/tonic-interop/Cargo.toml index 7c2c6c2..c9a4c24 100644 --- a/tonic-interop/Cargo.toml +++ b/tonic-interop/Cargo.toml @@ -25,11 +25,10 @@ async-stream = "0.1.1" console = "0.7" structopt = "0.2" -pretty_env_logger = "0.3" tracing = "0.1" -tracing-fmt = "0.0.1-alpha.1" -tracing-log = "0.0.1-alpha.1" +tracing-subscriber = "0.1.3" +tracing-log = "0.1.0" [build-dependencies] tonic-build = { path = "../tonic-build" } diff --git a/tonic-interop/src/bin/client.rs b/tonic-interop/src/bin/client.rs index 6aae21d..5cac9f5 100644 --- a/tonic-interop/src/bin/client.rs +++ b/tonic-interop/src/bin/client.rs @@ -19,9 +19,7 @@ struct Opts { #[tokio::main] async fn main() -> Result<(), Box> { - let sub = tracing_fmt::FmtSubscriber::builder().finish(); - tracing::subscriber::set_global_default(sub).unwrap(); - let _ = tracing_log::LogTracer::init(); + tonic_interop::trace_init(); let matches = Opts::from_args(); diff --git a/tonic-interop/src/bin/server.rs b/tonic-interop/src/bin/server.rs index 2fce994..606f9ac 100644 --- a/tonic-interop/src/bin/server.rs +++ b/tonic-interop/src/bin/server.rs @@ -10,12 +10,9 @@ struct Opts { #[tokio::main] async fn main() -> std::result::Result<(), Box> { - let matches = Opts::from_args(); + tonic_interop::trace_init(); - // let sub = tracing_fmt::FmtSubscriber::builder().finish(); - // tracing::subscriber::set_global_default(sub).unwrap(); - // let _ = tracing_log::LogTracer::init(); - pretty_env_logger::init(); + let matches = Opts::from_args(); let addr = "127.0.0.1:10000".parse().unwrap(); diff --git a/tonic-interop/src/lib.rs b/tonic-interop/src/lib.rs index 799728f..6239a1b 100644 --- a/tonic-interop/src/lib.rs +++ b/tonic-interop/src/lib.rs @@ -11,6 +11,15 @@ pub mod pb { use std::{default, fmt, iter}; +pub fn trace_init() { + let sub = tracing_subscriber::FmtSubscriber::builder() + .with_env_filter(tracing_subscriber::filter::EnvFilter::from_default_env()) + .finish(); + + let _ = tracing::subscriber::set_global_default(sub); + let _ = tracing_log::LogTracer::init(); +} + pub fn client_payload(size: usize) -> pb::Payload { pb::Payload { r#type: default::Default::default(),