From e6feb3ccc1facc333e4e7d0ffc6d4ae5f686b063 Mon Sep 17 00:00:00 2001 From: Scott Driggers Date: Thu, 29 Aug 2024 00:45:09 -0400 Subject: [PATCH] Adding explicit tls roots configuration to stackdriver (#96) Co-authored-by: Lalit Kumar Bhasin --- opentelemetry-stackdriver/src/lib.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/opentelemetry-stackdriver/src/lib.rs b/opentelemetry-stackdriver/src/lib.rs index 7569cc6a..8ee9bda3 100644 --- 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