From 5d7ecb673ed7185249dcc13706a3e2044bd3979d Mon Sep 17 00:00:00 2001 From: Jeremie Drouet Date: Thu, 25 Sep 2025 09:44:53 +0200 Subject: [PATCH 1/2] build: replicate tonic tls features Signed-off-by: Jeremie Drouet --- opentelemetry-otlp/Cargo.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml index 9acf73a1fb..37e4089bb3 100644 --- a/opentelemetry-otlp/Cargo.toml +++ b/opentelemetry-otlp/Cargo.toml @@ -76,9 +76,10 @@ zstd-tonic = ["tonic/zstd"] # 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-aws-lc = ["tonic/tls-aws-lc"] +tls-ring = ["tonic/tls-ring"] +tls-roots = ["tonic/tls-native-roots"] +tls-webpki-roots = ["tonic/tls-webpki-roots"] # http binary http-proto = ["prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "http", "trace", "metrics"] From af00d1d9d1570e4cfb7845b181c757d48b4c95e3 Mon Sep 17 00:00:00 2001 From: Jeremie Drouet Date: Thu, 25 Sep 2025 09:52:21 +0200 Subject: [PATCH 2/2] fix: add back empty tls feature Signed-off-by: Jeremie Drouet --- opentelemetry-otlp/Cargo.toml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml index 37e4089bb3..7f685dfe32 100644 --- a/opentelemetry-otlp/Cargo.toml +++ b/opentelemetry-otlp/Cargo.toml @@ -76,10 +76,11 @@ zstd-tonic = ["tonic/zstd"] # http compression gzip-http = ["flate2"] zstd-http = ["zstd"] -tls-aws-lc = ["tonic/tls-aws-lc"] -tls-ring = ["tonic/tls-ring"] -tls-roots = ["tonic/tls-native-roots"] -tls-webpki-roots = ["tonic/tls-webpki-roots"] +tls = [] +tls-aws-lc = ["tls", "tonic/tls-aws-lc"] +tls-ring = ["tls", "tonic/tls-ring"] +tls-roots = ["tls", "tonic/tls-native-roots"] +tls-webpki-roots = ["tls", "tonic/tls-webpki-roots"] # http binary http-proto = ["prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "http", "trace", "metrics"]