Upgrade to tonic 0.11 and prost 0.12 (#1536)

djc · web-flow · commit fe2b2d54e8a4 · 2024-02-16T10:24:22.000-05:00
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -7,7 +7,6 @@ on:
 
 jobs:
   integration_tests:
-    rust: stable
     runs-on: ubuntu-latest
     timeout-minutes: 10
     if: ${{ github.event.label.name == 'integration tests' || contains(github.event.pull_request.labels.*.name, 'integration tests') }}
@@ -23,7 +22,7 @@ jobs:
           submodules: true
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: ${{ matrix.rust }}
+          toolchain: stable
           components: rustfmt
           profile: minimal
       - uses: arduino/setup-protoc@v1
diff --git a/Cargo.toml b/Cargo.toml
@@ -49,15 +49,18 @@ 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"
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -300,7 +300,9 @@ pub mod logs_service_server {
                             request: tonic::Request<super::ExportLogsServiceRequest>,
                         ) -> Self::Future {
                             let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).export(request).await };
+                            let fut = async move {
+                                <T as LogsService>::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
@@ -300,7 +300,9 @@ pub mod metrics_service_server {
                             request: tonic::Request<super::ExportMetricsServiceRequest>,
                         ) -> Self::Future {
                             let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).export(request).await };
+                            let fut = async move {
+                                <T as MetricsService>::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
@@ -300,7 +300,9 @@ pub mod trace_service_server {
                             request: tonic::Request<super::ExportTraceServiceRequest>,
                         ) -> Self::Future {
                             let inner = Arc::clone(&self.0);
-                            let fut = async move { (*inner).export(request).await };
+                            let fut = async move {
+                                <T as TraceService>::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
@@ -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<f64>,
     /// 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.

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,9 @@ pub mod logs_service_server {`
`300`	`300`	`request: tonic::Request<super::ExportLogsServiceRequest>,`
`301`	`301`	`) -> Self::Future {`
`302`	`302`	`let inner = Arc::clone(&self.0);`
`303`		`- let fut = async move { (*inner).export(request).await };`
	`303`	`+ let fut = async move {`
	`304`	`+ <T as LogsService>::export(&inner, request).await`
	`305`	`+ };`
`304`	`306`	`Box::pin(fut)`
`305`	`307`	`}`
`306`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,9 @@ pub mod metrics_service_server {`
`300`	`300`	`request: tonic::Request<super::ExportMetricsServiceRequest>,`
`301`	`301`	`) -> Self::Future {`
`302`	`302`	`let inner = Arc::clone(&self.0);`
`303`		`- let fut = async move { (*inner).export(request).await };`
	`303`	`+ let fut = async move {`
	`304`	`+ <T as MetricsService>::export(&inner, request).await`
	`305`	`+ };`
`304`	`306`	`Box::pin(fut)`
`305`	`307`	`}`
`306`	`308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,9 @@ pub mod trace_service_server {`
`300`	`300`	`request: tonic::Request<super::ExportTraceServiceRequest>,`
`301`	`301`	`) -> Self::Future {`
`302`	`302`	`let inner = Arc::clone(&self.0);`
`303`		`- let fut = async move { (*inner).export(request).await };`
	`303`	`+ let fut = async move {`
	`304`	`+ <T as TraceService>::export(&inner, request).await`
	`305`	`+ };`
`304`	`306`	`Box::pin(fut)`
`305`	`307`	`}`
`306`	`308`	`}`