Skip to content

Commit

Permalink
Use env!("CARGO_CRATE_NAME") in the example to simplify the tracing…
Browse files Browse the repository at this point in the history
… setup code
  • Loading branch information
hongweipeng authored and 洪伟鹏 committed Aug 22, 2024
1 parent bd3eaa7 commit a83c795
Show file tree
Hide file tree
Showing 38 changed files with 70 additions and 50 deletions.
2 changes: 1 addition & 1 deletion examples/chat/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_chat=trace".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=trace").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/compression/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example-compression=trace".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=trace").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_consume_body_in_extractor_or_middleware=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/customize-extractor-error/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_customize_extractor_error=trace".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=trace").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/customize-path-rejection/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_customize_path_rejection=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/dependency-injection/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_dependency_injection=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/diesel-async-postgres/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_diesel_async_postgres=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/diesel-postgres/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_tokio_postgres=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/error-handling/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_error_handling=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/form/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_form=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/global-404-handler/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_global_404_handler=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
6 changes: 5 additions & 1 deletion examples/graceful-shutdown/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
"example_graceful_shutdown=debug,tower_http=debug,axum=trace".into()
concat!(
env!("CARGO_CRATE_NAME"),
"=debug,tower_http=debug,axum=trace"
)
.into()
}),
)
.with(tracing_subscriber::fmt::layer().without_time())
Expand Down
5 changes: 3 additions & 2 deletions examples/http-proxy/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_http_proxy=trace,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=trace,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/jwt/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_jwt=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/key-value-store/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_key_value_store=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/low-level-openssl/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_low_level_openssl=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/low-level-rustls/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_low_level_rustls=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/multipart-form/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_multipart_form=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/oauth/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_oauth=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/parse-body-based-on-content-type/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
"example_parse_body_based_on_content_type=debug,tower_http=debug".into()
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
Expand Down
5 changes: 3 additions & 2 deletions examples/print-request-response/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_print_request_response=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/prometheus-metrics/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ async fn start_metrics_server() {
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_prometheus_metrics=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/reqwest-response/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_reqwest_response=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/sqlx-postgres/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_tokio_postgres=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/sse/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_sse=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/static-file-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_static_file_server=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/stream-to-file/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_stream_to_file=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/templates/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_templates=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/testing/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_testing=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/tls-graceful-shutdown/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_tls_graceful_shutdown=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/tls-rustls/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_tls_rustls=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/todos/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ use uuid::Uuid;
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_todos=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/tokio-postgres/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_tokio_postgres=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/tokio-redis/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_tokio_redis=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
6 changes: 5 additions & 1 deletion examples/tracing-aka-logging/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ async fn main() {
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
// axum logs rejections from built-in extractors with the `axum::rejection`
// target, at `TRACE` level. `axum::rejection=trace` enables showing those events
"example_tracing_aka_logging=debug,tower_http=debug,axum::rejection=trace".into()
concat!(
env!("CARGO_CRATE_NAME"),
"=debug,tower_http=debug,axum::rejection=trace"
)
.into()
}),
)
.with(tracing_subscriber::fmt::layer())
Expand Down
2 changes: 1 addition & 1 deletion examples/validator/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_validator=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
2 changes: 1 addition & 1 deletion examples/versioning/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_versioning=debug".into()),
.unwrap_or_else(|_| concat!(env!("CARGO_CRATE_NAME"), "=debug").into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down
5 changes: 3 additions & 2 deletions examples/websockets/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ use futures::{sink::SinkExt, stream::StreamExt};
async fn main() {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
.unwrap_or_else(|_| "example_websockets=debug,tower_http=debug".into()),
tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| {
concat!(env!("CARGO_CRATE_NAME"), "=debug,tower_http=debug").into()
}),
)
.with(tracing_subscriber::fmt::layer())
.init();
Expand Down

0 comments on commit a83c795

Please sign in to comment.