feat(deps): update opentelemetry 0.30 & tonic 0.13 (#240)

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Bernard <david.bernard.31@gmail.com>

Author: renovate[bot]

Cargo.toml

@@ -27,27 +27,27 @@ axum = { version = "0.8", default-features = false }
 http = "^1"
 hyper = "1"
 insta = { version = "^1", features = ["redactions", "yaml"] }
-opentelemetry = { version = "0.29", features = [
+opentelemetry = { version = "0.30", features = [
   "trace",
 ], default-features = false }
-opentelemetry_sdk = { version = "0.29", default-features = false, features = [
+opentelemetry_sdk = { version = "0.30", default-features = false, features = [
   "rt-tokio",
 ] }
-opentelemetry-aws = { version = "0.17", default-features = false }
-opentelemetry-jaeger-propagator = { version = "0.29", default-features = false }
-opentelemetry-resource-detectors = { version = "0.8", default-features = false }
-opentelemetry-semantic-conventions = { version = "0.29", default-features = false }
-opentelemetry-zipkin = { version = "0.29", default-features = false }
-opentelemetry-otlp = { version = "0.29", default-features = false }
-opentelemetry-proto = { version = "0.29", default-features = false }
-opentelemetry-stdout = { version = "0.29" }
+opentelemetry-aws = { version = "0.18", default-features = false }
+opentelemetry-jaeger-propagator = { version = "0.30", default-features = false }
+opentelemetry-resource-detectors = { version = "0.9", default-features = false }
+opentelemetry-semantic-conventions = { version = "0.30", default-features = false }
+opentelemetry-zipkin = { version = "0.30", default-features = false }
+opentelemetry-otlp = { version = "0.30", default-features = false }
+opentelemetry-proto = { version = "0.30", default-features = false }
+opentelemetry-stdout = { version = "0.30" }
 rstest = "0.25"
 tokio = { version = "1", default-features = false }
 tokio-stream = { version = "0.1", default-features = false }
-tonic = { version = "0.12", default-features = false } #should be sync with opentelemetry-proto
+tonic = { version = "0.13", default-features = false } #should be sync with opentelemetry-proto
 tower = { version = "0.5", default-features = false }
 tracing = "0.1"
-tracing-opentelemetry = "0.30"
+tracing-opentelemetry = "0.31"
 
 [profile.dev.package.insta]
 opt-level = 3

examples/grpc/Cargo.toml

@@ -16,16 +16,16 @@ init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", featur
 opentelemetry = { workspace = true }
 prost = "0.13"
 tokio = { workspace = true, features = ["full"] }
-tonic = "0.12"
-tonic-health = "0.12"
-tonic-reflection = "0.12"
+tonic = { workspace = true, features = ["transport", "router"] }
+tonic-health = "0.13"
+tonic-reflection = "0.13"
 tonic-tracing-opentelemetry = { path = "../../tonic-tracing-opentelemetry" }
 tower = { workspace = true }
 tracing = { workspace = true }
 tracing-opentelemetry-instrumentation-sdk = { path = "../../tracing-opentelemetry-instrumentation-sdk" }
 
 [build-dependencies]
-tonic-build = "0.12"
+tonic-build = "0.13"
 
 [[bin]]
 name = "server"

examples/grpc/src/generated/helloworld.rs

@@ -45,7 +45,7 @@ pub mod greeter_client {
     }
     impl<T> GreeterClient<T>
     where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
+        T: tonic::client::GrpcService<tonic::body::Body>,
         T::Error: Into<StdError>,
         T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
         <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -66,13 +66,13 @@ pub mod greeter_client {
             F: tonic::service::Interceptor,
             T::ResponseBody: Default,
             T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
+                http::Request<tonic::body::Body>,
                 Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
                 >,
             >,
             <T as tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
+                http::Request<tonic::body::Body>,
             >>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             GreeterClient::new(InterceptedService::new(inner, interceptor))
@@ -239,7 +239,7 @@ pub mod greeter_server {
         B: Body + std::marker::Send + 'static,
         B::Error: Into<StdError> + std::marker::Send + 'static,
     {
-        type Response = http::Response<tonic::body::BoxBody>;
+        type Response = http::Response<tonic::body::Body>;
         type Error = std::convert::Infallible;
         type Future = BoxFuture<Self::Response, Self::Error>;
         fn poll_ready(
@@ -338,7 +338,9 @@ pub mod greeter_server {
                 }
                 _ => {
                     Box::pin(async move {
-                        let mut response = http::Response::new(empty_body());
+                        let mut response = http::Response::new(
+                            tonic::body::Body::default(),
+                        );
                         let headers = response.headers_mut();
                         headers
                             .insert(

examples/grpc/src/server.rs

@@ -51,7 +51,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let _guard = init_tracing_opentelemetry::tracing_subscriber_ext::init_subscribers()
         .expect("init subscribers");
 
-    let addr = "0.0.0.0:50051".parse().unwrap();
+    let addr = "0.0.0.0:50051".parse()?;
     let greeter = MyGreeter::default();
 
     let (_, health_service) = tonic_health::server::health_reporter();
@@ -62,6 +62,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("GreeterServer listening on {}", addr);
 
     Server::builder()
+        .timeout(std::time::Duration::from_secs(10))
         // create trace for every request including health_service
         .layer(server::OtelGrpcLayer::default().filter(filters::reject_healthcheck))
         .add_service(health_service)

fake-opentelemetry-collector/Cargo.toml

@@ -33,7 +33,7 @@ opentelemetry_sdk = { workspace = true, features = [
 serde = { version = "1", features = ["derive"] }
 tokio = { workspace = true, features = ["full"] }
 tokio-stream = { workspace = true, features = ["net"] }
-tonic = { workspace = true, features = ["codegen", "transport"]}
+tonic = { workspace = true, features = ["codegen", "transport", "router"]}
 tracing = { workspace = true }
 
 [dev-dependencies]

tonic-tracing-opentelemetry/Cargo.toml

@@ -23,7 +23,7 @@ http-body = "1"
 hyper = { workspace = true }
 opentelemetry = { workspace = true }
 pin-project-lite = "0.2"
-tonic = { version = "0.12", default-features = false }
+tonic = { workspace = true, default-features = false }
 tower = { workspace = true }
 tracing = { workspace = true }
 tracing-opentelemetry = { workspace = true }

tonic-tracing-opentelemetry/src/middleware/server.rs

@@ -6,7 +6,7 @@ use std::{
     pin::Pin,
     task::{Context, Poll},
 };
-use tower::{BoxError, Layer, Service};
+use tower::{Layer, Service};
 use tracing::Span;
 use tracing_opentelemetry_instrumentation_sdk::http as otel_http;
 
@@ -52,8 +52,9 @@ pub struct OtelGrpcService<S> {
 
 impl<S, B, B2> Service<Request<B>> for OtelGrpcService<S>
 where
-    S: Service<Request<B>, Response = Response<B2>, Error = BoxError> + Clone + Send + 'static,
-    S::Future: Send + 'static,
+    S: Service<Request<B>, Response = Response<B2>> + Clone + Send + 'static,
+    //S::Future: Send + 'static,
+    S::Error: std::error::Error,
     B: Send + 'static,
 {
     type Response = S::Response;
@@ -67,7 +68,7 @@ where
     //type Future = Inspect<S::Future, Box<dyn FnOnce(S::Response)>>;
 
     fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.inner.poll_ready(cx).map_err(Into::into)
+        self.inner.poll_ready(cx)
     }
 
     fn call(&mut self, req: Request<B>) -> Self::Future {
@@ -108,11 +109,14 @@ pin_project! {
     }
 }
 
-impl<Fut, ResBody> Future for ResponseFuture<Fut>
+impl<Fut, ResBody, Error> Future for ResponseFuture<Fut>
 where
-    Fut: Future<Output = Result<Response<ResBody>, BoxError>>,
+    Fut: Future<Output = Result<Response<ResBody>, Error>>,
+    // Require that the inner service's error can be converted into a `BoxError`.
+    //Error: Into<BoxError>,
+    Error: std::error::Error,
 {
-    type Output = Result<Response<ResBody>, BoxError>;
+    type Output = Result<Response<ResBody>, Error>;
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();

tracing-opentelemetry-instrumentation-sdk/src/http/grpc_server.rs

@@ -1,5 +1,5 @@
 use crate::http::{extract_service_method, http_host, user_agent};
-use crate::{otel_trace_span, BoxError};
+use crate::otel_trace_span;
 use tracing::field::Empty;
 
 use super::grpc_update_span_from_response;
@@ -24,7 +24,15 @@ pub fn make_span_from_request<B>(req: &http::Request<B>) -> tracing::Span {
     )
 }
 
-fn update_span_from_error(span: &tracing::Span, error: &BoxError) {
+// fn update_span_from_error<E>(span: &tracing::Span, error: &E) {
+//     span.record("otel.status_code", "ERROR");
+//     span.record("rpc.grpc.status_code", 2);
+// }
+
+fn update_span_from_error<E>(span: &tracing::Span, error: &E)
+where
+    E: std::error::Error,
+{
     span.record("otel.status_code", "ERROR");
     span.record("rpc.grpc.status_code", 2);
     span.record("exception.message", error.to_string());
@@ -33,10 +41,12 @@ fn update_span_from_error(span: &tracing::Span, error: &BoxError) {
         .map(|s| span.record("exception.message", s.to_string()));
 }
 
-pub fn update_span_from_response_or_error<B>(
+pub fn update_span_from_response_or_error<B, E>(
     span: &tracing::Span,
-    response: &Result<http::Response<B>, BoxError>,
-) {
+    response: &Result<http::Response<B>, E>,
+) where
+    E: std::error::Error,
+{
     match response {
         Ok(response) => {
             grpc_update_span_from_response(span, response, true);