Skip to content

Update tonic/prost crates to 0.14.x #1687

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.

Sign up for GitHub

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

Merged
istio-testing merged 1 commit into from
Dec 18, 2025
Merged

Update tonic/prost crates to 0.14.x #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
84 changes: 66 additions & 18 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ num_cpus = "1.16"
ppp = "2.3"
prometheus-client = { version = "0.24" }
prometheus-parse = "0.2"
prost = "0.13"
prost-types = "0.13"
prost = { version = "0.14", default-features = false }
prost-types = { version = "0.14", default-features = false }
rand = { version = "0.9" , features = ["small_rng"]}
rcgen = { version = "0.14", optional = true, features = ["pem"] }
rustls = { version = "0.23", default-features = false }
Expand All @@ -94,7 +94,8 @@ tls-listener = { version = "0.11" }
tokio = { version = "1.44", features = ["full", "test-util"] }
tokio-rustls = { version = "0.26", default-features = false }
tokio-stream = { version = "0.1", features = ["net"] }
tonic = { version = "0.13", default-features = false, features = ["prost", "codegen"] }
tonic = { version = "0.14", default-features = false, features = ["codegen"] }
tonic-prost = { version = "0.14", default-features = false }
tower = { version = "0.5", features = ["full"] }
tracing = { version = "0.1"}
tracing-subscriber = { version = "0.3", features = ["registry", "env-filter", "json"] }
Expand All @@ -119,8 +120,7 @@ netns-rs = "0.1"
pprof = { version = "0.15", features = ["protobuf", "protobuf-codec", "criterion"] }

[build-dependencies]
tonic-build = { version = "0.13", default-features = false, features = ["prost"] }
prost-build = "0.13"
tonic-prost-build = { version = "0.14", default-features = false }
anyhow = "1.0"
rustc_version = "0.4"

Expand Down
6 changes: 3 additions & 3 deletions build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn main() -> Result<(), anyhow::Error> {
.map(|i| std::env::current_dir().unwrap().join(i))
.collect::<Vec<_>>();
let config = {
let mut c = prost_build::Config::new();
let mut c = tonic_prost_build::Config::new();
c.disable_comments(Some("."));
c.bytes([
".istio.workload.Workload",
Expand All @@ -47,9 +47,9 @@ fn main() -> Result<(), anyhow::Error> {
]);
c
};
tonic_build::configure()
tonic_prost_build::configure()
.build_server(true)
.compile_protos_with_config(
.compile_with_config(
config,
&proto_files
.iter()
Expand Down
55 changes: 40 additions & 15 deletions fuzz/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cargo-fuzz = true
[dependencies]
hyper = "1.1"
libfuzzer-sys = "0.4"
prost = "0.13"
prost = { version = "0.14", default-features = false }
anyhow = "1.0"

[dependencies.ztunnel]
Expand Down
6 changes: 3 additions & 3 deletions src/xds/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ struct HandlerWrapper<T: prost::Message> {
h: Box<dyn Handler<T>>,
}

impl<T: 'static + prost::Message + Default> RawHandler for HandlerWrapper<T> {
impl<T: 'static + fmt::Debug + prost::Message + Default> RawHandler for HandlerWrapper<T> {
fn handle(
&self,
state: &mut State,
Expand Down Expand Up @@ -270,7 +270,7 @@ impl Config {

pub fn with_watched_handler<F>(self, type_url: Strng, f: impl Handler<F>) -> Config
where
F: 'static + prost::Message + Default,
F: 'static + fmt::Debug + prost::Message + Default,
{
let no_on_demand = f.no_on_demand();
self.with_handler(type_url.clone(), f)
Expand All @@ -279,7 +279,7 @@ impl Config {

fn with_handler<F>(mut self, type_url: Strng, f: impl Handler<F>) -> Config
where
F: 'static + prost::Message + Default,
F: 'static + fmt::Debug + prost::Message + Default,
{
let h = HandlerWrapper { h: Box::new(f) };
self.handlers.insert(type_url, Box::new(h));
Expand Down