Skip to content

[CONFIGURATION] File configuration - rename tls properties #3805

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

Merged
marcalff merged 2 commits into from
Jan 9, 2026
Merged

[CONFIGURATION] File configuration - rename tls properties #3805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a926848
[CONFIGURATION] Declarative configuration - rename tls properties
marcalff Jan 8, 2026
7677432
Changelog
marcalff Jan 8, 2026
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
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,21 @@ Increment the:
* [CONFIGURATION] File configuration - remove zipkin
[#3804](https://github.com/open-telemetry/opentelemetry-cpp/pull/3804)

* [CONFIGURATION] File configuration - rename tls properties
[#3805](https://github.com/open-telemetry/opentelemetry-cpp/pull/3805)

Breaking changes:

* [CONFIGURATION] File configuration - remove zipkin
[#3804](https://github.com/open-telemetry/opentelemetry-cpp/pull/3804)
* The zipkin trace exporter is no longer supported
by declarative configuration, due to an upstream schema change.

* [CONFIGURATION] File configuration - rename tls properties
[#3805](https://github.com/open-telemetry/opentelemetry-cpp/pull/3805)
* The Tls properties for Grpc and Http are renamed,
due to an upstream schema change.

## [1.24 2025-11-20]

* [RELEASE] Bump main branch to 1.24-dev
Expand Down
6 changes: 3 additions & 3 deletions exporters/otlp/src/otlp_grpc_log_record_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpGrpcLogRecordBu

if (tls != nullptr)
{
options.ssl_credentials_cacert_path = tls->certificate_file;
options.ssl_credentials_cacert_path = tls->ca_file;
#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
options.ssl_client_key_path = tls->client_key_file;
options.ssl_client_cert_path = tls->client_certificate_file;
options.ssl_client_key_path = tls->key_file;
options.ssl_client_cert_path = tls->cert_file;
#endif
}

Expand Down
6 changes: 3 additions & 3 deletions exporters/otlp/src/otlp_grpc_push_metric_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpGrpcPushMet

if (tls != nullptr)
{
options.ssl_credentials_cacert_path = tls->certificate_file;
options.ssl_credentials_cacert_path = tls->ca_file;
#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
options.ssl_client_key_path = tls->client_key_file;
options.ssl_client_cert_path = tls->client_certificate_file;
options.ssl_client_key_path = tls->key_file;
options.ssl_client_cert_path = tls->cert_file;
#endif
}

Expand Down
6 changes: 3 additions & 3 deletions exporters/otlp/src/otlp_grpc_span_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcSpanBuilder::Bu

if (tls != nullptr)
{
options.ssl_credentials_cacert_path = tls->certificate_file;
options.ssl_credentials_cacert_path = tls->ca_file;
#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
options.ssl_client_key_path = tls->client_key_file;
options.ssl_client_cert_path = tls->client_certificate_file;
options.ssl_client_key_path = tls->key_file;
options.ssl_client_cert_path = tls->cert_file;
#endif
}

Expand Down
6 changes: 3 additions & 3 deletions exporters/otlp/src/otlp_http_log_record_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpHttpLogRecordBu

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.ssl_ca_cert_path = tls->ca_file;
options.ssl_client_key_path = tls->key_file;
options.ssl_client_cert_path = tls->cert_file;
}

options.compression = model->compression;
Expand Down
6 changes: 3 additions & 3 deletions exporters/otlp/src/otlp_http_push_metric_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpHttpPushMet

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.ssl_ca_cert_path = tls->ca_file;
options.ssl_client_key_path = tls->key_file;
options.ssl_client_cert_path = tls->cert_file;
}

options.compression = model->compression;
Expand Down
6 changes: 3 additions & 3 deletions exporters/otlp/src/otlp_http_span_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpSpanBuilder::Bu

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.ssl_ca_cert_path = tls->ca_file;
options.ssl_client_key_path = tls->key_file;
options.ssl_client_cert_path = tls->cert_file;
}

options.compression = model->compression;
Expand Down
47 changes: 0 additions & 47 deletions functional/configuration/shelltests/kitchen-sink.test
View file
Open in desktop

This file was deleted.

Loading
Loading