diff --git a/Cargo.lock b/Cargo.lock index 58687b907..f4fbe0a77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -675,7 +675,7 @@ dependencies = [ "madsim-tonic-build", "mockall", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", "parking_lot", "priority-queue", "prost", @@ -918,7 +918,7 @@ dependencies = [ "bytes", "clippy-utilities", "madsim-tokio", - "opentelemetry", + "opentelemetry 0.24.0", "parking_lot", "rocksdb", "serde", @@ -1872,6 +1872,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "opentelemetry" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "570074cc999d1a58184080966e5bd3bf3a9a4af650c3b05047c2621e7405cd17" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + [[package]] name = "opentelemetry-contrib" version = "0.16.0" @@ -1882,9 +1896,9 @@ dependencies = [ "futures-core", "futures-util", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-semantic-conventions", - "opentelemetry_sdk", + "opentelemetry_sdk 0.24.1", "serde_json", "tokio", ] @@ -1898,7 +1912,7 @@ dependencies = [ "async-trait", "bytes", "http", - "opentelemetry", + "opentelemetry 0.24.0", "reqwest", ] @@ -1908,7 +1922,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc0a68a13b92fc708d875ad659b08b35d08b8ef2403e01944b39ca21e5b08b17" dependencies = [ - "opentelemetry", + "opentelemetry 0.24.0", ] [[package]] @@ -1920,10 +1934,10 @@ dependencies = [ "async-trait", "futures-core", "http", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-http", "opentelemetry-proto", - "opentelemetry_sdk", + "opentelemetry_sdk 0.24.1", "prost", "reqwest", "thiserror", @@ -1938,8 +1952,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc4191ce34aa274621861a7a9d68dbcf618d5b6c66b10081631b61fd81fbc015" dependencies = [ "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", "prometheus", "protobuf", ] @@ -1950,8 +1964,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30ee9f20bff9c984511a02f082dc8ede839e4a9bf15cc2487c8d6fea5ad850d9" dependencies = [ - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", "prost", "tonic", ] @@ -1974,7 +1988,28 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.24.0", + "percent-encoding", + "rand", + "serde_json", + "thiserror", + "tokio", + "tokio-stream 0.1.16", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c627d9f4c9cdc1f21a29ee4bfbd6028fcb8bcf2a857b43f3abdf72c9c862f3" +dependencies = [ + "async-trait", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", + "opentelemetry 0.26.0", "percent-encoding", "rand", "serde_json", @@ -3199,8 +3234,8 @@ checksum = "a9784ed4da7d921bc8df6963f8c80a0e4ce34ba6ba76668acadd3edbd985ff3b" dependencies = [ "js-sys", "once_cell", - "opentelemetry", - "opentelemetry_sdk", + "opentelemetry 0.24.0", + "opentelemetry_sdk 0.24.1", "smallvec", "tracing", "tracing-core", @@ -3324,10 +3359,10 @@ dependencies = [ "getset", "madsim-tokio", "madsim-tonic", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-jaeger-propagator", "opentelemetry-otlp", - "opentelemetry_sdk", + "opentelemetry_sdk 0.26.0", "parking_lot", "pbkdf2", "rb-interval-map", @@ -3654,7 +3689,7 @@ dependencies = [ "madsim-tokio", "madsim-tonic", "memchr", - "opentelemetry_sdk", + "opentelemetry_sdk 0.26.0", "predicates", "rand", "serde", @@ -3726,11 +3761,11 @@ dependencies = [ "merged_range", "mockall", "nix", - "opentelemetry", + "opentelemetry 0.24.0", "opentelemetry-contrib", "opentelemetry-otlp", "opentelemetry-prometheus", - "opentelemetry_sdk", + "opentelemetry_sdk 0.26.0", "parking_lot", "pbkdf2", "priority-queue", diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 809bc8a27..16a43dc62 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -27,7 +27,7 @@ futures = "0.3.30" getset = "0.1" interval_map = { version = "0.1", package = "rb-interval-map" } opentelemetry = { version = "0.24.0", features = ["trace"] } -opentelemetry_sdk = { version = "0.24.1", features = ["trace"] } +opentelemetry_sdk = { version = "0.26.0", features = ["trace"] } parking_lot = { version = "0.12.3", optional = true } pbkdf2 = { version = "0.12.2", features = ["simple"] } regex = "1.10.5" diff --git a/crates/xline/Cargo.toml b/crates/xline/Cargo.toml index 83d15d899..bc80fcee9 100644 --- a/crates/xline/Cargo.toml +++ b/crates/xline/Cargo.toml @@ -46,7 +46,7 @@ opentelemetry-otlp = { version = "0.17.0", features = [ "reqwest-client", ] } opentelemetry-prometheus = { version = "0.17.0" } -opentelemetry_sdk = { version = "0.24.1", features = ["metrics", "rt-tokio"] } +opentelemetry_sdk = { version = "0.26.0", features = ["metrics", "rt-tokio"] } parking_lot = "0.12.3" pbkdf2 = { version = "0.12.2", features = ["simple"] } priority-queue = "2.0.2" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 54f15db06..e38ca479f 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -29,7 +29,7 @@ log = { version = "0.4", default-features = false, features = ["std"] } madsim-tokio = { git = "https://github.com/LucienY01/madsim.git", branch = "bz/tonic-0-12", default-features = false, features = ["fs", "io-util", "macros", "net", "rt", "rt-multi-thread", "signal", "sync", "time"] } madsim-tonic = { git = "https://github.com/LucienY01/madsim.git", branch = "bz/tonic-0-12", default-features = false, features = ["tls"] } memchr = { version = "2" } -opentelemetry_sdk = { version = "0.24", features = ["rt-tokio"] } +opentelemetry_sdk = { version = "0.26", features = ["rt-tokio"] } predicates = { version = "3", default-features = false, features = ["diff"] } rand = { version = "0.8", features = ["small_rng"] } serde = { version = "1", features = ["derive", "rc"] }