Merge branch 'main' into cloud_run_job

open-telemetry · Aug 29, 2024 · bef4d46 · bef4d46
2 parents 6935f91 + e6feb3c
commit bef4d46
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/opentelemetry-stackdriver/src/lib.rs b/opentelemetry-stackdriver/src/lib.rs
@@ -181,8 +181,15 @@ impl Builder {
         } = self;
         let uri = http::uri::Uri::from_static("https://cloudtrace.googleapis.com:443");
 
+        #[cfg(all(feature = "tls-native-roots", not(feature = "tls-webpki-roots")))]
+        let tls_config = ClientTlsConfig::new().with_native_roots();
+        #[cfg(feature = "tls-webpki-roots")]
+        let tls_config = ClientTlsConfig::new().with_webpki_roots();
+        #[cfg(not(any(feature = "tls-native-roots", feature = "tls-webpki-roots")))]
+        let tls_config = ClientTlsConfig::new();
+
         let trace_channel = Channel::builder(uri)
-            .tls_config(ClientTlsConfig::new())
+            .tls_config(tls_config.clone())
             .map_err(|e| Error::Transport(e.into()))?
             .connect()
             .await
@@ -193,7 +200,7 @@ impl Builder {
                 let log_channel = Channel::builder(http::uri::Uri::from_static(
                     "https://logging.googleapis.com:443",
                 ))
-                .tls_config(ClientTlsConfig::new())
+                .tls_config(tls_config)
                 .map_err(|e| Error::Transport(e.into()))?
                 .connect()
                 .await

diff --git a/opentelemetry-stackdriver/src/proto/devtools/cloudtrace/v2.rs b/opentelemetry-stackdriver/src/proto/devtools/cloudtrace/v2.rs
@@ -518,8 +518,8 @@ pub mod trace_service_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -543,7 +543,7 @@ pub mod trace_service_client {
                 >,
             >,
             <T as tonic::codegen::Service<http::Request<tonic::body::BoxBody>>>::Error:
-                Into<StdError> + Send + Sync,
+                Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             TraceServiceClient::new(InterceptedService::new(inner, interceptor))
         }

diff --git a/opentelemetry-stackdriver/src/proto/logging/v2.rs b/opentelemetry-stackdriver/src/proto/logging/v2.rs
@@ -654,8 +654,8 @@ pub mod logging_service_v2_client {
     where
         T: tonic::client::GrpcService<tonic::body::BoxBody>,
         T::Error: Into<StdError>,
-        T::ResponseBody: Body<Data = Bytes> + Send + 'static,
-        <T::ResponseBody as Body>::Error: Into<StdError> + Send,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
     {
         pub fn new(inner: T) -> Self {
             let inner = tonic::client::Grpc::new(inner);
@@ -679,7 +679,7 @@ pub mod logging_service_v2_client {
                 >,
             >,
             <T as tonic::codegen::Service<http::Request<tonic::body::BoxBody>>>::Error:
-                Into<StdError> + Send + Sync,
+                Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             LoggingServiceV2Client::new(InterceptedService::new(inner, interceptor))
         }