diff --git a/Cargo.lock b/Cargo.lock index a997c5884..2dbbcba4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.3.4", "bitflags 1.3.2", "bytes", "futures-util", @@ -222,6 +222,33 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core 0.4.4", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-core" version = "0.3.4" @@ -239,6 +266,26 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.1", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.73" @@ -707,7 +754,7 @@ dependencies = [ "sketches-ddsketch 0.3.0", "tokio", "tokio-stream", - "tonic 0.9.2", + "tonic 0.12.3", "tower", "tracing", "tracing-subscriber", @@ -1234,6 +1281,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" @@ -1447,7 +1507,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tonic 0.9.2", + "tonic 0.12.3", "tower", "tracing", "tracing-subscriber", @@ -1477,7 +1537,7 @@ dependencies = [ "opentelemetry-proto", "proptest", "proptest-derive", - "prost", + "prost 0.11.9", "rand", "rmp-serde", "rustc-hash", @@ -1831,7 +1891,7 @@ dependencies = [ "futures", "futures-util", "opentelemetry", - "prost", + "prost 0.11.9", "tonic 0.8.3", "tonic-build 0.8.4", ] @@ -2131,6 +2191,15 @@ dependencies = [ "prost-derive", ] +[[package]] +name = "prost" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0487d90e047de87f984913713b85c601c05609aad5b0df4b4573fbf69aa13f" +dependencies = [ + "bytes", +] + [[package]] name = "prost-build" version = "0.11.9" @@ -2145,7 +2214,7 @@ dependencies = [ "multimap", "petgraph", "prettyplease", - "prost", + "prost 0.11.9", "prost-types", "regex", "syn 1.0.109", @@ -2172,7 +2241,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", ] [[package]] @@ -2632,7 +2701,7 @@ dependencies = [ name = "shared" version = "0.1.0" dependencies = [ - "prost", + "prost 0.11.9", "serde", "serde_json", "tonic 0.9.2", @@ -2649,7 +2718,7 @@ dependencies = [ "shared", "tempfile", "tokio", - "tonic 0.9.2", + "tonic 0.12.3", "tower", "tracing", "tracing-subscriber", @@ -2947,7 +3016,7 @@ checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.13.1", "bytes", "futures-core", @@ -2956,10 +3025,10 @@ dependencies = [ "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", + "prost 0.11.9", "prost-derive", "tokio", "tokio-stream", @@ -2978,7 +3047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.7", "bytes", "futures-core", @@ -2987,10 +3056,40 @@ dependencies = [ "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", + "prost 0.11.9", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" +dependencies = [ + "async-stream", + "async-trait", + "axum 0.7.5", + "base64 0.22.1", + "bytes", + "h2 0.4.5", + "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.13.3", + "socket2 0.5.7", "tokio", "tokio-stream", "tower", diff --git a/integration/ducks/Cargo.toml b/integration/ducks/Cargo.toml index 698535f73..2355af963 100644 --- a/integration/ducks/Cargo.toml +++ b/integration/ducks/Cargo.toml @@ -27,7 +27,7 @@ tokio = { workspace = true, features = [ "net", ] } tokio-stream = { version = "0.1", features = ["net"] } -tonic = { version = "0.9", default-features = false, features = [ +tonic = { version = "0.12", default-features = false, features = [ "transport", "prost", ] } diff --git a/integration/sheepdog/Cargo.toml b/integration/sheepdog/Cargo.toml index fa2938bf7..0732e4832 100644 --- a/integration/sheepdog/Cargo.toml +++ b/integration/sheepdog/Cargo.toml @@ -23,7 +23,7 @@ tokio = { version = "1.40", features = [ "time", "net", ] } -tonic = { version = "0.9", default-features = false, features = [ +tonic = { version = "0.12", default-features = false, features = [ "transport", "prost", ] } diff --git a/lading/Cargo.toml b/lading/Cargo.toml index 6a1a051ef..c20a4805d 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -73,7 +73,7 @@ tokio = { workspace = true, features = [ ] } tokio-stream = { version = "0.1", features = ["io-util"] } tokio-util = { version = "0.7", features = ["io"] } -tonic = { version = "0.9" } +tonic = { version = "0.12" } tower = { version = "0.4", default-features = false, features = [ "timeout", "limit",