diff --git a/Cargo.lock b/Cargo.lock index 4950e416c2e5f..74aa0649f0ef8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1162,9 +1162,9 @@ dependencies = [ [[package]] name = "axum" -version = "0.6.7" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fb79c228270dcf2426e74864cabc94babb5dbab01a4314e702d2f16540e1591" +checksum = "349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491" dependencies = [ "async-trait", "axum-core", @@ -1185,16 +1185,15 @@ dependencies = [ "sync_wrapper", "tokio", "tower", - "tower-http 0.3.5", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34" +checksum = "b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e" dependencies = [ "async-trait", "bytes 1.4.0", @@ -2106,7 +2105,7 @@ checksum = "e57ff02e8ad8e06ab9731d5dc72dc23bef9200778eae1a89d555d8c42e5d4a86" dependencies = [ "prost", "prost-types", - "tonic", + "tonic 0.8.3", "tracing-core 0.1.30", ] @@ -2128,7 +2127,7 @@ dependencies = [ "thread_local", "tokio", "tokio-stream", - "tonic", + "tonic 0.8.3", "tracing 0.1.37", "tracing-core 0.1.30", "tracing-subscriber", @@ -3993,7 +3992,7 @@ dependencies = [ "rustls 0.20.7", "rustls-native-certs 0.6.2", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", ] [[package]] @@ -4268,9 +4267,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jni" @@ -5088,7 +5087,7 @@ dependencies = [ "take_mut", "thiserror", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", "tokio-util", "trust-dns-proto 0.21.2", "trust-dns-resolver", @@ -5687,7 +5686,7 @@ dependencies = [ "ordered-float 3.6.0", "prost", "prost-build", - "tonic", + "tonic 0.9.1", "tonic-build", "value", "vector-core", @@ -6934,7 +6933,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.23.4", "tokio-util", "tower-service", "url", @@ -7212,6 +7211,18 @@ dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "rustls" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07180898a28ed6a7f7ba2311594308f595e3dd2e3c3812fa0a80a47b45f17e5d" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct 0.7.0", +] + [[package]] name = "rustls-native-certs" version = "0.5.0" @@ -7254,6 +7265,16 @@ dependencies = [ "base64 0.13.1", ] +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.9" @@ -8510,6 +8531,16 @@ dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "tokio-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +dependencies = [ + "rustls 0.21.0", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.12" @@ -8617,7 +8648,6 @@ dependencies = [ "axum", "base64 0.13.1", "bytes 1.4.0", - "flate2", "futures-core", "futures-util", "h2", @@ -8629,10 +8659,7 @@ dependencies = [ "pin-project", "prost", "prost-derive", - "rustls-native-certs 0.6.2", - "rustls-pemfile 1.0.1", "tokio", - "tokio-rustls", "tokio-stream", "tokio-util", "tower", @@ -8642,6 +8669,39 @@ dependencies = [ "tracing-futures 0.2.5", ] +[[package]] +name = "tonic" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bd8e87955eb13c1986671838177d6792cdc52af9bffced0d2c8a9a7f741ab3" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.0", + "bytes 1.4.0", + "flate2", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "rustls-native-certs 0.6.2", + "rustls-pemfile 1.0.1", + "tokio", + "tokio-rustls 0.24.0", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing 0.1.37", +] + [[package]] name = "tonic-build" version = "0.8.4" @@ -8690,7 +8750,6 @@ dependencies = [ "http-body", "http-range-header", "pin-project-lite", - "tower", "tower-layer", "tower-service", "tracing 0.1.37", @@ -9465,7 +9524,7 @@ dependencies = [ "tokio-tungstenite", "tokio-util", "toml 0.7.3", - "tonic", + "tonic 0.9.1", "tonic-build", "tower", "tower-http 0.4.0", @@ -9715,7 +9774,7 @@ dependencies = [ "tokio-test", "tokio-util", "toml 0.7.3", - "tonic", + "tonic 0.9.1", "tower", "tracing 0.1.37", "tracing-core 0.1.30", diff --git a/Cargo.toml b/Cargo.toml index 64db5b37bf773..5931782b3abfa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -311,7 +311,7 @@ tikv-jemallocator = { version = "0.5.0", default-features = false, optional = tr tokio-postgres = { version = "0.7.7", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true } tokio-tungstenite = {version = "0.18.0", default-features = false, features = ["connect"], optional = true} toml = { version = "0.7.3", default-features = false, features = ["parse", "display"] } -tonic = { version = "0.8", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] } +tonic = { version = "0.9", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] } trust-dns-proto = { version = "0.22.0", default-features = false, features = ["dnssec"], optional = true } typetag = { version = "0.2.7", default-features = false } url = { version = "2.3.1", default-features = false, features = ["serde"] } diff --git a/lib/opentelemetry-proto/Cargo.toml b/lib/opentelemetry-proto/Cargo.toml index 84e0ef2499c9b..40221e0ac1881 100644 --- a/lib/opentelemetry-proto/Cargo.toml +++ b/lib/opentelemetry-proto/Cargo.toml @@ -16,6 +16,6 @@ hex = { version = "0.4.3", default-features = false, features = ["std"] } lookup = { package = "vector-lookup", path = "../vector-lookup", default-features = false } ordered-float = { version = "3.6.0", default-features = false } prost = { version = "0.11", default-features = false, features = ["std"] } -tonic = { version = "0.8", default-features = false, features = ["codegen", "gzip", "prost", "tls", "tls-roots", "transport"] } +tonic = { version = "0.9", default-features = false, features = ["codegen", "gzip", "prost", "tls", "tls-roots", "transport"] } value = { package = "value", git = "https://github.com/vectordotdev/vrl", rev = "v0.2.0" } vector-core = { path = "../vector-core", default-features = false } diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index 586e341868be1..6303c9c92d94b 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -51,7 +51,7 @@ tokio-openssl = { version = "0.6.3", default-features = false } tokio-stream = { version = "0.1", default-features = false, features = ["time"], optional = true } tokio-util = { version = "0.7.0", default-features = false, features = ["time"] } toml = { version = "0.7.3", default-features = false } -tonic = { version = "0.8", default-features = false, features = ["transport"] } +tonic = { version = "0.9", default-features = false, features = ["transport"] } tower = { version = "0.4", default-features = false, features = ["util"] } tracing = { version = "0.1.34", default-features = false } tracing-core = { version = "0.1.26", default-features = false }