This is an automated email from the ASF dual-hosted git repository. tison pushed a commit to branch upgrade-logforth in repository https://gitbox.apache.org/repos/asf/opendal.git
commit c4fb973a0a6b8fabeb3b43b91a40f7e54756ec8e Author: tison <[email protected]> AuthorDate: Mon Dec 15 16:21:27 2025 +0800 chore: Upgrade logforth to 0.29.1 Signed-off-by: tison <[email protected]> --- core/Cargo.lock | 227 ++++++++++++++++++++++++++++++++++++++--- core/benches/vs_s3/Cargo.toml | 2 +- core/benches/vs_s3/src/main.rs | 2 +- core/fuzz/Cargo.toml | 2 +- core/fuzz/fuzz_writer.rs | 2 +- dev/Cargo.toml | 2 +- dev/src/main.rs | 2 +- 7 files changed, 219 insertions(+), 20 deletions(-) diff --git a/core/Cargo.lock b/core/Cargo.lock index c72ae28a1..719a22c7f 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -1766,6 +1766,15 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "combine" version = "4.6.7" @@ -2791,22 +2800,23 @@ dependencies = [ "syn 2.0.111", ] -[[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +[[package]] +name = "erased-serde" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3" +dependencies = [ + "serde", + "serde_core", + "typeid", +] + [[package]] name = "errno" version = "0.3.14" @@ -4726,19 +4736,75 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" dependencies = [ + "sval", + "sval_ref", "value-bag", ] [[package]] name = "logforth" -version = "0.23.1" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b81df91671a0a96902d950498cc69b509291c37f6d49105d5a1b7ddacc727d" +checksum = "40c105c59828d07aeb95b06f9a345b12869ddc249d44a7302697a66da439076f" +dependencies = [ + "logforth-append-file", + "logforth-bridge-log", + "logforth-core", + "logforth-layout-json", + "logforth-layout-text", +] + +[[package]] +name = "logforth-append-file" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d2ccb8b7e501c114e80069eb2b83c02a48039c23a7037e717b5b09a4ed306fb" dependencies = [ - "anyhow", - "env_filter", "jiff", + "logforth-core", +] + +[[package]] +name = "logforth-bridge-log" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aa6ca548389fd166a995b5940e15b0dacbdd5a30f2f24eac9aa4bf664bda5c" +dependencies = [ "log", + "logforth-core", +] + +[[package]] +name = "logforth-core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a77869b8dba38c67ed19e1753e59d9faefdcc60557bc4e84db0348606a304ac5" +dependencies = [ + "anyhow", + "value-bag", +] + +[[package]] +name = "logforth-layout-json" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b80d310e0670560404a825f64dbd78a8761c5bb7da952513e90ba9dd525bd2" +dependencies = [ + "jiff", + "logforth-core", + "serde", + "serde_json", +] + +[[package]] +name = "logforth-layout-text" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2a4674e549a59eeac8e301584143186c433181bdc5460046a130becedef6a3d" +dependencies = [ + "colored", + "jiff", + "logforth-core", ] [[package]] @@ -8337,6 +8403,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_buf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc948de1bbead18a61be0b33182636603ea0239ca2577b9704fc39eba900e4e5" +dependencies = [ + "serde_core", +] + [[package]] name = "serde_bytes" version = "0.11.19" @@ -8367,6 +8442,15 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "serde_fmt" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e497af288b3b95d067a23a4f749f2861121ffcb2f6d8379310dcda040c345ed" +dependencies = [ + "serde_core", +] + [[package]] name = "serde_json" version = "1.0.145" @@ -9190,6 +9274,84 @@ dependencies = [ "ws_stream_wasm", ] +[[package]] +name = "sval" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502b8906c4736190684646827fbab1e954357dfe541013bbd7994d033d53a1ca" + +[[package]] +name = "sval_buffer" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4b854348b15b6c441bdd27ce9053569b016a0723eab2d015b1fd8e6abe4f708" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bd9e8b74410ddad37c6962587c5f9801a2caadba9e11f3f916ee3f31ae4a1f" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe17b8deb33a9441280b4266c2d257e166bafbaea6e66b4b34ca139c91766d9" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854addb048a5bafb1f496c98e0ab5b9b581c3843f03ca07c034ae110d3b7c623" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_nested" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96cf068f482108ff44ae8013477cb047a1665d5f1a635ad7cf79582c1845dce9" +dependencies = [ + "sval", + "sval_buffer", + "sval_ref", +] + +[[package]] +name = "sval_ref" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed02126365ffe5ab8faa0abd9be54fbe68d03d607cd623725b0a71541f8aaa6f" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a263383c6aa2076c4ef6011d3bae1b356edf6ea2613e3d8e8ebaa7b57dd707d5" +dependencies = [ + "serde_core", + "sval", + "sval_nested", +] + [[package]] name = "syn" version = "1.0.109" @@ -10013,6 +10175,12 @@ dependencies = [ "syn 2.0.111", ] +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + [[package]] name = "typenum" version = "1.19.0" @@ -10174,6 +10342,37 @@ name = "value-bag" version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16530907bfe2999a1773ca5900a65101e092c70f642f25cc23ca0c43573262c5" +dependencies = [ + "erased-serde", + "serde_buf", + "serde_core", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d00ae130edd690eaa877e4f40605d534790d1cf1d651e7685bd6a144521b251f" +dependencies = [ + "sval", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", +] [[package]] name = "vart" diff --git a/core/benches/vs_s3/Cargo.toml b/core/benches/vs_s3/Cargo.toml index 882e1b10d..1912d005c 100644 --- a/core/benches/vs_s3/Cargo.toml +++ b/core/benches/vs_s3/Cargo.toml @@ -32,7 +32,7 @@ aws-credential-types = { version = "1.2.8", features = [ aws-sdk-s3 = "1.91.0" criterion = { version = "0.7", features = ["async", "async_tokio"] } dotenvy = "0.15" -logforth = { version = "0.23.1", default-features = false } +logforth = { version = "0.29.1", features = ["starter-log"] } opendal = { path = "../..", features = ["tests"] } rand = { workspace = true } tokio = { workspace = true, features = ["full"] } diff --git a/core/benches/vs_s3/src/main.rs b/core/benches/vs_s3/src/main.rs index 12c6ad584..fe1e733f8 100644 --- a/core/benches/vs_s3/src/main.rs +++ b/core/benches/vs_s3/src/main.rs @@ -29,7 +29,7 @@ use tokio::io::AsyncReadExt; fn main() { let _ = dotenvy::dotenv(); - let _ = logforth::stderr().try_apply(); + let _ = logforth::starter_log::stderr().try_apply(); let endpoint = env::var("OPENDAL_S3_ENDPOINT").unwrap(); let access_key = env::var("OPENDAL_S3_ACCESS_KEY_ID").unwrap(); diff --git a/core/fuzz/Cargo.toml b/core/fuzz/Cargo.toml index 3f74fa1eb..1043d1677 100644 --- a/core/fuzz/Cargo.toml +++ b/core/fuzz/Cargo.toml @@ -83,7 +83,7 @@ services-webhdfs = ["opendal/services-webhdfs"] arbitrary = { version = "1.4.2", features = ["derive"] } libfuzzer-sys = "0.4" log = { workspace = true } -logforth = { version = "0.23.1", default-features = false } +logforth = { version = "0.29.1", features = ["starter-log"] } opendal = { path = "..", features = ["tests"] } uuid = { workspace = true, features = ["v4"] } diff --git a/core/fuzz/fuzz_writer.rs b/core/fuzz/fuzz_writer.rs index 45d508831..aa3ed5815 100644 --- a/core/fuzz/fuzz_writer.rs +++ b/core/fuzz/fuzz_writer.rs @@ -105,7 +105,7 @@ async fn fuzz_writer(op: Operator, input: FuzzInput) -> Result<()> { } fuzz_target!(|input: FuzzInput| { - let _ = logforth::stderr().try_apply(); + let _ = logforth::starter_log::stderr().try_apply(); let op = init_test_service().expect("operator init must succeed"); if let Some(op) = op { diff --git a/dev/Cargo.toml b/dev/Cargo.toml index a11a9c24e..7049e4851 100644 --- a/dev/Cargo.toml +++ b/dev/Cargo.toml @@ -34,7 +34,7 @@ flate2 = { version = "1.1.0", default-features = false, features = ["zlib-rs"] } heck = { version = "0.5.0" } ignore = { version = "0.4.23" } log = { version = "0.4.22" } -logforth = { version = "0.23.1", default-features = false } +logforth = { version = "0.29.1", features = ["starter-log"] } markdown = { version = "1.0.0-alpha.21" } minijinja = { version = "2.5.0" } regex = { version = "1.11.1" } diff --git a/dev/src/main.rs b/dev/src/main.rs index 0a496f9ad..7b65e4bb7 100644 --- a/dev/src/main.rs +++ b/dev/src/main.rs @@ -66,7 +66,7 @@ enum Commands { } fn main() -> anyhow::Result<()> { - logforth::stderr().apply(); + logforth::starter_log::stderr().apply(); match Cmd::parse().command { Commands::Generate { language } => generate::run(&language),
