From 0876260bf9dbd6180c04622da9e08602f45f492d Mon Sep 17 00:00:00 2001 From: tottoto Date: Wed, 30 Nov 2022 08:22:02 +0900 Subject: [PATCH] Refactor initializing tracing-subscriber --- examples/chat/src/main.rs | 11 +++++------ .../src/main.rs | 10 ++++------ examples/customize-extractor-error/src/main.rs | 10 ++++------ examples/customize-path-rejection/src/main.rs | 10 ++++------ .../src/main.rs | 10 ++++------ examples/form/src/main.rs | 11 +++++------ examples/global-404-handler/src/main.rs | 11 +++++------ examples/http-proxy/src/main.rs | 10 ++++------ examples/jwt/src/main.rs | 11 +++++------ examples/key-value-store/src/main.rs | 10 ++++------ examples/low-level-rustls/src/main.rs | 11 +++++------ examples/multipart-form/src/main.rs | 10 ++++------ examples/oauth/src/main.rs | 11 +++++------ examples/parse-body-based-on-content-type/src/main.rs | 10 ++++------ examples/print-request-response/src/main.rs | 10 ++++------ examples/prometheus-metrics/src/main.rs | 10 ++++------ examples/rest-grpc-multiplex/src/main.rs | 10 ++++------ examples/sessions/src/main.rs | 11 +++++------ examples/sqlx-postgres/src/main.rs | 11 +++++------ examples/sse/src/main.rs | 10 ++++------ examples/static-file-server/src/main.rs | 10 ++++------ examples/stream-to-file/src/main.rs | 11 +++++------ examples/templates/src/main.rs | 11 +++++------ examples/testing/src/main.rs | 10 ++++------ examples/tls-rustls/src/main.rs | 11 +++++------ examples/todos/src/main.rs | 10 ++++------ examples/tokio-postgres/src/main.rs | 11 +++++------ examples/tracing-aka-logging/src/main.rs | 10 ++++------ examples/unix-domain-socket/src/main.rs | 11 +++++------ examples/validator/src/main.rs | 11 +++++------ examples/versioning/src/main.rs | 11 +++++------ examples/websockets/src/main.rs | 10 ++++------ 32 files changed, 143 insertions(+), 192 deletions(-) diff --git a/examples/chat/src/main.rs b/examples/chat/src/main.rs index 32b38613..356e1abf 100644 --- a/examples/chat/src/main.rs +++ b/examples/chat/src/main.rs @@ -22,7 +22,6 @@ use std::{ sync::{Arc, Mutex}, }; use tokio::sync::broadcast; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; // Our shared state struct AppState { @@ -32,11 +31,11 @@ struct AppState { #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_chat=trace".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_chat=trace".into()), + ) .init(); let user_set = Mutex::new(HashSet::new()); diff --git a/examples/consume-body-in-extractor-or-middleware/src/main.rs b/examples/consume-body-in-extractor-or-middleware/src/main.rs index b3363d99..0f93f473 100644 --- a/examples/consume-body-in-extractor-or-middleware/src/main.rs +++ b/examples/consume-body-in-extractor-or-middleware/src/main.rs @@ -17,16 +17,14 @@ use axum::{ use std::net::SocketAddr; use tower::ServiceBuilder; use tower_http::ServiceBuilderExt; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_consume_body_in_extractor_or_middleware=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); let app = Router::new().route("/", post(handler)).layer( diff --git a/examples/customize-extractor-error/src/main.rs b/examples/customize-extractor-error/src/main.rs index b7b24f76..f5bd9edf 100644 --- a/examples/customize-extractor-error/src/main.rs +++ b/examples/customize-extractor-error/src/main.rs @@ -10,16 +10,14 @@ mod with_rejection; use axum::{routing::post, Router}; use std::net::SocketAddr; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_customize_extractor_error=trace".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); // Build our application with some routes diff --git a/examples/customize-path-rejection/src/main.rs b/examples/customize-path-rejection/src/main.rs index 68baf8f8..bb0a217f 100644 --- a/examples/customize-path-rejection/src/main.rs +++ b/examples/customize-path-rejection/src/main.rs @@ -14,16 +14,14 @@ use axum::{ }; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use std::net::SocketAddr; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_customize_path_rejection=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); // build our application with a route diff --git a/examples/error-handling-and-dependency-injection/src/main.rs b/examples/error-handling-and-dependency-injection/src/main.rs index af897e3a..e4a0c009 100644 --- a/examples/error-handling-and-dependency-injection/src/main.rs +++ b/examples/error-handling-and-dependency-injection/src/main.rs @@ -18,17 +18,15 @@ use axum::{ use serde::{Deserialize, Serialize}; use serde_json::json; use std::{net::SocketAddr, sync::Arc}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use uuid::Uuid; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_error_handling_and_dependency_injection=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); // Inject a `UserRepo` into our handlers via a trait object. This could be diff --git a/examples/form/src/main.rs b/examples/form/src/main.rs index 7605baff..e83b0230 100644 --- a/examples/form/src/main.rs +++ b/examples/form/src/main.rs @@ -7,15 +7,14 @@ use axum::{extract::Form, response::Html, routing::get, Router}; use serde::Deserialize; use std::net::SocketAddr; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_form=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_form=debug".into()), + ) .init(); // build our application with some routes diff --git a/examples/global-404-handler/src/main.rs b/examples/global-404-handler/src/main.rs index a3a5ea15..b9c85ab6 100644 --- a/examples/global-404-handler/src/main.rs +++ b/examples/global-404-handler/src/main.rs @@ -11,15 +11,14 @@ use axum::{ Router, }; use std::net::SocketAddr; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_global_404_handler=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_global_404_handler=debug".into()), + ) .init(); // build our application with a route diff --git a/examples/http-proxy/src/main.rs b/examples/http-proxy/src/main.rs index bfb25199..3c0aa97a 100644 --- a/examples/http-proxy/src/main.rs +++ b/examples/http-proxy/src/main.rs @@ -23,16 +23,14 @@ use hyper::upgrade::Upgraded; use std::net::SocketAddr; use tokio::net::TcpStream; use tower::{make::Shared, ServiceExt}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_http_proxy=trace,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); let router_svc = Router::new().route("/", get(|| async { "Hello, World!" })); diff --git a/examples/jwt/src/main.rs b/examples/jwt/src/main.rs index 82633d96..2a1a6b25 100644 --- a/examples/jwt/src/main.rs +++ b/examples/jwt/src/main.rs @@ -20,7 +20,6 @@ use once_cell::sync::Lazy; use serde::{Deserialize, Serialize}; use serde_json::json; use std::{fmt::Display, net::SocketAddr}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; // Quick instructions // @@ -55,11 +54,11 @@ static KEYS: Lazy = Lazy::new(|| { #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_jwt=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_jwt=debug".into()), + ) .init(); let app = Router::new() diff --git a/examples/key-value-store/src/main.rs b/examples/key-value-store/src/main.rs index 5d6c2bf7..7253be0b 100644 --- a/examples/key-value-store/src/main.rs +++ b/examples/key-value-store/src/main.rs @@ -28,16 +28,14 @@ use tower_http::{ auth::RequireAuthorizationLayer, compression::CompressionLayer, limit::RequestBodyLimitLayer, trace::TraceLayer, }; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_key_value_store=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); let shared_state = SharedState::default(); diff --git a/examples/low-level-rustls/src/main.rs b/examples/low-level-rustls/src/main.rs index 331b8c90..59ce44eb 100644 --- a/examples/low-level-rustls/src/main.rs +++ b/examples/low-level-rustls/src/main.rs @@ -25,15 +25,14 @@ use tokio_rustls::{ TlsAcceptor, }; use tower::MakeService; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_tls_rustls=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_tls_rustls=debug".into()), + ) .init(); let rustls_config = rustls_server_config( diff --git a/examples/multipart-form/src/main.rs b/examples/multipart-form/src/main.rs index bcddc60a..2f254950 100644 --- a/examples/multipart-form/src/main.rs +++ b/examples/multipart-form/src/main.rs @@ -12,16 +12,14 @@ use axum::{ }; use std::net::SocketAddr; use tower_http::limit::RequestBodyLimitLayer; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_multipart_form=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); // build our application with some routes diff --git a/examples/oauth/src/main.rs b/examples/oauth/src/main.rs index ea692df8..f40d103f 100644 --- a/examples/oauth/src/main.rs +++ b/examples/oauth/src/main.rs @@ -26,17 +26,16 @@ use oauth2::{ }; use serde::{Deserialize, Serialize}; use std::{env, net::SocketAddr}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; static COOKIE_NAME: &str = "SESSION"; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_oauth=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_oauth=debug".into()), + ) .init(); // `MemoryStore` is just used as an example. Don't use this in production. diff --git a/examples/parse-body-based-on-content-type/src/main.rs b/examples/parse-body-based-on-content-type/src/main.rs index 9167d1e0..ff3fdeb1 100644 --- a/examples/parse-body-based-on-content-type/src/main.rs +++ b/examples/parse-body-based-on-content-type/src/main.rs @@ -16,17 +16,15 @@ use axum::{ }; use serde::{Deserialize, Serialize}; use std::net::SocketAddr; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| { + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| { "example_parse_body_based_on_content_type=debug,tower_http=debug".into() }), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); let app = Router::new().route("/", post(handler)); diff --git a/examples/print-request-response/src/main.rs b/examples/print-request-response/src/main.rs index 59c609dd..4b7240c3 100644 --- a/examples/print-request-response/src/main.rs +++ b/examples/print-request-response/src/main.rs @@ -13,16 +13,14 @@ use axum::{ Router, }; use std::net::SocketAddr; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_print_request_response=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); let app = Router::new() diff --git a/examples/prometheus-metrics/src/main.rs b/examples/prometheus-metrics/src/main.rs index 5ab3fbdd..0a628b1f 100644 --- a/examples/prometheus-metrics/src/main.rs +++ b/examples/prometheus-metrics/src/main.rs @@ -21,7 +21,6 @@ use std::{ net::SocketAddr, time::{Duration, Instant}, }; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; fn metrics_app() -> Router { let recorder_handle = setup_metrics_recorder(); @@ -65,12 +64,11 @@ async fn start_metrics_server() { #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_todos=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); // The `/metrics` endpoint should not be publicly available. If behind a reverse proxy, this diff --git a/examples/rest-grpc-multiplex/src/main.rs b/examples/rest-grpc-multiplex/src/main.rs index 8376fcb0..a35a39e3 100644 --- a/examples/rest-grpc-multiplex/src/main.rs +++ b/examples/rest-grpc-multiplex/src/main.rs @@ -12,7 +12,6 @@ use proto::{ }; use std::net::SocketAddr; use tonic::{Response as TonicResponse, Status}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; mod multiplex_service; @@ -46,12 +45,11 @@ async fn web_root() -> &'static str { #[tokio::main] async fn main() { // initialize tracing - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_rest_grpc_multiplex=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); // build the rest service diff --git a/examples/sessions/src/main.rs b/examples/sessions/src/main.rs index 716ee41a..3f5b76e1 100644 --- a/examples/sessions/src/main.rs +++ b/examples/sessions/src/main.rs @@ -22,18 +22,17 @@ use axum::{ use serde::{Deserialize, Serialize}; use std::fmt::Debug; use std::net::SocketAddr; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use uuid::Uuid; const AXUM_SESSION_COOKIE_NAME: &str = "axum_session"; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_sessions=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_sessions=debug".into()), + ) .init(); // `MemoryStore` just used as an example. Don't use this in production. diff --git a/examples/sqlx-postgres/src/main.rs b/examples/sqlx-postgres/src/main.rs index 0330edab..8e2a17ff 100644 --- a/examples/sqlx-postgres/src/main.rs +++ b/examples/sqlx-postgres/src/main.rs @@ -21,17 +21,16 @@ use axum::{ Router, }; use sqlx::postgres::{PgPool, PgPoolOptions}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use std::{net::SocketAddr, time::Duration}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_tokio_postgres=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_tokio_postgres=debug".into()), + ) .init(); let db_connection_str = std::env::var("DATABASE_URL") diff --git a/examples/sse/src/main.rs b/examples/sse/src/main.rs index 66799711..2c7a1813 100644 --- a/examples/sse/src/main.rs +++ b/examples/sse/src/main.rs @@ -15,16 +15,14 @@ use futures::stream::{self, Stream}; use std::{convert::Infallible, net::SocketAddr, path::PathBuf, time::Duration}; use tokio_stream::StreamExt as _; use tower_http::{services::ServeDir, trace::TraceLayer}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_sse=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); let assets_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("assets"); diff --git a/examples/static-file-server/src/main.rs b/examples/static-file-server/src/main.rs index 90cfc5e4..31b4a33c 100644 --- a/examples/static-file-server/src/main.rs +++ b/examples/static-file-server/src/main.rs @@ -19,16 +19,14 @@ use tower_http::{ services::{ServeDir, ServeFile}, trace::TraceLayer, }; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_static_file_server=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); tokio::join!( diff --git a/examples/stream-to-file/src/main.rs b/examples/stream-to-file/src/main.rs index 018d3d2f..5b529811 100644 --- a/examples/stream-to-file/src/main.rs +++ b/examples/stream-to-file/src/main.rs @@ -16,17 +16,16 @@ use futures::{Stream, TryStreamExt}; use std::{io, net::SocketAddr}; use tokio::{fs::File, io::BufWriter}; use tokio_util::io::StreamReader; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; const UPLOADS_DIRECTORY: &str = "uploads"; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_stream_to_file=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_stream_to_file=debug".into()), + ) .init(); // save files to a separate directory to not override files in the current directory diff --git a/examples/templates/src/main.rs b/examples/templates/src/main.rs index 90ea206b..77f3e744 100644 --- a/examples/templates/src/main.rs +++ b/examples/templates/src/main.rs @@ -13,15 +13,14 @@ use axum::{ Router, }; use std::net::SocketAddr; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_templates=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_templates=debug".into()), + ) .init(); // build our application with some routes diff --git a/examples/testing/src/main.rs b/examples/testing/src/main.rs index 0bb9b352..1c9de016 100644 --- a/examples/testing/src/main.rs +++ b/examples/testing/src/main.rs @@ -9,16 +9,14 @@ use axum::{ Json, Router, }; use tower_http::trace::TraceLayer; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_testing=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 3000)); diff --git a/examples/tls-rustls/src/main.rs b/examples/tls-rustls/src/main.rs index 6eec0e9c..16d308df 100644 --- a/examples/tls-rustls/src/main.rs +++ b/examples/tls-rustls/src/main.rs @@ -14,7 +14,6 @@ use axum::{ }; use axum_server::tls_rustls::RustlsConfig; use std::{net::SocketAddr, path::PathBuf}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[derive(Clone, Copy)] struct Ports { @@ -24,11 +23,11 @@ struct Ports { #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_tls_rustls=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_tls_rustls=debug".into()), + ) .init(); let ports = Ports { diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs index 98910c5a..14223b97 100644 --- a/examples/todos/src/main.rs +++ b/examples/todos/src/main.rs @@ -30,17 +30,15 @@ use std::{ }; use tower::{BoxError, ServiceBuilder}; use tower_http::trace::TraceLayer; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use uuid::Uuid; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_todos=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); let db = Db::default(); diff --git a/examples/tokio-postgres/src/main.rs b/examples/tokio-postgres/src/main.rs index faef52b5..f8d13ed9 100644 --- a/examples/tokio-postgres/src/main.rs +++ b/examples/tokio-postgres/src/main.rs @@ -15,15 +15,14 @@ use bb8::{Pool, PooledConnection}; use bb8_postgres::PostgresConnectionManager; use std::net::SocketAddr; use tokio_postgres::NoTls; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_tokio_postgres=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_tokio_postgres=debug".into()), + ) .init(); // set up connection pool diff --git a/examples/tracing-aka-logging/src/main.rs b/examples/tracing-aka-logging/src/main.rs index 8da6e5fe..617226c0 100644 --- a/examples/tracing-aka-logging/src/main.rs +++ b/examples/tracing-aka-logging/src/main.rs @@ -14,16 +14,14 @@ use axum::{ use std::{net::SocketAddr, time::Duration}; use tower_http::{classify::ServerErrorsFailureClass, trace::TraceLayer}; use tracing::Span; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_tracing_aka_logging=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); // build our application with a route diff --git a/examples/unix-domain-socket/src/main.rs b/examples/unix-domain-socket/src/main.rs index 2f67a4c1..5dff344b 100644 --- a/examples/unix-domain-socket/src/main.rs +++ b/examples/unix-domain-socket/src/main.rs @@ -41,14 +41,13 @@ mod unix { net::{unix::UCred, UnixListener, UnixStream}, }; use tower::BoxError; - use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; pub async fn server() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "debug".into()), + ) .init(); let path = PathBuf::from("/tmp/axum/helloworld"); diff --git a/examples/validator/src/main.rs b/examples/validator/src/main.rs index 359be614..4cb67a6b 100644 --- a/examples/validator/src/main.rs +++ b/examples/validator/src/main.rs @@ -21,16 +21,15 @@ use axum::{ use serde::{de::DeserializeOwned, Deserialize}; use std::net::SocketAddr; use thiserror::Error; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; use validator::Validate; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_validator=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_validator=debug".into()), + ) .init(); // build our application with a route diff --git a/examples/versioning/src/main.rs b/examples/versioning/src/main.rs index 6948eb1d..889928dc 100644 --- a/examples/versioning/src/main.rs +++ b/examples/versioning/src/main.rs @@ -13,15 +13,14 @@ use axum::{ RequestPartsExt, Router, }; use std::{collections::HashMap, net::SocketAddr}; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG").unwrap_or_else(|_| "example_versioning=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_versioning=debug".into()), + ) .init(); // build our application with some routes diff --git a/examples/websockets/src/main.rs b/examples/websockets/src/main.rs index a317bfa4..d51d1a40 100644 --- a/examples/websockets/src/main.rs +++ b/examples/websockets/src/main.rs @@ -21,16 +21,14 @@ use tower_http::{ services::ServeDir, trace::{DefaultMakeSpan, TraceLayer}, }; -use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + tracing_subscriber::fmt() + .with_env_filter( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_websockets=debug,tower_http=debug".into()), - )) - .with(tracing_subscriber::fmt::layer()) + ) .init(); let assets_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("assets");