diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 579a22c..face3f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -390,7 +390,12 @@ jobs: - name: Check THIRD_PARTY_NOTICES is up to date run: | set -euo pipefail - make about + cargo about generate \ + -c .github/about.toml \ + -o THIRD_PARTY_NOTICES.md \ + .github/about.hbs \ + --all-features \ + --locked git diff --exit-code -- THIRD_PARTY_NOTICES.md ci-success: diff --git a/Cargo.lock b/Cargo.lock index 303fa2c..ff950a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2113,11 +2113,11 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "reqwest" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" +checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "bytes", "cookie", "cookie_store", @@ -2828,9 +2828,9 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "steda" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fbe2c7345779ddd71f3a4694cc63bff7b2822ef2a39331f9288b9b4b5321ed3" +checksum = "33d20a9ecd5ba0b4e30523fd908caa3a753f1c49303b688c48b5baad60d93dee" dependencies = [ "futures-util", "log", @@ -2917,7 +2917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.3", + "getrandom 0.3.4", "once_cell", "rustix", "windows-sys 0.61.2", @@ -3359,9 +3359,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.26.0" +version = "1.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5772d71c9be8a8a6ac2117d949c5b224c1b72241bb611d9a3012edcf8af7812" +checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce" dependencies = [ "getrandom 0.4.3", "js-sys", diff --git a/Makefile b/Makefile index bc789a2..0c40cfe 100644 --- a/Makefile +++ b/Makefile @@ -203,8 +203,9 @@ deny: ## Perform a `cargo deny` check. cargo deny --locked --all-features check all .PHONY: about -about: ## Generate the `THIRD_PARTY_NOTICES.md` file. - cargo about generate -c .github/about.toml -o THIRD_PARTY_NOTICES.md .github/about.hbs --locked +about: THIRD_PARTY_NOTICES.md ## Generate the `THIRD_PARTY_NOTICES.md` file. +THIRD_PARTY_NOTICES.md: Cargo.lock Cargo.toml crates/*/Cargo.toml .github/about.toml .github/about.hbs + cargo about generate -c .github/about.toml -o $@ .github/about.hbs --locked .PHONY: check-msrv check-msrv: ## Check published Rust crates against their minimum supported Rust version. diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index e95f125..fba63af 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -2641,7 +2641,7 @@ Apache License 2.0 - [ciborium-ll]( https://github.com/enarx/ciborium ) 0.2.2 - [ciborium]( https://github.com/enarx/ciborium ) 0.2.2 - [rustls-platform-verifier]( https://github.com/rustls/rustls-platform-verifier ) 0.7.0 -- [steda]( https://github.com/selemis-com/steda ) 0.1.0 +- [steda]( https://github.com/selemis-com/steda ) 0.1.2 - [unarray]( https://github.com/cameron1024/unarray ) 0.1.4 #### License @@ -4346,7 +4346,7 @@ limitations under the License. Apache License 2.0 #### Used by -- [reqwest]( https://github.com/seanmonstar/reqwest ) 0.13.4 +- [reqwest]( https://github.com/seanmonstar/reqwest ) 0.13.5 #### License ``` @@ -6114,7 +6114,7 @@ Apache License 2.0 - [unicode-normalization]( https://github.com/unicode-rs/unicode-normalization ) 0.1.25 - [unicode-properties]( https://github.com/unicode-rs/unicode-properties ) 0.1.4 - [url]( https://github.com/servo/rust-url ) 2.5.8 -- [uuid]( https://github.com/uuid-rs/uuid ) 1.26.0 +- [uuid]( https://github.com/uuid-rs/uuid ) 1.26.1 - [version_check]( https://github.com/SergioBenitez/version_check ) 0.9.5 - [wait-timeout]( https://github.com/alexcrichton/wait-timeout ) 0.2.1 - [wasi]( https://github.com/bytecodealliance/wasi ) 0.11.1+wasi-snapshot-preview1 diff --git a/bin/kival/src/main.rs b/bin/kival/src/main.rs index 2a62b4c..ea1edd8 100644 --- a/bin/kival/src/main.rs +++ b/bin/kival/src/main.rs @@ -340,7 +340,7 @@ fn main() { print_json_error(&CliFailure::from_report(&error)); } } else { - eprintln!("Error: {error}"); + eprintln!("Error: {error:#}"); } std::process::exit(1); } diff --git a/bin/kivald/src/main.rs b/bin/kivald/src/main.rs index 6bbcf23..859eb5d 100644 --- a/bin/kivald/src/main.rs +++ b/bin/kivald/src/main.rs @@ -173,8 +173,8 @@ fn main() { // Parse command-line arguments and run the appropriate command. If any error occurs, print it // and exit with a non-zero status code. - if let Err(err) = Cli::parse().run() { - eprintln!("Error: {err}"); + if let Err(error) = Cli::parse().run() { + eprintln!("Error: {error:#}"); std::process::exit(1); } } diff --git a/crates/server/src/layers.rs b/crates/server/src/layers.rs index 32c6442..314b156 100644 --- a/crates/server/src/layers.rs +++ b/crates/server/src/layers.rs @@ -17,7 +17,7 @@ use axum::{ use kival_metrics::{ counter, describe_counter, describe_gauge, describe_histogram, gauge, histogram, }; -use kival_tracing::{Level, Span, debug_span, error, field}; +use kival_tracing::{Level, Span, error, field, info_span}; use tower::{ServiceBuilder, timeout::TimeoutLayer}; use tower_http::{ catch_panic::{CatchPanicLayer, ResponseForPanic}, @@ -248,7 +248,7 @@ impl ResponseForPanic for RecordHttpPanic { fn make_request_span(request: &Request) -> Span { let headers = request.headers(); - let span = debug_span!( + let span = info_span!( target: "kival::server::http", "request", method = %request.method(),