diff --git a/Cargo.lock b/Cargo.lock index 8dfbb86..f6c4da9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,19 +17,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "getrandom 0.3.3", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -966,16 +953,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "getrandom" version = "0.2.16" @@ -3158,24 +3135,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tracing-bunyan-formatter" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d637245a0d8774bd48df6482e086c59a8b5348a910c3b0579354045a9d82411" -dependencies = [ - "ahash", - "gethostname", - "log", - "serde", - "serde_json", - "time", - "tracing", - "tracing-core", - "tracing-log 0.1.4", - "tracing-subscriber", -] - [[package]] name = "tracing-core" version = "0.1.34" @@ -3186,17 +3145,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -3223,7 +3171,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] @@ -3884,7 +3832,6 @@ dependencies = [ "tower-sessions", "tower-sessions-redis-store", "tracing", - "tracing-bunyan-formatter", "tracing-subscriber", "unicode-segmentation", "urlencoding", diff --git a/Cargo.toml b/Cargo.toml index be88ab2..bb95bce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,6 @@ tower-http = { version = "0.6.6", features = ["fs", "trace"] } tower-sessions = "0.14.0" tower-sessions-redis-store = "0.16.0" tracing = "0.1.41" -tracing-bunyan-formatter = "0.3.10" tracing-subscriber = { version = "0.3.19", features = ["env-filter"] } unicode-segmentation = "1.12.0" urlencoding = "2.1.3" diff --git a/src/startup.rs b/src/startup.rs index 9552c0f..04f0437 100644 --- a/src/startup.rs +++ b/src/startup.rs @@ -87,7 +87,7 @@ impl Application { } pub async fn run_until_stopped(self) -> Result<(), std::io::Error> { - tracing::debug!("Listening on {}", self.local_addr()); + tracing::debug!("listening on {}", self.local_addr()); if let Some(tls_config) = self.tls_config { axum_server::from_tcp_rustls(self.listener, tls_config) .serve(self.router.into_make_service()) @@ -156,7 +156,6 @@ pub fn app( method = ?request.method(), matched_path, request_id, - some_other_field = tracing::field::Empty, ) }), ) diff --git a/src/telemetry.rs b/src/telemetry.rs index 45bb66f..dc63ad3 100644 --- a/src/telemetry.rs +++ b/src/telemetry.rs @@ -1,12 +1,10 @@ use tokio::task::JoinHandle; -use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer}; use tracing_subscriber::{fmt::MakeWriter, layer::SubscriberExt, util::SubscriberInitExt}; pub fn init_subscriber(sink: Sink) where Sink: for<'a> MakeWriter<'a> + Send + Sync + 'static, { - let formatting_layer = BunyanFormattingLayer::new(env!("CARGO_CRATE_NAME").into(), sink); tracing_subscriber::registry() .with( tracing_subscriber::EnvFilter::try_from_default_env().unwrap_or_else(|_| { @@ -17,8 +15,7 @@ where .into() }), ) - .with(JsonStorageLayer) - .with(formatting_layer) + .with(tracing_subscriber::fmt::layer().pretty().with_writer(sink)) .init(); }