From 706a9463f9d963b722055214eda2780e951a8dab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 03:04:21 +0000 Subject: [PATCH] Bump tracing-opentelemetry from 0.21.0 to 0.22.0 Bumps [tracing-opentelemetry](https://github.com/tokio-rs/tracing-opentelemetry) from 0.21.0 to 0.22.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.21.0...v0.22.0) --- updated-dependencies: - dependency-name: tracing-opentelemetry dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 103 +++++++++++++++---------------------------- clash_lib/Cargo.toml | 2 +- 2 files changed, 37 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a60e3f2c2..5120973a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -806,7 +806,7 @@ dependencies = [ "netstack-lwip", "network-interface", "once_cell", - "opentelemetry 0.21.0", + "opentelemetry", "opentelemetry-jaeger", "prost", "public-suffix", @@ -2537,16 +2537,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" -[[package]] -name = "opentelemetry" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" -dependencies = [ - "opentelemetry_api", - "opentelemetry_sdk 0.20.0", -] - [[package]] name = "opentelemetry" version = "0.21.0" @@ -2573,7 +2563,7 @@ dependencies = [ "bytes", "http", "hyper", - "opentelemetry 0.21.0", + "opentelemetry", "tokio", ] @@ -2589,10 +2579,10 @@ dependencies = [ "headers", "http", "hyper", - "opentelemetry 0.21.0", + "opentelemetry", "opentelemetry-http", "opentelemetry-semantic-conventions", - "opentelemetry_sdk 0.21.0", + "opentelemetry_sdk", "thrift", "tokio", ] @@ -2603,43 +2593,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "opentelemetry 0.21.0", -] - -[[package]] -name = "opentelemetry_api" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" -dependencies = [ - "futures-channel", - "futures-util", - "indexmap 1.9.3", - "js-sys", - "once_cell", - "pin-project-lite", - "thiserror", - "urlencoding", -] - -[[package]] -name = "opentelemetry_sdk" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" -dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "once_cell", - "opentelemetry_api", - "ordered-float 3.9.1", - "percent-encoding", - "rand", - "regex", - "thiserror", + "opentelemetry", ] [[package]] @@ -2653,8 +2607,9 @@ dependencies = [ "futures-channel", "futures-executor", "futures-util", + "glob", "once_cell", - "opentelemetry 0.21.0", + "opentelemetry", "ordered-float 4.1.1", "percent-encoding", "rand", @@ -2672,15 +2627,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "ordered-float" -version = "3.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" -dependencies = [ - "num-traits", -] - [[package]] name = "ordered-float" version = "4.1.1" @@ -4059,20 +4005,33 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + [[package]] name = "tracing-opentelemetry" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8" +checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ + "js-sys", "once_cell", - "opentelemetry 0.20.0", - "opentelemetry_sdk 0.20.0", + "opentelemetry", + "opentelemetry_sdk", "smallvec", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-subscriber", + "web-time", ] [[package]] @@ -4106,7 +4065,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.1.3", ] [[package]] @@ -4428,6 +4387,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" version = "0.25.2" diff --git a/clash_lib/Cargo.toml b/clash_lib/Cargo.toml index 0a7e75acf..fc8d5e873 100644 --- a/clash_lib/Cargo.toml +++ b/clash_lib/Cargo.toml @@ -45,7 +45,7 @@ once_cell = "1.18.0" # opentelemetry opentelemetry = "0.21" -tracing-opentelemetry = "0.21" +tracing-opentelemetry = "0.22" opentelemetry-jaeger = { version = "0.20", features = ["collector_client", "hyper_collector_client", "rt-tokio"] } crc32fast = "1.3.2"