From ff44b6ccebf66fa54f0bc56872f69f59a4949d3b Mon Sep 17 00:00:00 2001 From: Ruihang Xia Date: Fri, 20 Oct 2023 11:11:09 +0800 Subject: [PATCH 1/2] chore(deps): bump tonic, tonic-build and prost Signed-off-by: Ruihang Xia --- opentelemetry-proto/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml index bdb2e19506..b1e4371eb2 100644 --- a/opentelemetry-proto/Cargo.toml +++ b/opentelemetry-proto/Cargo.toml @@ -44,14 +44,14 @@ with-serde = ["serde"] [dependencies] grpcio = { version = "0.12", optional = true, features = ["prost-codec"] } -tonic = { version = "0.9.0", default-features = false, optional = true, features = ["codegen", "prost"] } -prost = { version = "0.11.0", optional = true } +tonic = { version = "0.10.0", default-features = false, optional = true, features = ["codegen", "prost"] } +prost = { version = "0.12.0", optional = true } opentelemetry = { version = "0.21", default-features = false, path = "../opentelemetry" } opentelemetry_sdk = { version = "0.20", default-features = false, path = "../opentelemetry-sdk" } serde = { version = "1.0", optional = true, features = ["serde_derive"] } [dev-dependencies] grpcio-compiler = { version = "0.12.1", default-features = false, features = ["prost-codec"] } -tonic-build = { version = "0.9.0" } -prost-build = { version = "0.11.1" } +tonic-build = { version = "0.10.0" } +prost-build = { version = "0.12.1" } tempfile = "3.3.0" From 33841b38dda79b15f2024952be5f32533325ca02 Mon Sep 17 00:00:00 2001 From: Ruihang Xia Date: Fri, 20 Oct 2023 11:19:48 +0800 Subject: [PATCH 2/2] update other toml files as well Signed-off-by: Ruihang Xia --- examples/tracing-grpc/Cargo.toml | 6 +++--- opentelemetry-jaeger/Cargo.toml | 6 +++--- opentelemetry-otlp/Cargo.toml | 4 ++-- opentelemetry-stackdriver/Cargo.toml | 8 ++++---- opentelemetry-user-events-metrics/Cargo.toml | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/tracing-grpc/Cargo.toml b/examples/tracing-grpc/Cargo.toml index 625b793955..6358aae274 100644 --- a/examples/tracing-grpc/Cargo.toml +++ b/examples/tracing-grpc/Cargo.toml @@ -17,13 +17,13 @@ path = "src/client.rs" opentelemetry = { version = "0.20" } opentelemetry_sdk = { version = "0.20", features = ["rt-tokio"] } opentelemetry-jaeger = { version = "0.19", features = ["rt-tokio"] } -prost = "0.11" +prost = "0.12" tokio = { version = "1.28", features = ["full"] } -tonic = "0.9.2" +tonic = "0.10" tracing = "0.1" tracing-futures = "0.2" tracing-opentelemetry = "0.20" tracing-subscriber = { version = "0.3", features = ["env-filter"] } [build-dependencies] -tonic-build = "0.9.2" +tonic-build = "0.10" diff --git a/opentelemetry-jaeger/Cargo.toml b/opentelemetry-jaeger/Cargo.toml index f8a8dab896..1f2de5b9e0 100644 --- a/opentelemetry-jaeger/Cargo.toml +++ b/opentelemetry-jaeger/Cargo.toml @@ -41,9 +41,9 @@ tokio = { version = "1.0", features = ["net", "sync"], optional = true } wasm-bindgen = { version = "0.2", optional = true } wasm-bindgen-futures = { version = "0.4.18", optional = true } -tonic = { version = "0.9.0", optional = true } -prost = { version = "0.11.6", optional = true } -prost-types = { version = "0.11.6", optional = true } +tonic = { version = "0.10", optional = true } +prost = { version = "0.12", optional = true } +prost-types = { version = "0.12", optional = true } # Futures futures-executor = { version = "0.3", default-features = false, features = ["std"], optional = true } diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml index 85785fb901..c3ffeb5faf 100644 --- a/opentelemetry-otlp/Cargo.toml +++ b/opentelemetry-otlp/Cargo.toml @@ -35,8 +35,8 @@ opentelemetry_sdk = { version = "0.20", default-features = false, path = "../ope opentelemetry-http = { version = "0.9", path = "../opentelemetry-http", optional = true } opentelemetry-semantic-conventions = { version = "0.12", path = "../opentelemetry-semantic-conventions" } -prost = { version = "0.11.0", optional = true } -tonic = { version = "0.9.0", optional = true } +prost = { version = "0.12", optional = true } +tonic = { version = "0.10", optional = true } tokio = { version = "1.0", features = ["sync", "rt"], optional = true } reqwest = { version = "0.11", optional = true, default-features = false } diff --git a/opentelemetry-stackdriver/Cargo.toml b/opentelemetry-stackdriver/Cargo.toml index 14a8fbe097..dc0d5b2630 100644 --- a/opentelemetry-stackdriver/Cargo.toml +++ b/opentelemetry-stackdriver/Cargo.toml @@ -19,10 +19,10 @@ hyper-rustls = { version = "0.24", optional = true } opentelemetry = { version = "0.21", path = "../opentelemetry" } opentelemetry_sdk = { version = "0.20", path = "../opentelemetry-sdk" } opentelemetry-semantic-conventions = { version = "0.12", path = "../opentelemetry-semantic-conventions" } -prost = "0.11.0" -prost-types = "0.11.1" +prost = "0.12" +prost-types = "0.12" thiserror = "1.0.30" -tonic = { version = "0.9.0", features = ["gzip", "tls", "transport"] } +tonic = { version = "0.10.0", features = ["gzip", "tls", "transport"] } yup-oauth2 = { version = "8.1.0", optional = true } # Futures @@ -40,6 +40,6 @@ tls-webpki-roots = ["tonic/tls-webpki-roots"] reqwest = "0.11.9" tempfile = "3.3.0" tokio = "1" -tonic-build = "0.9.0" +tonic-build = "0.10.0" walkdir = "2.3.2" futures-util = {version = "0.3", default-features = false } diff --git a/opentelemetry-user-events-metrics/Cargo.toml b/opentelemetry-user-events-metrics/Cargo.toml index 041be8b5fe..2b8a75b6f1 100644 --- a/opentelemetry-user-events-metrics/Cargo.toml +++ b/opentelemetry-user-events-metrics/Cargo.toml @@ -16,7 +16,7 @@ opentelemetry_sdk = { version = "0.20", path = "../opentelemetry-sdk", features opentelemetry-proto = { version = "0.3", path = "../opentelemetry-proto", features = ["gen-tonic", "metrics"] } eventheader = { version = "= 0.3.2" } async-trait = "0.1" -prost = "0.11" +prost = "0.12" [dev-dependencies] tokio = { version = "1.0", features = ["full"] }