From 4f1f66bd1ae211cb1406330daadf09a0d3981206 Mon Sep 17 00:00:00 2001 From: tison Date: Wed, 17 Jun 2026 00:38:06 +0800 Subject: [PATCH] chore: prepare for the next release Signed-off-by: tison --- CHANGELOG.md | 2 + Cargo.lock | 164 ++++++++++++++++++---------- Cargo.toml | 4 +- examples/Cargo.toml | 6 +- examples/logging.rs | 9 +- fastrace-datadog/Cargo.toml | 2 +- fastrace-futures/Cargo.toml | 2 +- fastrace-jaeger/Cargo.toml | 2 +- fastrace-macro/Cargo.toml | 2 +- fastrace-opentelemetry/CHANGELOG.md | 2 + fastrace-opentelemetry/Cargo.toml | 2 +- fastrace/Cargo.toml | 2 +- 12 files changed, 130 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 808d47ab..0455b0c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All significant changes to this project will be documented in this file. ## Unreleased +## v0.7.18 + ### Notable Changes * Upgraded MSRV to 1.91. diff --git a/Cargo.lock b/Cargo.lock index 3b6f89a5..b2ed6c52 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - [[package]] name = "anstyle" version = "1.0.14" @@ -151,6 +142,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" +[[package]] +name = "colored" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "condtype" version = "1.3.0" @@ -322,16 +322,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "env_filter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" -dependencies = [ - "log", - "regex", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -379,7 +369,7 @@ dependencies = [ [[package]] name = "fastrace" -version = "0.7.17" +version = "0.7.18" dependencies = [ "async-trait", "crossbeam", @@ -410,7 +400,7 @@ dependencies = [ [[package]] name = "fastrace-datadog" -version = "0.7.17" +version = "0.7.18" dependencies = [ "fastrace", "log", @@ -421,7 +411,7 @@ dependencies = [ [[package]] name = "fastrace-futures" -version = "0.7.17" +version = "0.7.18" dependencies = [ "async-stream", "fastrace", @@ -434,7 +424,7 @@ dependencies = [ [[package]] name = "fastrace-jaeger" -version = "0.7.17" +version = "0.7.18" dependencies = [ "fastrace", "log", @@ -443,7 +433,7 @@ dependencies = [ [[package]] name = "fastrace-macro" -version = "0.7.17" +version = "0.7.18" dependencies = [ "fastrace", "proc-macro2", @@ -453,7 +443,7 @@ dependencies = [ [[package]] name = "fastrace-opentelemetry" -version = "0.18.0" +version = "0.18.1" dependencies = [ "fastrace", "log", @@ -1108,15 +1098,102 @@ dependencies = [ [[package]] name = "logforth" -version = "0.24.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7d12336d4771854b6fdbf75bab8257e62d4221d1f9d7187fc254b29aa3bd23b" +checksum = "522000d3921e4b089de59204d2d3ca8792cd53f8ce5a54b5ac8b9a6e867259f0" +dependencies = [ + "log", + "logforth-append-fastrace", + "logforth-append-file", + "logforth-bridge-log", + "logforth-core", + "logforth-diagnostic-fastrace", + "logforth-filter-rustlog", + "logforth-layout-json", + "logforth-layout-text", +] + +[[package]] +name = "logforth-append-fastrace" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "107b4296c4dfbdca6eb3a29a0414e374d1f06e7e7738f16e28dd6b8079cb59ec" dependencies = [ - "anyhow", - "env_filter", "fastrace", "jiff", + "logforth-core", +] + +[[package]] +name = "logforth-append-file" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80f4ed78a03a30c12285135d98330f0f5d53cb0019bd1ac6d66863dae72d8d52" +dependencies = [ + "jiff", + "logforth-core", +] + +[[package]] +name = "logforth-bridge-log" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7224c78547e542572ae4d1f787f96c4395a4c3f24513bf221bd8e49888f610" +dependencies = [ "log", + "logforth-core", +] + +[[package]] +name = "logforth-core" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "400ba5305e0cb6819efa6c2c503020562eb5b47fd53c91c935be55af1ffd374e" +dependencies = [ + "anyhow", + "serde", +] + +[[package]] +name = "logforth-diagnostic-fastrace" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95df712f493a6e50ab7bb10ca76ddafc3b80cf23a998b88cc3f8e8bd285d9f18" +dependencies = [ + "fastrace", + "logforth-core", +] + +[[package]] +name = "logforth-filter-rustlog" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e8431cfa1d3eeca479c363651320a66c7003350528f678b30e8c1474fb0d802" +dependencies = [ + "logforth-core", +] + +[[package]] +name = "logforth-layout-json" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d86a105f8f32151ca1e0a6d4097d478badb02d5715239ba0fa431a188a5d966" +dependencies = [ + "jiff", + "logforth-core", + "serde", + "serde_json", +] + +[[package]] +name = "logforth-layout-text" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eafe007ac55293d807e8c7f5a23002e2518d32e476e195443cde23e7845416a" +dependencies = [ + "colored", + "jiff", + "logforth-core", ] [[package]] @@ -1564,41 +1641,12 @@ dependencies = [ "bitflags", ] -[[package]] -name = "regex" -version = "1.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - [[package]] name = "regex-lite" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab834c73d247e67f4fae452806d17d3c7501756d98c8808d7c9c7aa7d18f973" -[[package]] -name = "regex-syntax" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" - [[package]] name = "reqwest" version = "0.12.28" diff --git a/Cargo.toml b/Cargo.toml index 626b7f76..6196bca6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,8 @@ rust-version = "1.91.0" [workspace.dependencies] # Workspace dependencies -fastrace = { version = "0.7.17", path = "fastrace" } -fastrace-macro = { version = "0.7.17", path = "fastrace-macro" } +fastrace = { version = "0.7.18", path = "fastrace" } +fastrace-macro = { version = "0.7.18", path = "fastrace-macro" } # Workspace leaves fastrace-datadog = { path = "fastrace-datadog" } diff --git a/examples/Cargo.toml b/examples/Cargo.toml index e7e86546..0a0e4ff0 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -19,7 +19,11 @@ fastrace-jaeger = { workspace = true } fastrace-opentelemetry = { workspace = true } log = { workspace = true } logcall = { version = "0.2.0" } -logforth = { version = "0.24.0", features = ["fastrace"] } +logforth = { version = "0.30.1", features = [ + "append-fastrace", + "diagnostic-fastrace", + "starter-log", +] } opentelemetry = { workspace = true } opentelemetry-otlp = { workspace = true } opentelemetry_sdk = { workspace = true } diff --git a/examples/logging.rs b/examples/logging.rs index 76495af5..bc98d280 100644 --- a/examples/logging.rs +++ b/examples/logging.rs @@ -17,6 +17,8 @@ use fastrace::collector::ConsoleReporter; use fastrace::prelude::*; use log::info; use logforth::append; +use logforth::diagnostic; +use logforth::layout; /// An example of automatically logging function arguments and return values. #[logcall::logcall("debug")] @@ -31,8 +33,11 @@ fn main() { // Set up a custom logger. // // Logforth (https://docs.rs/logforth/) is easy to start and integrated with Fastrace. - logforth::builder() - .dispatch(|d| d.append(append::Stderr::default())) + logforth::starter_log::builder() + .dispatch(|d| { + d.diagnostic(diagnostic::FastraceDiagnostic::default()) + .append(append::Stderr::default().with_layout(layout::TextLayout::default())) + }) .dispatch(|d| d.append(append::FastraceEvent::default())) .apply(); diff --git a/fastrace-datadog/Cargo.toml b/fastrace-datadog/Cargo.toml index 2b3c5f6d..8398578a 100644 --- a/fastrace-datadog/Cargo.toml +++ b/fastrace-datadog/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastrace-datadog" -version = "0.7.17" +version = "0.7.18" categories = ["development-tools::debugging"] description = "Datadog reporter for fastrace" diff --git a/fastrace-futures/Cargo.toml b/fastrace-futures/Cargo.toml index 31013f26..60cdab8f 100644 --- a/fastrace-futures/Cargo.toml +++ b/fastrace-futures/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastrace-futures" -version = "0.7.17" +version = "0.7.18" categories = ["development-tools::debugging"] description = "Utilities for tracing `futures` with fastrace" diff --git a/fastrace-jaeger/Cargo.toml b/fastrace-jaeger/Cargo.toml index da3c5e18..4203189f 100644 --- a/fastrace-jaeger/Cargo.toml +++ b/fastrace-jaeger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastrace-jaeger" -version = "0.7.17" +version = "0.7.18" categories = ["development-tools::debugging"] description = "Jaeger reporter for fastrace" diff --git a/fastrace-macro/Cargo.toml b/fastrace-macro/Cargo.toml index 8d2c7452..c01be943 100644 --- a/fastrace-macro/Cargo.toml +++ b/fastrace-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastrace-macro" -version = "0.7.17" +version = "0.7.18" categories = ["development-tools::debugging"] description = "Attribute procedural macro for fastrace" diff --git a/fastrace-opentelemetry/CHANGELOG.md b/fastrace-opentelemetry/CHANGELOG.md index bf97bfd5..3c2520e8 100644 --- a/fastrace-opentelemetry/CHANGELOG.md +++ b/fastrace-opentelemetry/CHANGELOG.md @@ -4,6 +4,8 @@ All significant changes to this project will be documented in this file. ## Unreleased +## v0.18.1 + ### Notable Changes * Upgraded MSRV to 1.91. diff --git a/fastrace-opentelemetry/Cargo.toml b/fastrace-opentelemetry/Cargo.toml index 5df426b7..9f28a89f 100644 --- a/fastrace-opentelemetry/Cargo.toml +++ b/fastrace-opentelemetry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastrace-opentelemetry" -version = "0.18.0" +version = "0.18.1" categories = ["development-tools::debugging"] description = "Opentelemetry reporter for fastrace" diff --git a/fastrace/Cargo.toml b/fastrace/Cargo.toml index 66048236..5ab75ed9 100644 --- a/fastrace/Cargo.toml +++ b/fastrace/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fastrace" -version = "0.7.17" +version = "0.7.18" categories = ["development-tools::debugging"] description = "A high-performance timeline tracing library for Rust"