Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update prost-* crates and tonic-* crates #21456

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
198 changes: 149 additions & 49 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -147,18 +147,18 @@ metrics-util = { version = "0.18.0", default-features = false, features = ["regi
pin-project = { version = "1.1.7", default-features = false }
proptest = { version = "1.5" }
proptest-derive = { version = "0.5.0" }
prost = { version = "0.12", default-features = false, features = ["std"] }
prost-build = { version = "0.12", default-features = false }
prost = { version = "0.13.3", default-features = false, features = ["std"] }
prost-build = { version = "0.13.3", default-features = false }
prost-reflect = { version = "0.14", features = ["serde"], default-features = false }
prost-types = { version = "0.12", default-features = false }
prost-types = { version = "0.13.3", default-features = false }
rand = { version = "0.8.5", default-features = false, features = ["small_rng"] }
serde_json = { version = "1.0.133", default-features = false, features = ["raw_value", "std"] }
serde = { version = "1.0.215", default-features = false, features = ["alloc", "derive", "rc"] }
snafu = { version = "0.7.5", default-features = false, features = ["futures", "std"] }
tokio = { version = "1.41.1", default-features = false, features = ["full"] }
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"] }
tonic = { version = "0.12.3", default-features = false, features = ["transport", "codegen", "prost", "tls", "tls-roots", "gzip"] }
tonic-build = { version = "0.12.3", default-features = false, features = ["transport", "prost"] }
uuid = { version = "1.11.0", features = ["v4", "v7", "serde"] }
vector-lib = { path = "lib/vector-lib", default-features = false, features = ["vrl"] }
vector-config = { path = "lib/vector-config" }
Expand All @@ -180,7 +180,7 @@ dnsmsg-parser = { path = "lib/dnsmsg-parser", optional = true }
fakedata = { path = "lib/fakedata", optional = true }
portpicker = { path = "lib/portpicker" }
tracing-limit = { path = "lib/tracing-limit" }
vector-common = { path = "lib/vector-common", default-features = false}
vector-common = { path = "lib/vector-common", default-features = false }
vector-lib.workspace = true
vector-config.workspace = true
vector-config-common.workspace = true
Expand Down Expand Up @@ -318,7 +318,7 @@ hash_hasher = { version = "2.0.0", default-features = false }
hashbrown = { version = "0.14.5", default-features = false, optional = true, features = ["ahash"] }
headers = { version = "0.3.9", default-features = false }
hostname = { version = "0.4.0", default-features = false }
http = { version = "0.2.9", default-features = false }
http = { version = "1.1.0", default-features = false }
http-serde = "1.1.3"
http-body = { version = "0.4.5", default-features = false }
hyper = { version = "0.14.28", default-features = false, features = ["client", "runtime", "http1", "http2", "server", "stream"] }
Expand Down Expand Up @@ -807,7 +807,7 @@ all-integration-tests = [
"appsignal-integration-tests",
"aws-integration-tests",
"axiom-integration-tests",
"azure-integration-tests",
"azintegration-tests",
"chronicle-integration-tests",
"clickhouse-integration-tests",
"databend-integration-tests",
Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ fn main() {

tonic_build::configure()
.protoc_arg("--experimental_allow_proto3_optional")
.compile_with_config(
.compile_protos_with_config(
prost_build,
&[
"lib/vector-core/proto/event.proto",
Expand Down
2 changes: 1 addition & 1 deletion lib/opentelemetry-proto/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ fn main() -> Result<(), Error> {
tonic_build::configure()
.build_client(true)
.build_server(true)
.compile(
.compile_protos(
&[
"src/proto/opentelemetry-proto/opentelemetry/proto/common/v1/common.proto",
"src/proto/opentelemetry-proto/opentelemetry/proto/resource/v1/resource.proto",
Expand Down
2 changes: 1 addition & 1 deletion src/sinks/vector/service.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::task::{Context, Poll};

use futures::{future::BoxFuture, TryFutureExt};
use futures::future::BoxFuture;
use http::Uri;
use hyper::client::HttpConnector;
use hyper_openssl::HttpsConnector;
Expand Down
2 changes: 1 addition & 1 deletion src/sources/opentelemetry/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use vector_lib::opentelemetry::convert::{
SEVERITY_NUMBER_KEY, SEVERITY_TEXT_KEY, SPAN_ID_KEY, TRACE_ID_KEY,
};

use tonic::transport::server::RoutesBuilder;
use tonic::service::RoutesBuilder;
use vector_lib::configurable::configurable_component;
use vector_lib::internal_event::{BytesReceived, EventsReceived, Protocol};
use vector_lib::opentelemetry::proto::collector::{
Expand Down
2 changes: 1 addition & 1 deletion src/sources/util/grpc/decompression.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ where
// Drive the core decompression loop, reading chunks from the underlying body, decompressing them if needed,
// and eventually handling trailers at the end, if they're present.
result = &mut body_decompression, if !body_eof => match result {
Err(e) => break Ok(e.to_http()),
Err(e) => break Ok(e.into_http()),
Ok(bytes_received) => {
body_bytes_received = bytes_received;
body_eof = true;
Expand Down
2 changes: 1 addition & 1 deletion src/sources/util/grpc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use futures::FutureExt;
use http::{Request, Response};
use hyper::Body;
use std::{convert::Infallible, net::SocketAddr, time::Duration};
use tonic::transport::server::Routes;
use tonic::service::Routes;
use tonic::{body::BoxBody, server::NamedService, transport::server::Server};
use tower::Service;
use tower_http::{
Expand Down
Loading