From 6e3c167f5f1f8dbfa220f6ec7f15d9a03f41bd86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 16:36:36 +0000 Subject: [PATCH] Bump tonic from 0.9.2 to 0.12.0 Bumps [tonic](https://github.com/hyperium/tonic) from 0.9.2 to 0.12.0. - [Release notes](https://github.com/hyperium/tonic/releases) - [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/tonic/compare/v0.9.2...v0.12.0) --- updated-dependencies: - dependency-name: tonic dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 160 +++++++++++++++++++++++++++++--- integration/ducks/Cargo.toml | 2 +- integration/sheepdog/Cargo.toml | 2 +- lading/Cargo.toml | 2 +- 4 files changed, 149 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf899ef2e0..bfd6f95344 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -152,6 +152,12 @@ dependencies = [ "syn 2.0.60", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.3.0" @@ -175,7 +181,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", @@ -190,7 +196,34 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "sync_wrapper", + "sync_wrapper 0.1.2", + "tower", + "tower-layer", + "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.3", + "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", @@ -213,6 +246,26 @@ dependencies = [ "tower-service", ] +[[package]] +name = "axum-core" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +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 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.71" @@ -685,7 +738,7 @@ dependencies = [ "sketches-ddsketch", "tokio", "tokio-stream", - "tonic 0.9.2", + "tonic 0.12.0", "tower", "tracing", "tracing-subscriber", @@ -954,6 +1007,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +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.4.1" @@ -1130,7 +1202,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -1153,9 +1225,11 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "httparse", + "httpdate", "itoa", "pin-project-lite", "smallvec", @@ -1190,6 +1264,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.0", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.6" @@ -1409,7 +1496,7 @@ dependencies = [ "thiserror", "tokio", "tokio-util", - "tonic 0.9.2", + "tonic 0.12.0", "tower", "tracing", "tracing-subscriber", @@ -2102,6 +2189,15 @@ dependencies = [ "prost-derive 0.12.4", ] +[[package]] +name = "prost" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" +dependencies = [ + "bytes", +] + [[package]] name = "prost-build" version = "0.11.9" @@ -2362,7 +2458,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", @@ -2376,7 +2472,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tower-service", @@ -2664,7 +2760,7 @@ dependencies = [ "shared", "tempfile", "tokio", - "tonic 0.9.2", + "tonic 0.12.0", "tower", "tracing", "tracing-subscriber", @@ -2760,6 +2856,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "system-configuration" version = "0.5.1" @@ -2968,16 +3070,16 @@ checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.13.1", "bytes", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", - "hyper-timeout", + "hyper-timeout 0.4.1", "percent-encoding", "pin-project", "prost 0.11.9", @@ -2999,16 +3101,16 @@ 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", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", - "hyper-timeout", + "hyper-timeout 0.4.1", "percent-encoding", "pin-project", "prost 0.11.9", @@ -3020,6 +3122,36 @@ dependencies = [ "tracing", ] +[[package]] +name = "tonic" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f738b6a169a29bca4e39656db89c44a08e09c5b700b896ee9e7459f0652e81dd" +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.0", + "hyper-timeout 0.5.1", + "hyper-util", + "percent-encoding", + "pin-project", + "prost 0.13.1", + "socket2 0.5.7", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tonic-build" version = "0.8.4" diff --git a/integration/ducks/Cargo.toml b/integration/ducks/Cargo.toml index 1e127a1aec..e78fa08d8c 100644 --- a/integration/ducks/Cargo.toml +++ b/integration/ducks/Cargo.toml @@ -18,7 +18,7 @@ shared = { path = "../shared" } sketches-ddsketch = "0.2" tokio = { version = "1.32", features = ["rt", "macros", "fs", "io-util", "process", "signal", "time", "net"] } tokio-stream = { version = "0.1", features = ["net"] } -tonic = { version = "0.9", default-features = false, features = ["transport", "prost"] } +tonic = { version = "0.12", default-features = false, features = ["transport", "prost"] } tower = { version = "0.4", default-features = false, features = ["timeout", "limit", "load-shed"] } tracing = { version = "0.1", features = ["std", "attributes"] } tracing-subscriber = { version = "0.3", features = ["std", "env-filter"] } diff --git a/integration/sheepdog/Cargo.toml b/integration/sheepdog/Cargo.toml index 2b08893596..4cd8b14469 100644 --- a/integration/sheepdog/Cargo.toml +++ b/integration/sheepdog/Cargo.toml @@ -14,7 +14,7 @@ serde_json = "1.0" shared = { path = "../shared" } tempfile = "3.8" tokio = { version = "1.32", features = ["rt", "macros", "fs", "io-util", "process", "signal", "time", "net"] } -tonic = { version = "0.9", default-features = false, features = ["transport", "prost"]} +tonic = { version = "0.12", default-features = false, features = ["transport", "prost"]} tower = { version = "0.4", default-features = false, features = ["timeout", "limit", "load-shed"] } tracing = { version = "0.1", features = ["std", "attributes"] } tracing-subscriber = { version = "0.3", features = ["std", "env-filter"] } diff --git a/lading/Cargo.toml b/lading/Cargo.toml index 008d38acc1..480a8110cd 100644 --- a/lading/Cargo.toml +++ b/lading/Cargo.toml @@ -45,7 +45,7 @@ serde_yaml = "0.9" thiserror = { workspace = true } tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "fs", "io-util", "process", "signal", "time", "net"] } 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", "load-shed"] } tracing = { workspace = true } tracing-subscriber = { version = "0.3", features = ["std", "env-filter"] }