Skip to content

build: replicate tonic tls features #3180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jdrouet wants to merge 3 commits into
base: main
Choose a base branch
from
Open

build: replicate tonic tls features #3180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2834bd5
build: replicate tonic tls features
jdrouet Sep 25, 2025
23f5864
fix: add back empty tls feature
jdrouet Sep 25, 2025
621864f
refactor: update feature flags
jdrouet Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions opentelemetry-otlp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,14 @@ experimental-grpc-retry = ["grpc-tonic", "opentelemetry_sdk/experimental_async_r
# http compression
gzip-http = ["flate2"]
zstd-http = ["zstd"]
tls = ["tonic/tls-ring"]
tls-roots = ["tls", "tonic/tls-native-roots"]
tls-webpki-roots = ["tls", "tonic/tls-webpki-roots"]

# tls
_tls-any = [] # Internal feature for TLS guards
tls = ["tls-ring"]
tls-aws-lc = ["_tls-any", "tonic/tls-aws-lc"]
tls-ring = ["_tls-any", "tonic/tls-ring"]
tls-roots = ["_tls-any", "tonic/tls-native-roots"]
tls-webpki-roots = ["_tls-any", "tonic/tls-webpki-roots"]

# http binary
http-proto = ["prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "http", "trace", "metrics"]
Expand Down
14 changes: 7 additions & 7 deletions opentelemetry-otlp/src/exporter/tonic/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use tonic::codec::CompressionEncoding;
use tonic::metadata::{KeyAndValueRef, MetadataMap};
use tonic::service::Interceptor;
use tonic::transport::Channel;
#[cfg(feature = "tls")]
#[cfg(feature = "_tls-any")]
use tonic::transport::ClientTlsConfig;

use super::{default_headers, parse_header_string, OTEL_EXPORTER_OTLP_GRPC_ENDPOINT_DEFAULT};
Expand Down Expand Up @@ -52,7 +52,7 @@ pub struct TonicConfig {
/// Custom metadata entries to send to the collector.
pub(crate) metadata: Option<MetadataMap>,
/// TLS settings for the collector endpoint.
#[cfg(feature = "tls")]
#[cfg(feature = "_tls-any")]
pub(crate) tls_config: Option<ClientTlsConfig>,
/// The compression algorithm to use when communicating with the collector.
pub(crate) compression: Option<Compression>,
Expand Down Expand Up @@ -148,7 +148,7 @@ impl Default for TonicExporterBuilder {
.try_into()
.expect("Invalid tonic headers"),
)),
#[cfg(feature = "tls")]
#[cfg(feature = "_tls-any")]
tls_config: None,
compression: None,
channel: Option::default(),
Expand Down Expand Up @@ -240,7 +240,7 @@ impl TonicExporterBuilder {
.map_err(|op| ExporterBuildError::InvalidUri(endpoint_clone.clone(), op.to_string()))?;
let timeout = resolve_timeout(signal_timeout_var, config.timeout.as_ref());

#[cfg(feature = "tls")]
#[cfg(feature = "_tls-any")]
let channel = match self.tonic_config.tls_config {
Some(tls_config) => endpoint
.tls_config(tls_config)
Expand All @@ -250,7 +250,7 @@ impl TonicExporterBuilder {
.timeout(timeout)
.connect_lazy();

#[cfg(not(feature = "tls"))]
#[cfg(not(feature = "_tls-any"))]
let channel = endpoint.timeout(timeout).connect_lazy();

otel_debug!(name: "TonicChannelBuilt", endpoint = endpoint_clone, timeout_in_millisecs = timeout.as_millis(), compression = format!("{:?}", compression), headers = format!("{:?}", headers_for_logging));
Expand Down Expand Up @@ -463,7 +463,7 @@ impl HasTonicConfig for TonicExporterBuilder {
/// ```
pub trait WithTonicConfig {
/// Set the TLS settings for the collector endpoint.
#[cfg(feature = "tls")]
#[cfg(feature = "_tls-any")]
fn with_tls_config(self, tls_config: ClientTlsConfig) -> Self;

/// Set custom metadata entries to send to the collector.
Expand Down Expand Up @@ -576,7 +576,7 @@ pub trait WithTonicConfig {
}

impl<B: HasTonicConfig> WithTonicConfig for B {
#[cfg(feature = "tls")]
#[cfg(feature = "_tls-any")]
fn with_tls_config(mut self, tls_config: ClientTlsConfig) -> Self {
self.tonic_config().tls_config = Some(tls_config);
self
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry-otlp/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ pub mod tonic_types {
}

/// Re-exported types from `tonic::transport`.
#[cfg(feature = "tls")]
#[cfg(feature = "_tls-any")]
pub mod transport {
#[doc(no_inline)]
pub use tonic::transport::{Certificate, ClientTlsConfig, Identity};
Expand Down