From 720c695300b9a2bf292df25ef9fe4a2cd845e79b Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Thu, 12 Feb 2026 21:33:46 +0100 Subject: [PATCH 1/2] [CONFIGURATION] File configuration - spec stability. --- examples/configuration/main.cc | 2 +- sdk/src/configuration/yaml_configuration_parser.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/configuration/main.cc b/examples/configuration/main.cc index 20be3369b9..ed5782892b 100644 --- a/examples/configuration/main.cc +++ b/examples/configuration/main.cc @@ -274,7 +274,7 @@ static void usage(FILE *out) "\n" "The configuration file used will be:\n" " 1) the file provided in the command line\n" - " 2) the file provided in environment variable ${OTEL_EXPERIMENTAL_CONFIG_FILE}\n" + " 2) the file provided in environment variable ${OTEL_CONFIG_FILE}\n" " 3) file config.yaml\n" "\n" "This utility is also used for functional tests.\n" diff --git a/sdk/src/configuration/yaml_configuration_parser.cc b/sdk/src/configuration/yaml_configuration_parser.cc index 26d1213f03..f159d79fb7 100644 --- a/sdk/src/configuration/yaml_configuration_parser.cc +++ b/sdk/src/configuration/yaml_configuration_parser.cc @@ -30,7 +30,7 @@ std::unique_ptr YamlConfigurationParser::ParseFile(const std::str if (input_file.empty()) { - static std::string env_var_name("OTEL_EXPERIMENTAL_CONFIG_FILE"); + static std::string env_var_name("OTEL_CONFIG_FILE"); std::string env_var; const bool env_exists = sdk::common::GetStringEnvironmentVariable(env_var_name.c_str(), env_var); From 9c29e1487a94cc3ea8b3221147ec5e756daad042 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 4 Mar 2026 12:04:49 +0100 Subject: [PATCH 2/2] CHANGELOG --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb407ac96a..2c1c1b6cdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,9 @@ Increment the: * [BUILD] Revisit EventLogger deprecation [#3855](https://github.com/open-telemetry/opentelemetry-cpp/pull/3855) +* [CONFIGURATION] File configuration - spec stability + [#3862](https://github.com/open-telemetry/opentelemetry-cpp/pull/3862) + Important changes: * [BUILD] Revisit EventLogger deprecation @@ -33,6 +36,13 @@ Important changes: plans. * Please adjust your application accordingly, to avoid disruption. +* [CONFIGURATION] File configuration - spec stability + [#3862](https://github.com/open-telemetry/opentelemetry-cpp/pull/3862) + + * The specification for declarative configuration is now stable. + * As a result, environment variable `OTEL_EXPERIMENTAL_CONFIG_FILE` + is now renamed to `OTEL_CONFIG_FILE`. + ## [1.25 2026-02-07] * [RELEASE] Bump main branch to 1.25.0-dev (#3759)