From bb415ea47fdab8c673e2152f834a3c13f4aa7506 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 14:19:36 +0800 Subject: [PATCH] build(deps): bump the rust-dependencies group with 12 updates (#587) * build(deps): bump the rust-dependencies group with 12 updates Bumps the rust-dependencies group with 12 updates: | Package | From | To | | --- | --- | --- | | [hyper-util](https://github.com/hyperium/hyper-util) | `0.1.7` | `0.1.8` | | [anyhow](https://github.com/dtolnay/anyhow) | `1.0.86` | `1.0.87` | | [opentelemetry](https://github.com/open-telemetry/opentelemetry-rust) | `0.24.0` | `0.25.0` | | [opentelemetry_sdk](https://github.com/open-telemetry/opentelemetry-rust) | `0.24.1` | `0.25.0` | | [tracing-opentelemetry](https://github.com/tokio-rs/tracing-opentelemetry) | `0.25.0` | `0.26.0` | | [opentelemetry-jaeger-propagator](https://github.com/open-telemetry/opentelemetry-rust) | `0.3.0` | `0.25.0` | | [opentelemetry-otlp](https://github.com/open-telemetry/opentelemetry-rust) | `0.17.0` | `0.25.0` | | [opentelemetry-semantic-conventions](https://github.com/open-telemetry/opentelemetry-rust) | `0.16.0` | `0.25.0` | | [ipnet](https://github.com/krisprice/ipnet) | `2.9.0` | `2.10.0` | | [tower](https://github.com/tower-rs/tower) | `0.5.0` | `0.5.1` | | [serde](https://github.com/serde-rs/serde) | `1.0.209` | `1.0.210` | | [shadowsocks](https://github.com/shadowsocks/shadowsocks-rust) | `1.20.2` | `1.20.3` | Updates `hyper-util` from 0.1.7 to 0.1.8 - [Release notes](https://github.com/hyperium/hyper-util/releases) - [Changelog](https://github.com/hyperium/hyper-util/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/hyper-util/compare/v0.1.7...v0.1.8) Updates `anyhow` from 1.0.86 to 1.0.87 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.86...1.0.87) Updates `opentelemetry` from 0.24.0 to 0.25.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry-0.24.0...opentelemetry-0.25.0) Updates `opentelemetry_sdk` from 0.24.1 to 0.25.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry_sdk-0.24.1...opentelemetry_sdk-0.25.0) Updates `tracing-opentelemetry` from 0.25.0 to 0.26.0 - [Release notes](https://github.com/tokio-rs/tracing-opentelemetry/releases) - [Changelog](https://github.com/tokio-rs/tracing-opentelemetry/blob/v0.1.x/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/tracing-opentelemetry/compare/v0.25.0...v0.26.0) Updates `opentelemetry-jaeger-propagator` from 0.3.0 to 0.25.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry-jaeger-propagator-0.3.0...opentelemetry-jaeger-propagator-0.25.0) Updates `opentelemetry-otlp` from 0.17.0 to 0.25.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry-otlp-0.17.0...opentelemetry-otlp-0.25.0) Updates `opentelemetry-semantic-conventions` from 0.16.0 to 0.25.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-rust/releases) - [Commits](https://github.com/open-telemetry/opentelemetry-rust/compare/opentelemetry-semantic-conventions-0.16.0...opentelemetry-semantic-conventions-0.25.0) Updates `ipnet` from 2.9.0 to 2.10.0 - [Release notes](https://github.com/krisprice/ipnet/releases) - [Changelog](https://github.com/krisprice/ipnet/blob/master/RELEASES.md) - [Commits](https://github.com/krisprice/ipnet/compare/2.9.0...2.10.0) Updates `tower` from 0.5.0 to 0.5.1 - [Release notes](https://github.com/tower-rs/tower/releases) - [Commits](https://github.com/tower-rs/tower/compare/tower-0.5.0...tower-0.5.1) Updates `serde` from 1.0.209 to 1.0.210 - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.209...v1.0.210) Updates `shadowsocks` from 1.20.2 to 1.20.3 - [Release notes](https://github.com/shadowsocks/shadowsocks-rust/releases) - [Commits](https://github.com/shadowsocks/shadowsocks-rust/compare/v1.20.2...v1.20.3) --- updated-dependencies: - dependency-name: hyper-util dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: opentelemetry dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: opentelemetry_sdk dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: tracing-opentelemetry dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: opentelemetry-jaeger-propagator dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: opentelemetry-otlp dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: opentelemetry-semantic-conventions dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: ipnet dependency-type: direct:production update-type: version-update:semver-minor dependency-group: rust-dependencies - dependency-name: tower dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies - dependency-name: shadowsocks dependency-type: direct:production update-type: version-update:semver-patch dependency-group: rust-dependencies ... Signed-off-by: dependabot[bot] * fix ci --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: iHsin --- Cargo.lock | 95 ++++++++++++++++++------------------ clash_lib/Cargo.toml | 12 ++--- clash_lib/src/app/logging.rs | 4 +- 3 files changed, 55 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de627a448..75b7174d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -211,9 +211,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8" [[package]] name = "arc-swap" @@ -1058,7 +1058,7 @@ dependencies = [ "tokio-tungstenite 0.23.1", "tokio-util", "tor-rtcompat", - "tower 0.5.0", + "tower 0.5.1", "tower-http", "tracing", "tracing-appender", @@ -2630,9 +2630,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -2822,9 +2822,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" dependencies = [ "serde", ] @@ -3190,18 +3190,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "mio" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - [[package]] name = "mockall" version = "0.13.0" @@ -3312,7 +3300,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio 0.8.11", + "mio", "walkdir", "windows-sys 0.48.0", ] @@ -3390,6 +3378,16 @@ dependencies = [ "libm", ] +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + [[package]] name = "num_enum" version = "0.7.3" @@ -3449,9 +3447,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "opentelemetry" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c365a63eec4f55b7efeceb724f1336f26a9cf3427b70e59e2cd2a5b947fba96" +checksum = "803801d3d3b71cd026851a53f974ea03df3d179cb758b260136a6c9e22e196af" dependencies = [ "futures-core", "futures-sink", @@ -3463,18 +3461,18 @@ dependencies = [ [[package]] name = "opentelemetry-jaeger-propagator" -version = "0.3.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a68a13b92fc708d875ad659b08b35d08b8ef2403e01944b39ca21e5b08b17" +checksum = "1ca4418db06b49e0c150b3cba4643d3848ccd71200345082e273adbd697864f2" dependencies = [ "opentelemetry", ] [[package]] name = "opentelemetry-otlp" -version = "0.17.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b925a602ffb916fb7421276b86756027b37ee708f9dce2dbdcc51739f07e727" +checksum = "596b1719b3cab83addb20bcbffdf21575279d9436d9ccccfe651a3bf0ab5ab06" dependencies = [ "async-trait", "futures-core", @@ -3490,9 +3488,9 @@ dependencies = [ [[package]] name = "opentelemetry-proto" -version = "0.7.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" +checksum = "2c43620e8f93359eb7e627a3b16ee92d8585774986f24f2ab010817426c5ce61" dependencies = [ "opentelemetry", "opentelemetry_sdk", @@ -3502,15 +3500,15 @@ dependencies = [ [[package]] name = "opentelemetry-semantic-conventions" -version = "0.16.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cefe0543875379e47eb5f1e68ff83f45cc41366a92dfd0d073d513bf68e9a05" +checksum = "9b8e442487022a943e2315740e443dc5ee95fd541c18f509a5a6251b408a9f95" [[package]] name = "opentelemetry_sdk" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692eac490ec80f24a17828d49b40b60f5aeaccdfe6a503f939713afd22bc28df" +checksum = "e0da0d6b47a3dbc6e9c9e36a0520e25cf943e046843818faaa3f87365a548c82" dependencies = [ "async-trait", "futures-channel", @@ -4560,9 +4558,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -4579,9 +4577,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -4753,9 +4751,9 @@ dependencies = [ [[package]] name = "shadowsocks" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06b6af20f0f009894644c9fb149ce6244c69b0a264ffcf7a53cbb3dd4883e4a3" +checksum = "fb6a87d691a190af90706a2846b6d53ab16afbbb582eed8b9e6b9dca2d0a633a" dependencies = [ "aes", "arc-swap", @@ -5217,28 +5215,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.2", + "mio", + "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -6216,9 +6215,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b837f86b25d7c0d7988f00a54e74739be6477f2aac6201b8f429a7569991b7" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ "futures-core", "futures-util", @@ -6323,9 +6322,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" +checksum = "5eabc56d23707ad55ba2a0750fc24767125d5a0f51993ba41ad2c441cc7b8dea" dependencies = [ "js-sys", "once_cell", diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index 8e00b4883..dd6c881e8 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -39,12 +39,12 @@ webpki-roots = "0.26" # Error handing & logging thiserror = "1" anyhow = "1" -opentelemetry = "0.24" -opentelemetry_sdk = { version = "0.24", default-features = false, features = ["trace", "rt-tokio"] } -tracing-opentelemetry = "0.25" -opentelemetry-jaeger-propagator = "0.3" -opentelemetry-otlp = { version = "0.17" } -opentelemetry-semantic-conventions = "0.16" +opentelemetry = "0.25" +opentelemetry_sdk = { version = "0.25", default-features = false, features = ["trace", "rt-tokio"] } +tracing-opentelemetry = "0.26" +opentelemetry-jaeger-propagator = "0.25" +opentelemetry-otlp = { version = "0.25" } +opentelemetry-semantic-conventions = "0.25" # Data structures url = "2" diff --git a/clash_lib/src/app/logging.rs b/clash_lib/src/app/logging.rs index a255748fc..f7e732948 100644 --- a/clash_lib/src/app/logging.rs +++ b/clash_lib/src/app/logging.rs @@ -8,7 +8,7 @@ use opentelemetry::{ }; use opentelemetry_sdk::{trace, Resource}; use opentelemetry_semantic_conventions::{ - resource::{DEPLOYMENT_ENVIRONMENT, SERVICE_NAME, SERVICE_VERSION}, + resource::{DEPLOYMENT_ENVIRONMENT_NAME, SERVICE_NAME, SERVICE_VERSION}, SCHEMA_URL, }; use serde::Serialize; @@ -124,7 +124,7 @@ pub fn setup_logging( KeyValue::new(SERVICE_NAME, env!("CARGO_PKG_NAME")), KeyValue::new(SERVICE_VERSION, env!("CARGO_PKG_VERSION")), KeyValue::new( - DEPLOYMENT_ENVIRONMENT, + DEPLOYMENT_ENVIRONMENT_NAME, std::env::var("PROFILE").unwrap_or_default(), ), ],