From e90cecef2598ae267ed6f645356da6f8a494a827 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 14:30:32 -0600 Subject: [PATCH] chore(deps): Bump the tonic group with 2 updates (#19837) * chore(deps): Bump the tonic group with 2 updates Bumps the tonic group with 2 updates: [tonic](https://github.com/hyperium/tonic) and [tonic-build](https://github.com/hyperium/tonic). Updates `tonic` from 0.10.2 to 0.11.0 - [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/tonic/compare/v0.10.2...v0.11.0) Updates `tonic-build` from 0.10.2 to 0.11.0 - [Changelog](https://github.com/hyperium/tonic/blob/master/CHANGELOG.md) - [Commits](https://github.com/hyperium/tonic/compare/v0.10.2...v0.11.0) --- updated-dependencies: - dependency-name: tonic dependency-type: direct:production update-type: version-update:semver-minor dependency-group: tonic - dependency-name: tonic-build dependency-type: direct:production update-type: version-update:semver-minor dependency-group: tonic ... Signed-off-by: dependabot[bot] * Regenerate licenses Signed-off-by: Jesse Szwedko * Fix breaking change Signed-off-by: Jesse Szwedko * Convert `tonic` to a workspace dep * Fix component validation runner --------- Signed-off-by: dependabot[bot] Signed-off-by: Jesse Szwedko Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jesse Szwedko Co-authored-by: Bruce Guenter --- Cargo.lock | 63 ++++---------------------- Cargo.toml | 6 ++- lib/opentelemetry-proto/Cargo.toml | 4 +- lib/vector-core/Cargo.toml | 2 +- src/components/validation/runner/io.rs | 3 +- src/sources/util/grpc/mod.rs | 5 +- 6 files changed, 19 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8799c283adcb1..1bd332540f4a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2297,7 +2297,7 @@ dependencies = [ "futures-core", "prost 0.12.6", "prost-types 0.12.6", - "tonic 0.11.0", + "tonic", "tracing-core 0.1.32", ] @@ -2320,7 +2320,7 @@ dependencies = [ "thread_local", "tokio", "tokio-stream", - "tonic 0.11.0", + "tonic", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -3850,7 +3850,7 @@ dependencies = [ "serde_json", "strum 0.25.0", "strum_macros 0.25.3", - "tonic 0.11.0", + "tonic", "tonic-build 0.11.0", ] @@ -3871,7 +3871,7 @@ dependencies = [ "snafu 0.7.5", "tokio", "tokio-stream", - "tonic 0.11.0", + "tonic", "tonic-build 0.9.2", "tower", ] @@ -6336,8 +6336,8 @@ dependencies = [ "ordered-float 4.2.2", "prost 0.12.6", "prost-build 0.12.6", - "tonic 0.10.2", - "tonic-build 0.10.2", + "tonic", + "tonic-build 0.11.0", "vector-core", "vector-lookup", "vrl", @@ -9631,38 +9631,6 @@ dependencies = [ "winnow 0.6.18", ] -[[package]] -name = "tonic" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.7", - "bytes 1.7.1", - "flate2", - "h2 0.3.26", - "http 0.2.9", - "http-body 0.4.5", - "hyper 0.14.28", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.12.6", - "rustls 0.21.11", - "rustls-native-certs 0.6.3", - "rustls-pemfile 1.0.3", - "tokio", - "tokio-rustls 0.24.1", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing 0.1.40", -] - [[package]] name = "tonic" version = "0.11.0" @@ -9709,19 +9677,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "tonic-build" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" -dependencies = [ - "prettyplease 0.2.15", - "proc-macro2 1.0.86", - "prost-build 0.12.6", - "quote 1.0.37", - "syn 2.0.75", -] - [[package]] name = "tonic-build" version = "0.11.0" @@ -10529,8 +10484,8 @@ dependencies = [ "tokio-tungstenite 0.20.1", "tokio-util", "toml", - "tonic 0.10.2", - "tonic-build 0.10.2", + "tonic", + "tonic-build 0.11.0", "tower", "tower-http", "tower-test", @@ -10772,7 +10727,7 @@ dependencies = [ "tokio-test", "tokio-util", "toml", - "tonic 0.10.2", + "tonic", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", diff --git a/Cargo.toml b/Cargo.toml index e95d6bcde4b47..c6da73a9193a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -142,6 +142,8 @@ proptest-derive = { version = "0.4.0" } serde_json = { version = "1.0.125", default-features = false, features = ["raw_value", "std"] } serde = { version = "1.0.209", default-features = false, features = ["alloc", "derive", "rc"] } toml = { version = "0.8.19", default-features = false, features = ["display", "parse"] } +tonic = { version = "0.11", default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] } +tonic-build = { version = "0.11", default-features = false, features = ["transport", "prost"] } vrl = { version = "0.17.0", features = ["arbitrary", "cli", "test", "test_framework"] } [dependencies] @@ -342,7 +344,7 @@ tikv-jemallocator = { version = "0.6.0", default-features = false, features = [" tokio-postgres = { version = "0.7.11", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true } tokio-tungstenite = {version = "0.20.1", default-features = false, features = ["connect"], optional = true} toml.workspace = true -tonic = { version = "0.10", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] } +tonic = { workspace = true, optional = true } hickory-proto = { version = "0.24.1", default-features = false, features = ["dnssec"], optional = true } typetag = { version = "0.2.18", default-features = false } url = { version = "2.5.2", default-features = false, features = ["serde"] } @@ -366,7 +368,7 @@ nix = { version = "0.26.2", default-features = false, features = ["socket", "sig [build-dependencies] prost-build = { version = "0.12", default-features = false, optional = true } -tonic-build = { version = "0.10", default-features = false, features = ["transport", "prost"], optional = true } +tonic-build = { workspace = true, optional = true } # update 'openssl_version' in website/config.toml whenever version changes openssl-src = { version = "300", default-features = false, features = ["force-engine", "legacy"] } diff --git a/lib/opentelemetry-proto/Cargo.toml b/lib/opentelemetry-proto/Cargo.toml index d18b084879418..02c1b93272d4b 100644 --- a/lib/opentelemetry-proto/Cargo.toml +++ b/lib/opentelemetry-proto/Cargo.toml @@ -7,7 +7,7 @@ publish = false [build-dependencies] prost-build = { version = "0.12", default-features = false} -tonic-build = { version = "0.10", default-features = false, features = ["prost", "transport"] } +tonic-build.workspace = true [dependencies] bytes = { version = "1.7.1", default-features = false, features = ["serde"] } @@ -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 = "4.2.2", default-features = false } prost = { version = "0.12", default-features = false, features = ["std"] } -tonic = { version = "0.10", default-features = false, features = ["codegen", "gzip", "prost", "tls", "tls-roots", "transport"] } +tonic.workspace = true vrl.workspace = true vector-core = { path = "../vector-core", default-features = false } diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml index bf43135381bc2..6ba8986895eb2 100644 --- a/lib/vector-core/Cargo.toml +++ b/lib/vector-core/Cargo.toml @@ -52,7 +52,7 @@ tokio-openssl = { version = "0.6.4", 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.workspace = true -tonic = { version = "0.10", default-features = false, features = ["transport"] } +tonic.workspace = true tracing = { version = "0.1.34", default-features = false } tracing-core = { version = "0.1.26", default-features = false } tracing-subscriber = { version = "0.3.18", default-features = false, features = ["std"] } diff --git a/src/components/validation/runner/io.rs b/src/components/validation/runner/io.rs index 9e4e51e85651d..d9a49943d32d8 100644 --- a/src/components/validation/runner/io.rs +++ b/src/components/validation/runner/io.rs @@ -5,7 +5,8 @@ use hyper::Body; use tokio::{pin, select, sync::mpsc}; use tonic::{ body::BoxBody, - transport::{Channel, Endpoint, NamedService}, + server::NamedService, + transport::{Channel, Endpoint}, Status, }; use tower::Service; diff --git a/src/sources/util/grpc/mod.rs b/src/sources/util/grpc/mod.rs index 1052318538bc6..0c19e9795e37b 100644 --- a/src/sources/util/grpc/mod.rs +++ b/src/sources/util/grpc/mod.rs @@ -8,10 +8,7 @@ use http::{Request, Response}; use hyper::Body; use std::{convert::Infallible, net::SocketAddr, time::Duration}; use tonic::transport::server::Routes; -use tonic::{ - body::BoxBody, - transport::server::{NamedService, Server}, -}; +use tonic::{body::BoxBody, server::NamedService, transport::server::Server}; use tower::Service; use tower_http::{ classify::{GrpcErrorsAsFailures, SharedClassifier},