diff --git a/Cargo.lock b/Cargo.lock index 416ff1c63..7b4cfc5ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1430,7 +1430,7 @@ dependencies = [ "opentelemetry 0.25.0", "opentelemetry-jaeger", "opentelemetry-otlp", - "opentelemetry_sdk", + "opentelemetry_sdk 0.25.0", "ordered-float 4.2.2", "parking_lot", "pav_regression", @@ -2548,18 +2548,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", - "windows-sys 0.52.0", -] - [[package]] name = "more-asserts" version = "0.2.2" @@ -2648,7 +2636,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio 0.8.11", + "mio", "walkdir", "windows-sys 0.48.0", ] @@ -2865,7 +2853,7 @@ dependencies = [ "opentelemetry 0.23.0", "opentelemetry-http", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "thrift", "tokio", ] @@ -2881,7 +2869,7 @@ dependencies = [ "http 0.2.12", "opentelemetry 0.23.0", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "prost", "thiserror", "tokio", @@ -2895,7 +2883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" dependencies = [ "opentelemetry 0.23.0", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "prost", "tonic", ] @@ -2928,6 +2916,27 @@ dependencies = [ "tokio-stream", ] +[[package]] +name = "opentelemetry_sdk" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0da0d6b47a3dbc6e9c9e36a0520e25cf943e046843818faaa3f87365a548c82" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.25.0", + "percent-encoding", + "rand", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -4499,20 +4508,21 @@ 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", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -4527,9 +4537,9 @@ dependencies = [ [[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", @@ -4797,7 +4807,7 @@ dependencies = [ "js-sys", "once_cell", "opentelemetry 0.23.0", - "opentelemetry_sdk", + "opentelemetry_sdk 0.23.0", "smallvec", "tracing", "tracing-core", diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 76d4ad6b1..6dbf0307d 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -74,7 +74,7 @@ tracing = { version = "0.1" } tracing-opentelemetry = { optional = true, version = "0.24" } tracing-subscriber = { optional = true, version = "0.3" } opentelemetry-otlp = { optional = true, version = "0.16" } -opentelemetry_sdk = { optional = true, version = "0.23", features = ["rt-tokio"] } +opentelemetry_sdk = { optional = true, version = "0.25", features = ["rt-tokio"] } # internal deps freenet-stdlib = { features = ["net"], workspace = true }