diff --git a/Cargo.lock b/Cargo.lock index 5be054455..d0c2376fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -195,7 +195,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", @@ -211,7 +211,34 @@ dependencies = [ "rustversion", "serde", "sync_wrapper 0.1.2", - "tower", + "tower 0.4.13", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +dependencies = [ + "async-trait", + "axum-core 0.4.5", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower 0.5.1", "tower-layer", "tower-service", ] @@ -233,6 +260,26 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper 1.0.1", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.74" @@ -700,8 +747,8 @@ dependencies = [ "sketches-ddsketch 0.3.0", "tokio", "tokio-stream", - "tonic 0.9.2", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", "tracing-subscriber", ] @@ -1255,11 +1302,24 @@ dependencies = [ "tokio-io-timeout", ] +[[package]] +name = "hyper-timeout" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" +dependencies = [ + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -1467,8 +1527,8 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tonic 0.9.2", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", "tracing-subscriber", "uuid", @@ -1496,7 +1556,7 @@ dependencies = [ "opentelemetry-proto", "proptest", "proptest-derive", - "prost", + "prost 0.11.9", "rand", "rmp-serde", "rustc-hash", @@ -1837,7 +1897,7 @@ dependencies = [ "futures", "futures-util", "opentelemetry", - "prost", + "prost 0.11.9", "tonic 0.8.3", "tonic-build 0.8.4", ] @@ -2150,6 +2210,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" @@ -2164,7 +2233,7 @@ dependencies = [ "multimap", "petgraph", "prettyplease", - "prost", + "prost 0.11.9", "prost-types", "regex", "syn 1.0.109", @@ -2191,7 +2260,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "prost", + "prost 0.11.9", ] [[package]] @@ -2651,7 +2720,7 @@ dependencies = [ name = "shared" version = "0.1.0" dependencies = [ - "prost", + "prost 0.11.9", "serde", "serde_json", "tonic 0.9.2", @@ -2667,8 +2736,8 @@ dependencies = [ "shared", "tempfile", "tokio", - "tonic 0.9.2", - "tower", + "tonic 0.12.3", + "tower 0.4.13", "tracing", "tracing-subscriber", ] @@ -2971,7 +3040,7 @@ checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.13.1", "bytes", "futures-core", @@ -2980,15 +3049,15 @@ 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", "tokio-util", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -3002,7 +3071,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", @@ -3011,13 +3080,43 @@ 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 0.4.13", + "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.9", + "base64 0.22.1", + "bytes", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-timeout 0.5.2", + "hyper-util", + "percent-encoding", + "pin-project", + "prost 0.13.3", + "socket2 0.5.7", + "tokio", + "tokio-stream", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -3069,6 +3168,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" version = "0.3.3" diff --git a/integration/ducks/Cargo.toml b/integration/ducks/Cargo.toml index 0ac552e66..5df7c3b89 100644 --- a/integration/ducks/Cargo.toml +++ b/integration/ducks/Cargo.toml @@ -26,7 +26,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 e3bc67f60..810ccab7b 100644 --- a/integration/sheepdog/Cargo.toml +++ b/integration/sheepdog/Cargo.toml @@ -22,7 +22,7 @@ tokio = { version = "1.41", 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 733826ece..b1bfca497 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -74,7 +74,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",