From afd7cf935068994861ee811d967b7e6f04a3ffc0 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Fri, 16 Feb 2024 09:17:38 +0100 Subject: [PATCH] Upgrade to tonic 0.11 and prost 0.12 --- Cargo.toml | 7 +++++-- examples/tracing-grpc/Cargo.toml | 2 +- opentelemetry-jaeger-propagator/Cargo.toml | 4 ++-- opentelemetry-jaeger/CHANGELOG.md | 4 ++++ opentelemetry-jaeger/Cargo.toml | 4 ++-- opentelemetry-otlp/CHANGELOG.md | 1 + opentelemetry-proto/CHANGELOG.md | 6 +++++- opentelemetry-proto/Cargo.toml | 4 ++-- .../proto/tonic/opentelemetry.proto.collector.logs.v1.rs | 4 +++- .../tonic/opentelemetry.proto.collector.metrics.v1.rs | 4 +++- .../proto/tonic/opentelemetry.proto.collector.trace.v1.rs | 4 +++- .../src/proto/tonic/opentelemetry.proto.metrics.v1.rs | 6 +++--- 12 files changed, 34 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ec5083d563..eae1d2b535 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,9 @@ log = "0.4" once_cell = "1.13" ordered-float = "4.0" pin-project-lite = "0.2" -prost = "0.11" +prost = "0.12" +prost-build = "0.12" +prost-types = "0.12" rand = "0.8" reqwest = "0.11" serde = "1.0" @@ -57,7 +59,8 @@ serde_json = "1.0" surf = "2.0" temp-env = "0.3.6" thiserror = "1" -tonic = "0.9" +tonic = "0.11" +tonic-build = "0.11" tokio = "1" tokio-stream = "0.1.1" tracing = "0.1" diff --git a/examples/tracing-grpc/Cargo.toml b/examples/tracing-grpc/Cargo.toml index 786fa7bd2e..fc807e8937 100644 --- a/examples/tracing-grpc/Cargo.toml +++ b/examples/tracing-grpc/Cargo.toml @@ -23,4 +23,4 @@ tonic = { workspace = true } serde_json = { workspace = true } [build-dependencies] -tonic-build = "0.9.2" +tonic-build = { workspace = true } diff --git a/opentelemetry-jaeger-propagator/Cargo.toml b/opentelemetry-jaeger-propagator/Cargo.toml index 55da916ad8..088cd316c8 100644 --- a/opentelemetry-jaeger-propagator/Cargo.toml +++ b/opentelemetry-jaeger-propagator/Cargo.toml @@ -26,8 +26,8 @@ opentelemetry = { version = "0.21", default-features = false, features = [ ], path = "../opentelemetry" } tonic = { workspace = true, optional = true } -prost = { version = "0.11.6", optional = true } -prost-types = { version = "0.11.6", optional = true } +prost = { workspace = true, optional = true } +prost-types = { workspace = true, optional = true } [dev-dependencies] opentelemetry_sdk = { features = ["testing"], path = "../opentelemetry-sdk" } diff --git a/opentelemetry-jaeger/CHANGELOG.md b/opentelemetry-jaeger/CHANGELOG.md index 88fe37d60f..8dfc170841 100644 --- a/opentelemetry-jaeger/CHANGELOG.md +++ b/opentelemetry-jaeger/CHANGELOG.md @@ -2,6 +2,10 @@ ## vNext +### Changed + +- Update to tonic 0.11 and prost 0.12 (#1536) + ## v0.21.0 ### Changed diff --git a/opentelemetry-jaeger/Cargo.toml b/opentelemetry-jaeger/Cargo.toml index a5df31c0e5..e5794c2252 100644 --- a/opentelemetry-jaeger/Cargo.toml +++ b/opentelemetry-jaeger/Cargo.toml @@ -42,8 +42,8 @@ wasm-bindgen = { version = "0.2", optional = true } wasm-bindgen-futures = { version = "0.4.18", optional = true } tonic = { workspace = true, optional = true } -prost = { version = "0.11.6", optional = true } -prost-types = { version = "0.11.6", optional = true } +prost = { workspace = true, optional = true } +prost-types = { workspace = true, optional = true } # Futures futures-executor = { workspace = true, features = ["std"], optional = true } diff --git a/opentelemetry-otlp/CHANGELOG.md b/opentelemetry-otlp/CHANGELOG.md index 1b89037040..8b740e17f1 100644 --- a/opentelemetry-otlp/CHANGELOG.md +++ b/opentelemetry-otlp/CHANGELOG.md @@ -2,6 +2,7 @@ ## vNext +- Update to tonic 0.11 and prost 0.12 (#1536) - Remove support for grpcio transport (#1534) ## v0.14.0 diff --git a/opentelemetry-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md index bec564e9c4..b4a10061a7 100644 --- a/opentelemetry-proto/CHANGELOG.md +++ b/opentelemetry-proto/CHANGELOG.md @@ -2,9 +2,13 @@ ## vNext -### Added +### Changed +- Update to tonic 0.11 and prost 0.12 (#1536) - Remove support for grpcio transport (#1534) + +### Added + - Add `schemars::JsonSchema` trait support with `with-schemars` feature (#1419) - Update protobuf definitions to v1.1.0 (#1154) diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml index 4a1c1ce99b..e97d51f596 100644 --- a/opentelemetry-proto/Cargo.toml +++ b/opentelemetry-proto/Cargo.toml @@ -57,7 +57,7 @@ serde = { workspace = true, optional = true, features = ["serde_derive"] } hex = { version = "0.4.3", optional = true } [dev-dependencies] -tonic-build = { version = "0.9.0" } -prost-build = { version = "0.11.1" } +tonic-build = { workspace = true } +prost-build = { workspace = true } tempfile = "3.3.0" serde_json = "1.0" diff --git a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.logs.v1.rs b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.logs.v1.rs index 464656dd64..7d9c98f13f 100644 --- a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.logs.v1.rs +++ b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.logs.v1.rs @@ -300,7 +300,9 @@ pub mod logs_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).export(request).await }; + let fut = async move { + ::export(&inner, request).await + }; Box::pin(fut) } } diff --git a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.metrics.v1.rs b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.metrics.v1.rs index af2bd67b3d..e176cf1898 100644 --- a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.metrics.v1.rs +++ b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.metrics.v1.rs @@ -300,7 +300,9 @@ pub mod metrics_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).export(request).await }; + let fut = async move { + ::export(&inner, request).await + }; Box::pin(fut) } } diff --git a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.trace.v1.rs b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.trace.v1.rs index 93bb8f238d..6a52259f84 100644 --- a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.trace.v1.rs +++ b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.collector.trace.v1.rs @@ -300,7 +300,9 @@ pub mod trace_service_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).export(request).await }; + let fut = async move { + ::export(&inner, request).await + }; Box::pin(fut) } } diff --git a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs index 46d262bc19..357fb3d170 100644 --- a/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs +++ b/opentelemetry-proto/src/proto/tonic/opentelemetry.proto.metrics.v1.rs @@ -91,7 +91,7 @@ pub struct ScopeMetrics { /// |data |---> |Gauge, Sum, Histogram, Summary, ... | /// +------------+ +------------------------------------+ /// -/// Data [One of Gauge, Sum, Histogram, Summary, ...] +/// Data \[One of Gauge, Sum, Histogram, Summary, ...\] /// +-----------+ /// |... | // Metadata about the Data. /// |points |--+ @@ -516,7 +516,7 @@ pub struct ExponentialHistogramDataPoint { pub max: ::core::option::Option, /// ZeroThreshold may be optionally set to convey the width of the zero /// region. Where the zero region is defined as the closed interval - /// [-ZeroThreshold, ZeroThreshold]. + /// \[-ZeroThreshold, ZeroThreshold\]. /// When ZeroThreshold is 0, zero count bucket stores values that cannot be /// expressed using the standard exponential formula as well as values that /// have been rounded to zero. @@ -617,7 +617,7 @@ pub mod summary_data_point { #[derive(Clone, PartialEq, ::prost::Message)] pub struct ValueAtQuantile { /// The quantile of a distribution. Must be in the interval - /// [0.0, 1.0]. + /// \[0.0, 1.0\]. #[prost(double, tag = "1")] pub quantile: f64, /// The value at the given quantile of a distribution.