[pull] main from open-telemetry:main

CHANGELOG.md

@@ -32,6 +32,9 @@ Increment the:
 * [BUILD] Upgrade to opentelemetry-proto 1.8.0
   [#3730](https://github.com/open-telemetry/opentelemetry-cpp/pull/3730)
 
+* [CONFIGURATION] File configuration - tls
+  [#3726](https://github.com/open-telemetry/opentelemetry-cpp/pull/3726)
+
 New Features:
 
 * [CONFIGURATION] Implement declarative configuration (config.yaml)

exporters/otlp/include/opentelemetry/exporters/otlp/otlp_builder_utils.h

@@ -8,6 +8,7 @@
 #include "opentelemetry/exporters/otlp/otlp_environment.h"  // For OtlpHeaders
 #include "opentelemetry/exporters/otlp/otlp_http.h"
 #include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
 #include "opentelemetry/sdk/configuration/temporality_preference.h"
@@ -31,6 +32,9 @@ class OtlpBuilderUtils
 
   static PreferredAggregationTemporality ConvertTemporalityPreference(
       opentelemetry::sdk::configuration::TemporalityPreference model);
+
+  static bool GrpcUseSsl(const std::string &endpoint,
+                         const opentelemetry::sdk::configuration::GrpcTlsConfiguration *tls);
 };
 
 }  // namespace otlp

exporters/otlp/src/otlp_builder_utils.cc

@@ -12,6 +12,7 @@
 #include "opentelemetry/exporters/otlp/otlp_preferred_temporality.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/headers_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_encoding.h"
 #include "opentelemetry/sdk/configuration/temporality_preference.h"
@@ -118,6 +119,28 @@ PreferredAggregationTemporality OtlpBuilderUtils::ConvertTemporalityPreference(
   return result;
 }
 
+bool OtlpBuilderUtils::GrpcUseSsl(
+    const std::string &endpoint,
+    const opentelemetry::sdk::configuration::GrpcTlsConfiguration *tls)
+{
+  if (endpoint.substr(0, 6) == "https:")
+  {
+    return true;
+  }
+
+  if (endpoint.substr(0, 5) == "http:")
+  {
+    return false;
+  }
+
+  if (tls != nullptr)
+  {
+    return !tls->insecure;
+  }
+
+  return true;
+}
+
 }  // namespace otlp
 }  // namespace exporter
 OPENTELEMETRY_END_NAMESPACE

exporters/otlp/src/otlp_grpc_log_record_builder.cc

