Skip to content

Commit 4341eb8

Browse files
marcalffmarcalff
authored
[CONFIGURATION] File configuration - rename tls properties (#3805)
1 parent 705914b commit 4341eb8

File tree

15 files changed

+77
-1150
lines changed

15 files changed

+77
-1150
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,21 @@ Increment the:
1818
* [CONFIGURATION] File configuration - remove zipkin
1919
[#3804](https://github.com/open-telemetry/opentelemetry-cpp/pull/3804)
2020

21+
* [CONFIGURATION] File configuration - rename tls properties
22+
[#3805](https://github.com/open-telemetry/opentelemetry-cpp/pull/3805)
23+
2124
Breaking changes:
2225

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

31+
* [CONFIGURATION] File configuration - rename tls properties
32+
[#3805](https://github.com/open-telemetry/opentelemetry-cpp/pull/3805)
33+
* The Tls properties for Grpc and Http are renamed,
34+
due to an upstream schema change.
35+
2836
## [1.24 2025-11-20]
2937

3038
* [RELEASE] Bump main branch to 1.24-dev

‎exporters/otlp/src/otlp_grpc_log_record_builder.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpGrpcLogRecordBu
4242

4343
if (tls != nullptr)
4444
{
45-
options.ssl_credentials_cacert_path = tls->certificate_file;
45+
options.ssl_credentials_cacert_path = tls->ca_file;
4646
#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
47-
options.ssl_client_key_path = tls->client_key_file;
48-
options.ssl_client_cert_path = tls->client_certificate_file;
47+
options.ssl_client_key_path = tls->key_file;
48+
options.ssl_client_cert_path = tls->cert_file;
4949
#endif
5050
}
5151

‎exporters/otlp/src/otlp_grpc_push_metric_builder.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpGrpcPushMet
4242

4343
if (tls != nullptr)
4444
{
45-
options.ssl_credentials_cacert_path = tls->certificate_file;
45+
options.ssl_credentials_cacert_path = tls->ca_file;
4646
#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
47-
options.ssl_client_key_path = tls->client_key_file;
48-
options.ssl_client_cert_path = tls->client_certificate_file;
47+
options.ssl_client_key_path = tls->key_file;
48+
options.ssl_client_cert_path = tls->cert_file;
4949
#endif
5050
}
5151

‎exporters/otlp/src/otlp_grpc_span_builder.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpGrpcSpanBuilder::Bu
4242

4343
if (tls != nullptr)
4444
{
45-
options.ssl_credentials_cacert_path = tls->certificate_file;
45+
options.ssl_credentials_cacert_path = tls->ca_file;
4646
#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
47-
options.ssl_client_key_path = tls->client_key_file;
48-
options.ssl_client_cert_path = tls->client_certificate_file;
47+
options.ssl_client_key_path = tls->key_file;
48+
options.ssl_client_cert_path = tls->cert_file;
4949
#endif
5050
}
5151

‎exporters/otlp/src/otlp_http_log_record_builder.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ std::unique_ptr<opentelemetry::sdk::logs::LogRecordExporter> OtlpHttpLogRecordBu
5050

5151
if (tls != nullptr)
5252
{
53-
options.ssl_ca_cert_path = tls->certificate_file;
54-
options.ssl_client_key_path = tls->client_key_file;
55-
options.ssl_client_cert_path = tls->client_certificate_file;
53+
options.ssl_ca_cert_path = tls->ca_file;
54+
options.ssl_client_key_path = tls->key_file;
55+
options.ssl_client_cert_path = tls->cert_file;
5656
}
5757

5858
options.compression = model->compression;

‎exporters/otlp/src/otlp_http_push_metric_builder.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ std::unique_ptr<opentelemetry::sdk::metrics::PushMetricExporter> OtlpHttpPushMet
5252

5353
if (tls != nullptr)
5454
{
55-
options.ssl_ca_cert_path = tls->certificate_file;
56-
options.ssl_client_key_path = tls->client_key_file;
57-
options.ssl_client_cert_path = tls->client_certificate_file;
55+
options.ssl_ca_cert_path = tls->ca_file;
56+
options.ssl_client_key_path = tls->key_file;
57+
options.ssl_client_cert_path = tls->cert_file;
5858
}
5959

6060
options.compression = model->compression;

‎exporters/otlp/src/otlp_http_span_builder.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> OtlpHttpSpanBuilder::Bu
5050

5151
if (tls != nullptr)
5252
{
53-
options.ssl_ca_cert_path = tls->certificate_file;
54-
options.ssl_client_key_path = tls->client_key_file;
55-
options.ssl_client_cert_path = tls->client_certificate_file;
53+
options.ssl_ca_cert_path = tls->ca_file;
54+
options.ssl_client_key_path = tls->key_file;
55+
options.ssl_client_cert_path = tls->cert_file;
5656
}
5757

5858
options.compression = model->compression;

‎functional/configuration/shelltests/kitchen-sink.test‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)