Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions THIRD_PARTY_NOTICES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
```
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/kival/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ fn main() {
print_json_error(&CliFailure::from_report(&error));
}
} else {
eprintln!("Error: {error}");
eprintln!("Error: {error:#}");
}
std::process::exit(1);
}
Expand Down
4 changes: 2 additions & 2 deletions bin/kivald/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/server/src/layers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down Expand Up @@ -248,7 +248,7 @@ impl ResponseForPanic for RecordHttpPanic {
fn make_request_span<B>(request: &Request<B>) -> Span {
let headers = request.headers();

let span = debug_span!(
let span = info_span!(
target: "kival::server::http",
"request",
method = %request.method(),
Expand Down
Loading