diff --git a/Cargo.lock b/Cargo.lock index 8f3af784ee4..8dfbd95a3d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -351,6 +351,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "attohttpc" version = "0.24.1" @@ -677,7 +683,7 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "http-body 1.0.0", @@ -2365,8 +2371,8 @@ dependencies = [ "hyper 1.4.1", "include_dir", "mime", - "opentelemetry 0.23.0", - "opentelemetry_sdk 0.23.0", + "opentelemetry 0.25.0", + "opentelemetry_sdk 0.25.0", "sentry", "serde", "serde_json", @@ -2375,7 +2381,7 @@ dependencies = [ "time", "tower-http", "tracing", - "tracing-opentelemetry 0.24.0", + "tracing-opentelemetry 0.26.0", "type-system", "utoipa", "uuid", @@ -2471,6 +2477,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.2.1" @@ -2607,9 +2632,9 @@ dependencies = [ "clap", "clap_builder", "error-stack 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "opentelemetry 0.23.0", + "opentelemetry 0.25.0", "opentelemetry-otlp", - "opentelemetry_sdk 0.23.0", + "opentelemetry_sdk 0.25.0", "sentry", "sentry-types", "tokio", @@ -2617,7 +2642,7 @@ dependencies = [ "tracing-appender", "tracing-core", "tracing-error", - "tracing-opentelemetry 0.24.0", + "tracing-opentelemetry 0.26.0", "tracing-subscriber", ] @@ -2921,7 +2946,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2944,6 +2969,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -3001,6 +3027,19 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-timeout" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" +dependencies = [ + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.6" @@ -4343,9 +4382,9 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76" +checksum = "803801d3d3b71cd026851a53f974ea03df3d179cb758b260136a6c9e22e196af" dependencies = [ "futures-core", "futures-sink", @@ -4357,32 +4396,32 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.16.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94c69209c05319cdf7460c6d4c055ed102be242a0a6245835d7bc42c6ec7f54" +checksum = "596b1719b3cab83addb20bcbffdf21575279d9436d9ccccfe651a3bf0ab5ab06" dependencies = [ "async-trait", "futures-core", - "http 0.2.12", - "opentelemetry 0.23.0", + "http 1.1.0", + "opentelemetry 0.25.0", "opentelemetry-proto", - "opentelemetry_sdk 0.23.0", - "prost 0.12.3", + "opentelemetry_sdk 0.25.0", + "prost 0.13.2", "thiserror", "tokio", - "tonic 0.11.0", + "tonic 0.12.2", ] [[package]] name = "opentelemetry-proto" -version = "0.6.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "984806e6cf27f2b49282e2a05e288f30594f3dbc74eb7a6e99422bc48ed78162" +checksum = "2c43620e8f93359eb7e627a3b16ee92d8585774986f24f2ab010817426c5ce61" dependencies = [ - "opentelemetry 0.23.0", - "opentelemetry_sdk 0.23.0", - "prost 0.12.3", - "tonic 0.11.0", + "opentelemetry 0.25.0", + "opentelemetry_sdk 0.25.0", + "prost 0.13.2", + "tonic 0.12.2", ] [[package]] @@ -4420,18 +4459,16 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" -version = "0.23.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd" +checksum = "e0da0d6b47a3dbc6e9c9e36a0520e25cf943e046843818faaa3f87365a548c82" dependencies = [ "async-trait", "futures-channel", "futures-executor", "futures-util", - "lazy_static", "once_cell", - "opentelemetry 0.23.0", - "ordered-float", + "opentelemetry 0.25.0", "percent-encoding", "rand", "thiserror", @@ -4439,15 +4476,6 @@ dependencies = [ "tokio-stream", ] -[[package]] -name = "ordered-float" -version = "4.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be" -dependencies = [ - "num-traits", -] - [[package]] name = "orx-concurrent-ordered-bag" version = "2.2.0" @@ -4910,12 +4938,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995" dependencies = [ "bytes", - "prost-derive 0.12.3", + "prost-derive 0.13.2", ] [[package]] @@ -4955,12 +4983,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.13.0", "proc-macro2", "quote", "syn 2.0.71", @@ -6833,11 +6861,11 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.30", - "hyper-timeout", + "hyper-timeout 0.4.1", "percent-encoding", "pin-project", "prost 0.11.9", @@ -6854,23 +6882,26 @@ dependencies = [ [[package]] name = "tonic" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad" dependencies = [ "async-stream", "async-trait", - "axum 0.6.20", - "base64 0.21.7", + "axum 0.7.5", + "base64 0.22.1", "bytes", - "h2", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-timeout", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.4.1", + "hyper-timeout 0.5.1", + "hyper-util", "percent-encoding", "pin-project", - "prost 0.12.3", + "prost 0.13.2", + "socket2", "tokio", "tokio-stream", "tower 0.4.13", @@ -7061,14 +7092,14 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4" +checksum = "5eabc56d23707ad55ba2a0750fc24767125d5a0f51993ba41ad2c441cc7b8dea" dependencies = [ "js-sys", "once_cell", - "opentelemetry 0.23.0", - "opentelemetry_sdk 0.23.0", + "opentelemetry 0.25.0", + "opentelemetry_sdk 0.25.0", "tracing", "tracing-core", "tracing-subscriber", diff --git a/Cargo.toml b/Cargo.toml index 6483ba159a2..718d5ea814e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -164,9 +164,9 @@ mimalloc = { version = "0.1.43", default-features = false } mime = { version = "0.3.17", default-features = false } num-traits = { version = "0.2.19", default-features = false } once_cell = { version = "1.19.0", default-features = false } -opentelemetry = { version = "0.23.0", default-features = false } -opentelemetry-otlp = { version = "0.16.0", default-features = false } -opentelemetry_sdk = { version = "0.23.0", default-features = false } +opentelemetry = { version = "0.25.0", default-features = false } +opentelemetry-otlp = { version = "0.25.0", default-features = false } +opentelemetry_sdk = { version = "0.25.0", default-features = false } orx-concurrent-vec = { version = "2.2.0", default-features = false } owo-colors = { version = "4.0.0", default-features = false } paste = { version = "1.0.15", default-features = false } @@ -206,7 +206,7 @@ tower-test = { version = "0.4.0", default-features = false } tracing = { version = "0.1.40", default-features = false } tracing-error = { version = "0.2.0", default-features = false } tracing-flame = { version = "0.2.0", default-features = false } -tracing-opentelemetry = { version = "0.24.0", default-features = false } +tracing-opentelemetry = { version = "0.26.0", default-features = false } trybuild = { version = "1.0.97", default-features = false } tsify = { version = "0.4.5", default-features = false } unicode-ident = { version = "1.0.12", default-features = false }