diff --git a/Cargo.lock b/Cargo.lock index 3daea4f8fdc..b0679c60caf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -306,7 +306,7 @@ dependencies = [ "futures", "futures-locks", "libflate", - "prost-build", + "prost-build 0.12.6", "protobuf 3.4.0", "protobuf-codegen", "protox 0.6.1", @@ -563,7 +563,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", @@ -584,6 +584,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.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", +] + [[package]] name = "axum-core" version = "0.3.4" @@ -601,6 +628,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.73" @@ -2067,6 +2114,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.4.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.4.1" @@ -2369,7 +2435,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2392,9 +2458,11 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.0", "httparse", + "httpdate", "itoa", "pin-project-lite", "smallvec", @@ -2463,6 +2531,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.7" @@ -4003,6 +4084,27 @@ dependencies = [ "tempfile", ] +[[package]] +name = "prost-build" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1" +dependencies = [ + "bytes", + "heck", + "itertools 0.11.0", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease", + "prost 0.13.1", + "prost-types 0.13.1", + "regex", + "syn 2.0.76", + "tempfile", +] + [[package]] name = "prost-derive" version = "0.12.6" @@ -4516,7 +4618,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.30", @@ -5556,7 +5658,7 @@ dependencies = [ "thiserror", "tokio", "tokio-test", - "tonic 0.11.0", + "tonic 0.12.1", "tonic-types", "tracing", "tracing-opentelemetry", @@ -5720,8 +5822,8 @@ dependencies = [ "tailcall-fixtures", "thiserror", "tokio", - "tonic 0.11.0", - "tonic-build 0.11.0", + "tonic 0.12.1", + "tonic-build 0.12.2", "tonic-reflection", "tonic-tracing-opentelemetry", "tower", @@ -6078,14 +6180,14 @@ checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.6.20", "base64 0.21.7", "bytes", - "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.12.6", @@ -6107,14 +6209,25 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" dependencies = [ + "async-stream", + "async-trait", + "axum 0.7.5", "base64 0.22.1", "bytes", + "h2 0.4.6", "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", @@ -6128,35 +6241,35 @@ checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2", - "prost-build", + "prost-build 0.12.6", "quote", "syn 2.0.76", ] [[package]] name = "tonic-build" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2" +checksum = "fe4ee8877250136bd7e3d2331632810a4df4ea5e004656990d8d66d2f5ee8a67" dependencies = [ "prettyplease", "proc-macro2", - "prost-build", + "prost-build 0.13.1", "quote", "syn 2.0.76", ] [[package]] name = "tonic-reflection" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548c227bd5c0fae5925812c4ec6c66ffcfced23ea370cb823f4d18f0fc1cb6a7" +checksum = "7b56b874eedb04f89907573b408eab1e87c1c1dce43aac6ad63742f57faa99ff" dependencies = [ - "prost 0.12.6", - "prost-types 0.12.6", + "prost 0.13.1", + "prost-types 0.13.1", "tokio", "tokio-stream", - "tonic 0.11.0", + "tonic 0.12.1", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b387d921acb..03d554a741a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -119,7 +119,7 @@ tracing-subscriber = { version = "0.3.18", features = [ tracing-opentelemetry = "0.24.0" getrandom = { version = "0.2.14", features = ["js"] } prometheus = "0.13.4" -tonic = { version = "0.11.0", default-features = false } +tonic = { version = "0.12.0", default-features = false } opentelemetry-semantic-conventions = "0.15.0" opentelemetry = { version = "0.23.0", features = ["trace", "logs", "metrics"] } opentelemetry_sdk = { version = "0.23.0", features = [ diff --git a/tailcall-upstream-grpc/Cargo.toml b/tailcall-upstream-grpc/Cargo.toml index 8bab51007b3..ea142405e53 100644 --- a/tailcall-upstream-grpc/Cargo.toml +++ b/tailcall-upstream-grpc/Cargo.toml @@ -9,8 +9,8 @@ publish = false [dependencies] hyper = { version = "0.14.28", features = ["full"] } tokio = { version = "1.37.0", features = ["full"] } -tonic = "0.11.0" -tonic-reflection = "0.11.0" +tonic = "0.12.0" +tonic-reflection = "0.12.0" prost = "0.12.4" prost-types = "0.12.4" tower = "0.4.13" @@ -35,5 +35,5 @@ thiserror = { workspace = true } [build-dependencies] protoc-bin-vendored = "3.0.0" -tonic-build = "0.11.0" +tonic-build = "0.12.0" tailcall-fixtures = { path = "../tailcall-fixtures" }