diff --git a/Cargo.lock b/Cargo.lock index 197c454dcd..d6f72e9459 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -951,6 +951,53 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +dependencies = [ + "async-trait", + "axum-core", + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "itoa 1.0.11", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite 0.2.14", + "rustversion", + "serde", + "sync_wrapper 1.0.1", + "tower", + "tower-layer", + "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 0.2.14", + "rustversion", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "azure_core" version = "0.20.0" @@ -2768,9 +2815,9 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65e3984a414cce451bd6fa931298c2b384924ddc1b6201adec3b0c0c148dabfa" dependencies = [ - "prost", + "prost 0.9.0", "prost-types", - "tonic", + "tonic 0.6.2", ] [[package]] @@ -3285,6 +3332,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 0.2.14", + "tokio", + "tower-service", +] + [[package]] name = "hyper-tls" version = "0.5.0" @@ -3913,6 +3973,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + [[package]] name = "matrixmultiply" version = "0.3.8" @@ -4711,6 +4777,15 @@ dependencies = [ "prost-derive", ] +[[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.9.0" @@ -4724,7 +4799,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prost", + "prost 0.9.0", "prost-types", "regex", "tempfile", @@ -4751,7 +4826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost", + "prost 0.9.0", ] [[package]] @@ -5390,19 +5465,6 @@ dependencies = [ "webpki 0.21.4", ] -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.20.9" @@ -5447,6 +5509,7 @@ version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ + "log", "once_cell", "ring 0.17.8", "rustls-pki-types", @@ -6887,17 +6950,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - [[package]] name = "tokio-rustls" version = "0.23.4" @@ -7039,13 +7091,12 @@ dependencies = [ "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", + "prost 0.9.0", "prost-derive", "tokio", - "tokio-rustls 0.22.0", "tokio-stream", "tokio-util 0.6.10", "tower", @@ -7055,6 +7106,38 @@ dependencies = [ "tracing-futures", ] +[[package]] +name = "tonic" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38659f4a91aba8598d27821589f5db7dddd94601e7a01b1e485a50e5484c7401" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.22.1", + "bytes", + "h2 0.4.4", + "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.1", + "rustls-pemfile 2.1.2", + "socket2 0.5.7", + "tokio", + "tokio-rustls 0.26.0", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tonic-build" version = "0.6.2" @@ -7453,7 +7536,7 @@ dependencies = [ "hyper 0.14.28", "hyper-rustls 0.24.2", "log", - "prost", + "prost 0.9.0", "prost-types", "serde", "simd-json", @@ -7463,7 +7546,7 @@ dependencies = [ "testcontainers 0.18.0", "thiserror", "tokio", - "tonic", + "tonic 0.12.1", "tremor-codec", "tremor-common", "tremor-config", @@ -7507,7 +7590,7 @@ dependencies = [ "test-case", "thiserror", "tokio", - "tonic", + "tonic 0.12.1", "tremor-common", "tremor-config", "tremor-connectors", @@ -7583,8 +7666,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6cfab2469df1b6c86199844e008f549cc6b19ca59ef0b43b68b8a62f21d63b" dependencies = [ "async-channel 1.9.0", - "prost", - "tonic", + "prost 0.9.0", + "tonic 0.6.2", "tonic-build", ] diff --git a/tremor-connectors-gcp/Cargo.toml b/tremor-connectors-gcp/Cargo.toml index 340243bdde..3985adf743 100644 --- a/tremor-connectors-gcp/Cargo.toml +++ b/tremor-connectors-gcp/Cargo.toml @@ -36,7 +36,7 @@ gouth = { version = "0.2", default-features = true } prost = { version = "0.9.0", default-features = true } prost-types = { version = "0.9.0", default-features = true } tokio = { version = "1.38", default-features = true } -tonic = { version = "0.6.1", default-features = true, features = [ +tonic = { version = "0.12.1", default-features = true, features = [ "transport", "tls", ] } diff --git a/tremor-connectors-otel/Cargo.toml b/tremor-connectors-otel/Cargo.toml index 7a7db796bf..a18673c5d7 100644 --- a/tremor-connectors-otel/Cargo.toml +++ b/tremor-connectors-otel/Cargo.toml @@ -29,7 +29,7 @@ tokio = { version = "1.38", default-features = false } simd-json = { version = "0.13", default-features = true } # opentelemetry -tonic = { version = "0.6.1", default-features = false, features = [ +tonic = { version = "0.12.1", default-features = false, features = [ "transport", "tls", ] }