From 0876260bf9dbd6180c04622da9e08602f45f492d Mon Sep 17 00:00:00 2001 From: tottoto Date: Wed, 30 Nov 2022 08:22:02 +0900 Subject: [PATCH 1/4] 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 32b3861395..356e1abf6a 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 b3363d9976..0f93f473dd 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 b7b24f7623..f5bd9edf81 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 68baf8f879..bb0a217f1d 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 af897e3aa6..e4a0c0099f 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 7605bafffb..e83b023077 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 a3a5ea15dc..b9c85ab6aa 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 bfb25199be..3c0aa97adc 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 82633d96d1..2a1a6b25a1 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 5d6c2bf7e7..7253be0b0f 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 331b8c9048..59ce44ebc0 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 bcddc60a6d..2f254950c9 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 ea692df84d..f40d103f05 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 9167d1e05c..ff3fdeb1d3 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 59c609dd83..4b7240c3b1 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 5ab3fbddde..0a628b1f7a 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 8376fcb0aa..a35a39e3a0 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 716ee41af1..3f5b76e1b9 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 0330edabd2..8e2a17ff0a 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 6679971152..2c7a181310 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 90cfc5e4f8..31b4a33c61 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 018d3d2fdc..5b52981158 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 90ea206b75..77f3e744ff 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 0bb9b352a0..1c9de016e8 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 6eec0e9c2a..16d308df46 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 98910c5a05..14223b97cd 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 faef52b5b9..f8d13ed9a4 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 8da6e5fed8..617226c077 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 2f67a4c1e7..5dff344b1d 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 359be614d3..4cb67a6be7 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 6948eb1d20..889928dc1d 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 a317bfa470..d51d1a4057 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"); From c44f65cc7dbdcdb59ce8a747601fc6de685b07d0 Mon Sep 17 00:00:00 2001 From: tottoto Date: Wed, 30 Nov 2022 08:45:02 +0900 Subject: [PATCH 2/4] Revert "Refactor initializing tracing-subscriber" This reverts commit 0876260bf9dbd6180c04622da9e08602f45f492d in favor of tracing_subscriber::registry. --- 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, 192 insertions(+), 143 deletions(-) diff --git a/examples/chat/src/main.rs b/examples/chat/src/main.rs index 356e1abf6a..32b3861395 100644 --- a/examples/chat/src/main.rs +++ b/examples/chat/src/main.rs @@ -22,6 +22,7 @@ use std::{ sync::{Arc, Mutex}, }; use tokio::sync::broadcast; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; // Our shared state struct AppState { @@ -31,11 +32,11 @@ struct AppState { #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_chat=trace".into()), - ) + 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()) .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 0f93f473dd..b3363d9976 100644 --- a/examples/consume-body-in-extractor-or-middleware/src/main.rs +++ b/examples/consume-body-in-extractor-or-middleware/src/main.rs @@ -17,14 +17,16 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 f5bd9edf81..b7b24f7623 100644 --- a/examples/customize-extractor-error/src/main.rs +++ b/examples/customize-extractor-error/src/main.rs @@ -10,14 +10,16 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 bb0a217f1d..68baf8f879 100644 --- a/examples/customize-path-rejection/src/main.rs +++ b/examples/customize-path-rejection/src/main.rs @@ -14,14 +14,16 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 e4a0c0099f..af897e3aa6 100644 --- a/examples/error-handling-and-dependency-injection/src/main.rs +++ b/examples/error-handling-and-dependency-injection/src/main.rs @@ -18,15 +18,17 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 e83b023077..7605bafffb 100644 --- a/examples/form/src/main.rs +++ b/examples/form/src/main.rs @@ -7,14 +7,15 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_form=debug".into()), - ) + 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()) .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 b9c85ab6aa..a3a5ea15dc 100644 --- a/examples/global-404-handler/src/main.rs +++ b/examples/global-404-handler/src/main.rs @@ -11,14 +11,15 @@ use axum::{ Router, }; use std::net::SocketAddr; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_global_404_handler=debug".into()), - ) + 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()) .init(); // build our application with a route diff --git a/examples/http-proxy/src/main.rs b/examples/http-proxy/src/main.rs index 3c0aa97adc..bfb25199be 100644 --- a/examples/http-proxy/src/main.rs +++ b/examples/http-proxy/src/main.rs @@ -23,14 +23,16 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 2a1a6b25a1..82633d96d1 100644 --- a/examples/jwt/src/main.rs +++ b/examples/jwt/src/main.rs @@ -20,6 +20,7 @@ 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 // @@ -54,11 +55,11 @@ static KEYS: Lazy = Lazy::new(|| { #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_jwt=debug".into()), - ) + 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()) .init(); let app = Router::new() diff --git a/examples/key-value-store/src/main.rs b/examples/key-value-store/src/main.rs index 7253be0b0f..5d6c2bf7e7 100644 --- a/examples/key-value-store/src/main.rs +++ b/examples/key-value-store/src/main.rs @@ -28,14 +28,16 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 59ce44ebc0..331b8c9048 100644 --- a/examples/low-level-rustls/src/main.rs +++ b/examples/low-level-rustls/src/main.rs @@ -25,14 +25,15 @@ use tokio_rustls::{ TlsAcceptor, }; use tower::MakeService; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_tls_rustls=debug".into()), - ) + 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()) .init(); let rustls_config = rustls_server_config( diff --git a/examples/multipart-form/src/main.rs b/examples/multipart-form/src/main.rs index 2f254950c9..bcddc60a6d 100644 --- a/examples/multipart-form/src/main.rs +++ b/examples/multipart-form/src/main.rs @@ -12,14 +12,16 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 f40d103f05..ea692df84d 100644 --- a/examples/oauth/src/main.rs +++ b/examples/oauth/src/main.rs @@ -26,16 +26,17 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_oauth=debug".into()), - ) + 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()) .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 ff3fdeb1d3..9167d1e05c 100644 --- a/examples/parse-body-based-on-content-type/src/main.rs +++ b/examples/parse-body-based-on-content-type/src/main.rs @@ -16,15 +16,17 @@ use axum::{ }; use serde::{Deserialize, Serialize}; use std::net::SocketAddr; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| { + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG").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 4b7240c3b1..59c609dd83 100644 --- a/examples/print-request-response/src/main.rs +++ b/examples/print-request-response/src/main.rs @@ -13,14 +13,16 @@ use axum::{ Router, }; use std::net::SocketAddr; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 0a628b1f7a..5ab3fbddde 100644 --- a/examples/prometheus-metrics/src/main.rs +++ b/examples/prometheus-metrics/src/main.rs @@ -21,6 +21,7 @@ use std::{ net::SocketAddr, time::{Duration, Instant}, }; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; fn metrics_app() -> Router { let recorder_handle = setup_metrics_recorder(); @@ -64,11 +65,12 @@ async fn start_metrics_server() { #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 a35a39e3a0..8376fcb0aa 100644 --- a/examples/rest-grpc-multiplex/src/main.rs +++ b/examples/rest-grpc-multiplex/src/main.rs @@ -12,6 +12,7 @@ use proto::{ }; use std::net::SocketAddr; use tonic::{Response as TonicResponse, Status}; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; mod multiplex_service; @@ -45,11 +46,12 @@ async fn web_root() -> &'static str { #[tokio::main] async fn main() { // initialize tracing - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 3f5b76e1b9..716ee41af1 100644 --- a/examples/sessions/src/main.rs +++ b/examples/sessions/src/main.rs @@ -22,17 +22,18 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_sessions=debug".into()), - ) + 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()) .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 8e2a17ff0a..0330edabd2 100644 --- a/examples/sqlx-postgres/src/main.rs +++ b/examples/sqlx-postgres/src/main.rs @@ -21,16 +21,17 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_tokio_postgres=debug".into()), - ) + 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()) .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 2c7a181310..6679971152 100644 --- a/examples/sse/src/main.rs +++ b/examples/sse/src/main.rs @@ -15,14 +15,16 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 31b4a33c61..90cfc5e4f8 100644 --- a/examples/static-file-server/src/main.rs +++ b/examples/static-file-server/src/main.rs @@ -19,14 +19,16 @@ use tower_http::{ services::{ServeDir, ServeFile}, trace::TraceLayer, }; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 5b52981158..018d3d2fdc 100644 --- a/examples/stream-to-file/src/main.rs +++ b/examples/stream-to-file/src/main.rs @@ -16,16 +16,17 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_stream_to_file=debug".into()), - ) + 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()) .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 77f3e744ff..90ea206b75 100644 --- a/examples/templates/src/main.rs +++ b/examples/templates/src/main.rs @@ -13,14 +13,15 @@ use axum::{ Router, }; use std::net::SocketAddr; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_templates=debug".into()), - ) + 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()) .init(); // build our application with some routes diff --git a/examples/testing/src/main.rs b/examples/testing/src/main.rs index 1c9de016e8..0bb9b352a0 100644 --- a/examples/testing/src/main.rs +++ b/examples/testing/src/main.rs @@ -9,14 +9,16 @@ use axum::{ Json, Router, }; use tower_http::trace::TraceLayer; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 16d308df46..6eec0e9c2a 100644 --- a/examples/tls-rustls/src/main.rs +++ b/examples/tls-rustls/src/main.rs @@ -14,6 +14,7 @@ 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 { @@ -23,11 +24,11 @@ struct Ports { #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_tls_rustls=debug".into()), - ) + 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()) .init(); let ports = Ports { diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs index 14223b97cd..98910c5a05 100644 --- a/examples/todos/src/main.rs +++ b/examples/todos/src/main.rs @@ -30,15 +30,17 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 f8d13ed9a4..faef52b5b9 100644 --- a/examples/tokio-postgres/src/main.rs +++ b/examples/tokio-postgres/src/main.rs @@ -15,14 +15,15 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_tokio_postgres=debug".into()), - ) + 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()) .init(); // set up connection pool diff --git a/examples/tracing-aka-logging/src/main.rs b/examples/tracing-aka-logging/src/main.rs index 617226c077..8da6e5fed8 100644 --- a/examples/tracing-aka-logging/src/main.rs +++ b/examples/tracing-aka-logging/src/main.rs @@ -14,14 +14,16 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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 5dff344b1d..2f67a4c1e7 100644 --- a/examples/unix-domain-socket/src/main.rs +++ b/examples/unix-domain-socket/src/main.rs @@ -41,13 +41,14 @@ mod unix { net::{unix::UCred, UnixListener, UnixStream}, }; use tower::BoxError; + use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; pub async fn server() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "debug".into()), - ) + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG").unwrap_or_else(|_| "debug".into()), + )) + .with(tracing_subscriber::fmt::layer()) .init(); let path = PathBuf::from("/tmp/axum/helloworld"); diff --git a/examples/validator/src/main.rs b/examples/validator/src/main.rs index 4cb67a6be7..359be614d3 100644 --- a/examples/validator/src/main.rs +++ b/examples/validator/src/main.rs @@ -21,15 +21,16 @@ 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::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_validator=debug".into()), - ) + 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()) .init(); // build our application with a route diff --git a/examples/versioning/src/main.rs b/examples/versioning/src/main.rs index 889928dc1d..6948eb1d20 100644 --- a/examples/versioning/src/main.rs +++ b/examples/versioning/src/main.rs @@ -13,14 +13,15 @@ use axum::{ RequestPartsExt, Router, }; use std::{collections::HashMap, net::SocketAddr}; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() - .unwrap_or_else(|_| "example_versioning=debug".into()), - ) + 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()) .init(); // build our application with some routes diff --git a/examples/websockets/src/main.rs b/examples/websockets/src/main.rs index d51d1a4057..a317bfa470 100644 --- a/examples/websockets/src/main.rs +++ b/examples/websockets/src/main.rs @@ -21,14 +21,16 @@ use tower_http::{ services::ServeDir, trace::{DefaultMakeSpan, TraceLayer}, }; +use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; #[tokio::main] async fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::try_from_default_env() + tracing_subscriber::registry() + .with(tracing_subscriber::EnvFilter::new( + std::env::var("RUST_LOG") .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"); From 7fdd414f6e70b7f4d140622ec444131f3b520778 Mon Sep 17 00:00:00 2001 From: tottoto Date: Wed, 30 Nov 2022 08:57:04 +0900 Subject: [PATCH 3/4] Use EnvFilter::try_from_default_env in chat example --- examples/chat/src/main.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/chat/src/main.rs b/examples/chat/src/main.rs index 32b3861395..9f3452852b 100644 --- a/examples/chat/src/main.rs +++ b/examples/chat/src/main.rs @@ -33,9 +33,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_chat=trace".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); From 484502cc8b4e852d65b1e87164fda6329800ac70 Mon Sep 17 00:00:00 2001 From: tottoto Date: Wed, 30 Nov 2022 09:38:29 +0900 Subject: [PATCH 4/4] Use EnvFilter::try_from_default_env in examples --- .../consume-body-in-extractor-or-middleware/src/main.rs | 6 +++--- examples/customize-extractor-error/src/main.rs | 6 +++--- examples/customize-path-rejection/src/main.rs | 6 +++--- .../error-handling-and-dependency-injection/src/main.rs | 6 +++--- examples/form/src/main.rs | 7 ++++--- examples/global-404-handler/src/main.rs | 7 ++++--- examples/http-proxy/src/main.rs | 6 +++--- examples/jwt/src/main.rs | 7 ++++--- examples/key-value-store/src/main.rs | 6 +++--- examples/low-level-rustls/src/main.rs | 7 ++++--- examples/multipart-form/src/main.rs | 6 +++--- examples/oauth/src/main.rs | 7 ++++--- examples/parse-body-based-on-content-type/src/main.rs | 6 +++--- examples/print-request-response/src/main.rs | 6 +++--- examples/prometheus-metrics/src/main.rs | 6 +++--- examples/rest-grpc-multiplex/src/main.rs | 6 +++--- examples/sessions/src/main.rs | 7 ++++--- examples/sqlx-postgres/src/main.rs | 7 ++++--- examples/sse/src/main.rs | 6 +++--- examples/static-file-server/src/main.rs | 6 +++--- examples/stream-to-file/src/main.rs | 7 ++++--- examples/templates/src/main.rs | 7 ++++--- examples/testing/src/main.rs | 6 +++--- examples/tls-rustls/src/main.rs | 7 ++++--- examples/todos/src/main.rs | 6 +++--- examples/tokio-postgres/src/main.rs | 7 ++++--- examples/tracing-aka-logging/src/main.rs | 6 +++--- examples/unix-domain-socket/src/main.rs | 7 ++++--- examples/validator/src/main.rs | 7 ++++--- examples/versioning/src/main.rs | 7 ++++--- examples/websockets/src/main.rs | 6 +++--- 31 files changed, 107 insertions(+), 93 deletions(-) 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 b3363d9976..f8ae4e491a 100644 --- a/examples/consume-body-in-extractor-or-middleware/src/main.rs +++ b/examples/consume-body-in-extractor-or-middleware/src/main.rs @@ -22,10 +22,10 @@ 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") + .with( + 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(); diff --git a/examples/customize-extractor-error/src/main.rs b/examples/customize-extractor-error/src/main.rs index b7b24f7623..c5359db56d 100644 --- a/examples/customize-extractor-error/src/main.rs +++ b/examples/customize-extractor-error/src/main.rs @@ -15,10 +15,10 @@ 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") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_customize_extractor_error=trace".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/customize-path-rejection/src/main.rs b/examples/customize-path-rejection/src/main.rs index 68baf8f879..a1cd38661d 100644 --- a/examples/customize-path-rejection/src/main.rs +++ b/examples/customize-path-rejection/src/main.rs @@ -19,10 +19,10 @@ 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") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_customize_path_rejection=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/error-handling-and-dependency-injection/src/main.rs b/examples/error-handling-and-dependency-injection/src/main.rs index af897e3aa6..b0964caa99 100644 --- a/examples/error-handling-and-dependency-injection/src/main.rs +++ b/examples/error-handling-and-dependency-injection/src/main.rs @@ -24,10 +24,10 @@ use uuid::Uuid; #[tokio::main] async fn main() { tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_error_handling_and_dependency_injection=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/form/src/main.rs b/examples/form/src/main.rs index 7605bafffb..233d0cb3bf 100644 --- a/examples/form/src/main.rs +++ b/examples/form/src/main.rs @@ -12,9 +12,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_form=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/global-404-handler/src/main.rs b/examples/global-404-handler/src/main.rs index a3a5ea15dc..eeacb61e11 100644 --- a/examples/global-404-handler/src/main.rs +++ b/examples/global-404-handler/src/main.rs @@ -16,9 +16,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_global_404_handler=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/http-proxy/src/main.rs b/examples/http-proxy/src/main.rs index bfb25199be..27d3b85046 100644 --- a/examples/http-proxy/src/main.rs +++ b/examples/http-proxy/src/main.rs @@ -28,10 +28,10 @@ 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") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_http_proxy=trace,tower_http=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/jwt/src/main.rs b/examples/jwt/src/main.rs index 82633d96d1..4ee20d4bf7 100644 --- a/examples/jwt/src/main.rs +++ b/examples/jwt/src/main.rs @@ -56,9 +56,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_jwt=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/key-value-store/src/main.rs b/examples/key-value-store/src/main.rs index 5d6c2bf7e7..1521c5ffc9 100644 --- a/examples/key-value-store/src/main.rs +++ b/examples/key-value-store/src/main.rs @@ -33,10 +33,10 @@ 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") + .with( + 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(); diff --git a/examples/low-level-rustls/src/main.rs b/examples/low-level-rustls/src/main.rs index 331b8c9048..16de3ac1ed 100644 --- a/examples/low-level-rustls/src/main.rs +++ b/examples/low-level-rustls/src/main.rs @@ -30,9 +30,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_tls_rustls=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/multipart-form/src/main.rs b/examples/multipart-form/src/main.rs index bcddc60a6d..ee881d2839 100644 --- a/examples/multipart-form/src/main.rs +++ b/examples/multipart-form/src/main.rs @@ -17,10 +17,10 @@ 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") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_multipart_form=debug,tower_http=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/oauth/src/main.rs b/examples/oauth/src/main.rs index ea692df84d..1a01570f69 100644 --- a/examples/oauth/src/main.rs +++ b/examples/oauth/src/main.rs @@ -33,9 +33,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_oauth=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); 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 9167d1e05c..49c6d00571 100644 --- a/examples/parse-body-based-on-content-type/src/main.rs +++ b/examples/parse-body-based-on-content-type/src/main.rs @@ -21,11 +21,11 @@ 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(|_| { + .with( + 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(); diff --git a/examples/print-request-response/src/main.rs b/examples/print-request-response/src/main.rs index 59c609dd83..7fa568f8b0 100644 --- a/examples/print-request-response/src/main.rs +++ b/examples/print-request-response/src/main.rs @@ -18,10 +18,10 @@ 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") + .with( + 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(); diff --git a/examples/prometheus-metrics/src/main.rs b/examples/prometheus-metrics/src/main.rs index 5ab3fbddde..e02bf7352a 100644 --- a/examples/prometheus-metrics/src/main.rs +++ b/examples/prometheus-metrics/src/main.rs @@ -66,10 +66,10 @@ async fn start_metrics_server() { #[tokio::main] async fn main() { tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_todos=debug,tower_http=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/rest-grpc-multiplex/src/main.rs b/examples/rest-grpc-multiplex/src/main.rs index 8376fcb0aa..4e03a56516 100644 --- a/examples/rest-grpc-multiplex/src/main.rs +++ b/examples/rest-grpc-multiplex/src/main.rs @@ -47,10 +47,10 @@ async fn web_root() -> &'static str { async fn main() { // initialize tracing tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_rest_grpc_multiplex=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/sessions/src/main.rs b/examples/sessions/src/main.rs index 716ee41af1..a325b2884c 100644 --- a/examples/sessions/src/main.rs +++ b/examples/sessions/src/main.rs @@ -30,9 +30,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_sessions=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/sqlx-postgres/src/main.rs b/examples/sqlx-postgres/src/main.rs index 0330edabd2..c23b9224f8 100644 --- a/examples/sqlx-postgres/src/main.rs +++ b/examples/sqlx-postgres/src/main.rs @@ -28,9 +28,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_tokio_postgres=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/sse/src/main.rs b/examples/sse/src/main.rs index 6679971152..305c959c33 100644 --- a/examples/sse/src/main.rs +++ b/examples/sse/src/main.rs @@ -20,10 +20,10 @@ 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") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_sse=debug,tower_http=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/static-file-server/src/main.rs b/examples/static-file-server/src/main.rs index 90cfc5e4f8..1ff4cf90ad 100644 --- a/examples/static-file-server/src/main.rs +++ b/examples/static-file-server/src/main.rs @@ -24,10 +24,10 @@ 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") + .with( + 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(); diff --git a/examples/stream-to-file/src/main.rs b/examples/stream-to-file/src/main.rs index 018d3d2fdc..38e88eff05 100644 --- a/examples/stream-to-file/src/main.rs +++ b/examples/stream-to-file/src/main.rs @@ -23,9 +23,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_stream_to_file=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/templates/src/main.rs b/examples/templates/src/main.rs index 90ea206b75..c23215bef6 100644 --- a/examples/templates/src/main.rs +++ b/examples/templates/src/main.rs @@ -18,9 +18,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_templates=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/testing/src/main.rs b/examples/testing/src/main.rs index 0bb9b352a0..b2041bef9e 100644 --- a/examples/testing/src/main.rs +++ b/examples/testing/src/main.rs @@ -14,10 +14,10 @@ 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") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_testing=debug,tower_http=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/tls-rustls/src/main.rs b/examples/tls-rustls/src/main.rs index 6eec0e9c2a..e73f425ff6 100644 --- a/examples/tls-rustls/src/main.rs +++ b/examples/tls-rustls/src/main.rs @@ -25,9 +25,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_tls_rustls=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs index 98910c5a05..7576d18695 100644 --- a/examples/todos/src/main.rs +++ b/examples/todos/src/main.rs @@ -36,10 +36,10 @@ use uuid::Uuid; #[tokio::main] async fn main() { tracing_subscriber::registry() - .with(tracing_subscriber::EnvFilter::new( - std::env::var("RUST_LOG") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_todos=debug,tower_http=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/tokio-postgres/src/main.rs b/examples/tokio-postgres/src/main.rs index faef52b5b9..33c703ca40 100644 --- a/examples/tokio-postgres/src/main.rs +++ b/examples/tokio-postgres/src/main.rs @@ -20,9 +20,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_tokio_postgres=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/tracing-aka-logging/src/main.rs b/examples/tracing-aka-logging/src/main.rs index 8da6e5fed8..a075f46be7 100644 --- a/examples/tracing-aka-logging/src/main.rs +++ b/examples/tracing-aka-logging/src/main.rs @@ -19,10 +19,10 @@ 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") + .with( + 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(); diff --git a/examples/unix-domain-socket/src/main.rs b/examples/unix-domain-socket/src/main.rs index 2f67a4c1e7..df28bbb08a 100644 --- a/examples/unix-domain-socket/src/main.rs +++ b/examples/unix-domain-socket/src/main.rs @@ -45,9 +45,10 @@ mod unix { 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/validator/src/main.rs b/examples/validator/src/main.rs index 359be614d3..692ee801e0 100644 --- a/examples/validator/src/main.rs +++ b/examples/validator/src/main.rs @@ -27,9 +27,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_validator=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/versioning/src/main.rs b/examples/versioning/src/main.rs index 6948eb1d20..8849b64e45 100644 --- a/examples/versioning/src/main.rs +++ b/examples/versioning/src/main.rs @@ -18,9 +18,10 @@ 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::EnvFilter::try_from_default_env() + .unwrap_or_else(|_| "example_versioning=debug".into()), + ) .with(tracing_subscriber::fmt::layer()) .init(); diff --git a/examples/websockets/src/main.rs b/examples/websockets/src/main.rs index a317bfa470..2ee9f749c5 100644 --- a/examples/websockets/src/main.rs +++ b/examples/websockets/src/main.rs @@ -26,10 +26,10 @@ 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") + .with( + tracing_subscriber::EnvFilter::try_from_default_env() .unwrap_or_else(|_| "example_websockets=debug,tower_http=debug".into()), - )) + ) .with(tracing_subscriber::fmt::layer()) .init();