@@ -10,6 +10,7 @@
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_builder.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_log_record_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_log_record_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -33,14 +34,20 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpGrpcLogRecordBu
 {
   OtlpGrpcLogRecordExporterOptions options(nullptr);
 
-  options.endpoint            = model->endpoint;
-  options.use_ssl_credentials = !model->insecure;
+  const auto *tls = model->tls.get();
 
-  options.ssl_credentials_cacert_path = model->certificate_file;
+  options.endpoint = model->endpoint;
+
+  options.use_ssl_credentials = OtlpBuilderUtils::GrpcUseSsl(options.endpoint, tls);
+
+  if (tls != nullptr)
+  {
+    options.ssl_credentials_cacert_path = tls->certificate_file;
 #ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  options.ssl_client_key_path  = model->client_key_file;
-  options.ssl_client_cert_path = model->client_certificate_file;
+    options.ssl_client_key_path  = tls->client_key_file;
+    options.ssl_client_cert_path = tls->client_certificate_file;
 #endif
+  }
 
   options.timeout = std::chrono::duration_cast<std::chrono::system_clock::duration>(
       std::chrono::seconds{model->timeout});

exporters/otlp/src/otlp_grpc_push_metric_builder.cc

@@ -10,6 +10,7 @@
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_push_metric_builder.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -33,14 +34,20 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpGrpcPushMet
 {
   OtlpGrpcMetricExporterOptions options(nullptr);
 
-  options.endpoint            = model->endpoint;
-  options.use_ssl_credentials = !model->insecure;
+  const auto *tls = model->tls.get();
 
-  options.ssl_credentials_cacert_path = model->certificate_file;
+  options.endpoint = model->endpoint;
+
+  options.use_ssl_credentials = OtlpBuilderUtils::GrpcUseSsl(options.endpoint, tls);
+
+  if (tls != nullptr)
+  {
+    options.ssl_credentials_cacert_path = tls->certificate_file;
 #ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  options.ssl_client_key_path  = model->client_key_file;
-  options.ssl_client_cert_path = model->client_certificate_file;
+    options.ssl_client_key_path  = tls->client_key_file;
+    options.ssl_client_cert_path = tls->client_certificate_file;
 #endif
+  }
 
   options.timeout = std::chrono::duration_cast<std::chrono::system_clock::duration>(
       std::chrono::seconds{model->timeout});

exporters/otlp/src/otlp_grpc_span_builder.cc

@@ -10,6 +10,7 @@
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_grpc_span_builder.h"
+#include "opentelemetry/sdk/configuration/grpc_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_span_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_grpc_span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -33,14 +34,20 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcSpanBuilder::Bu
 {
   OtlpGrpcExporterOptions options(nullptr);
 
-  options.endpoint            = model->endpoint;
-  options.use_ssl_credentials = !model->insecure;
+  const auto *tls = model->tls.get();
 
-  options.ssl_credentials_cacert_path = model->certificate_file;
+  options.endpoint = model->endpoint;
+
+  options.use_ssl_credentials = OtlpBuilderUtils::GrpcUseSsl(options.endpoint, tls);
+
+  if (tls != nullptr)
+  {
+    options.ssl_credentials_cacert_path = tls->certificate_file;
 #ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
-  options.ssl_client_key_path  = model->client_key_file;
-  options.ssl_client_cert_path = model->client_certificate_file;
+    options.ssl_client_key_path  = tls->client_key_file;
+    options.ssl_client_cert_path = tls->client_certificate_file;
 #endif
+  }
 
   options.timeout = std::chrono::duration_cast<std::chrono::system_clock::duration>(
       std::chrono::seconds{model->timeout});

exporters/otlp/src/otlp_http_log_record_builder.cc

@@ -11,6 +11,7 @@
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_builder.h"
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_log_record_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_http_log_record_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -34,6 +35,8 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpHttpLogRecordBu
 {
   OtlpHttpLogRecordExporterOptions options(nullptr);
 
+  const auto *tls = model->tls.get();
+
   options.url                = model->endpoint;
   options.content_type       = OtlpBuilderUtils::ConvertOtlpHttpEncoding(model->encoding);
   options.json_bytes_mapping = JsonBytesMappingKind::kHexId;
@@ -44,10 +47,15 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpHttpLogRecordBu
   options.http_headers =
       OtlpBuilderUtils::ConvertHeadersConfigurationModel(model->headers.get(), model->headers_list);
   options.ssl_insecure_skip_verify = false;
-  options.ssl_ca_cert_path         = model->certificate_file;
-  options.ssl_client_key_path      = model->client_key_file;
-  options.ssl_client_cert_path     = model->client_certificate_file;
-  options.compression              = model->compression;
+
+  if (tls != nullptr)
+  {
+    options.ssl_ca_cert_path     = tls->certificate_file;
+    options.ssl_client_key_path  = tls->client_key_file;
+    options.ssl_client_cert_path = tls->client_certificate_file;
+  }
+
+  options.compression = model->compression;
 
   return OtlpHttpLogRecordExporterFactory::Create(options);
 }

exporters/otlp/src/otlp_http_push_metric_builder.cc

@@ -11,6 +11,7 @@
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_http_push_metric_builder.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_http_push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -34,6 +35,8 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpHttpPushMet
 {
   OtlpHttpMetricExporterOptions options(nullptr);
 
+  const auto *tls = model->tls.get();
+
   options.url                = model->endpoint;
   options.content_type       = OtlpBuilderUtils::ConvertOtlpHttpEncoding(model->encoding);
   options.json_bytes_mapping = JsonBytesMappingKind::kHexId;
@@ -46,10 +49,15 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpHttpPushMet
   options.aggregation_temporality =
       OtlpBuilderUtils::ConvertTemporalityPreference(model->temporality_preference);
   options.ssl_insecure_skip_verify = false;
-  options.ssl_ca_cert_path         = model->certificate_file;
-  options.ssl_client_key_path      = model->client_key_file;
-  options.ssl_client_cert_path     = model->client_certificate_file;
-  options.compression              = model->compression;
+
+  if (tls != nullptr)
+  {
+    options.ssl_ca_cert_path     = tls->certificate_file;
+    options.ssl_client_key_path  = tls->client_key_file;
+    options.ssl_client_cert_path = tls->client_certificate_file;
+  }
+
+  options.compression = model->compression;
 
   return OtlpHttpMetricExporterFactory::Create(options);
 }

exporters/otlp/src/otlp_http_span_builder.cc

@@ -11,6 +11,7 @@
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_http_span_builder.h"
+#include "opentelemetry/sdk/configuration/http_tls_configuration.h"
 #include "opentelemetry/sdk/configuration/otlp_http_span_exporter_builder.h"
 #include "opentelemetry/sdk/configuration/otlp_http_span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/registry.h"
@@ -34,6 +35,8 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpSpanBuilder::Bu
 {
   OtlpHttpExporterOptions options(nullptr);
 
+  const auto *tls = model->tls.get();
+
   options.url                = model->endpoint;
   options.content_type       = OtlpBuilderUtils::ConvertOtlpHttpEncoding(model->encoding);
   options.json_bytes_mapping = JsonBytesMappingKind::kHexId;
@@ -44,10 +47,15 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpSpanBuilder::Bu
   options.http_headers =
       OtlpBuilderUtils::ConvertHeadersConfigurationModel(model->headers.get(), model->headers_list);
   options.ssl_insecure_skip_verify = false;
-  options.ssl_ca_cert_path         = model->certificate_file;
-  options.ssl_client_key_path      = model->client_key_file;
-  options.ssl_client_cert_path     = model->client_certificate_file;
-  options.compression              = model->compression;
+
+  if (tls != nullptr)
+  {
+    options.ssl_ca_cert_path     = tls->certificate_file;
+    options.ssl_client_key_path  = tls->client_key_file;
+    options.ssl_client_cert_path = tls->client_certificate_file;
+  }
+
+  options.compression = model->compression;
 
   return OtlpHttpExporterFactory::Create(options);
 }