diff --git a/Cargo.lock b/Cargo.lock index 042e786..bd68b4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1489,6 +1489,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + [[package]] name = "httparse" version = "1.8.0" @@ -1936,6 +1942,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "matches" version = "0.1.10" @@ -3407,10 +3422,19 @@ checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick 1.0.2", "memchr", - "regex-automata", + "regex-automata 0.3.3", "regex-syntax 0.7.4", ] +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + [[package]] name = "regex-automata" version = "0.3.3" @@ -4637,6 +4661,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower-http" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +dependencies = [ + "bitflags 2.3.3", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-layer" version = "0.3.2" @@ -4734,10 +4777,14 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ + "matchers", "nu-ansi-term", + "once_cell", + "regex", "sharded-slab", "smallvec", "thread_local", + "tracing", "tracing-core", "tracing-log", ] @@ -4958,6 +5005,9 @@ dependencies = [ "sentry", "serde", "tokio", + "tower-http", + "tracing", + "tracing-subscriber", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c2a39d8..7cbb3ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,3 +23,7 @@ log = "0.4.18" env_logger = "0.10.0" chrono = "0.4.26" sentry = "0.31.5" + +tracing = "0.1.37" +tracing-subscriber = { version = "0.3.17", features = ["env-filter"]} +tower-http = { version = "0.4.3", features = ["trace"] } diff --git a/src/main.rs b/src/main.rs index 32d8b63..1020d7a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,6 +21,11 @@ async fn start_app() { #[tokio::main] async fn main() { + tracing_subscriber::fmt() + .with_target(false) + .compact() + .init(); + let _guard = sentry::init(config::CONFIG.sentry_dsn.clone()); env_logger::init(); diff --git a/src/views/mod.rs b/src/views/mod.rs index 55a3083..7e71be5 100644 --- a/src/views/mod.rs +++ b/src/views/mod.rs @@ -1,4 +1,6 @@ use axum::{Router, response::Response, http::{StatusCode, self, Request}, middleware::{Next, self}}; +use tower_http::trace::{TraceLayer, self}; +use tracing::Level; use crate::config::CONFIG; @@ -33,4 +35,11 @@ pub fn get_router() -> Router { .nest("/languages/", languages::get_router()) .nest("/donate_notifications/", donate_notifications::get_router()) .layer(middleware::from_fn(auth)) + .layer( + TraceLayer::new_for_http() + .make_span_with(trace::DefaultMakeSpan::new() + .level(Level::INFO)) + .on_response(trace::DefaultOnResponse::new() + .level(Level::INFO)), + ) }