Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ Increment the:
* [CODE HEALTH] Fix clang-tidy warnings, part 2
[#3872](https://github.com/open-telemetry/opentelemetry-cpp/pull/3872)

* [CONFIGURATION] File configuration - spec stability
[#3862](https://github.com/open-telemetry/opentelemetry-cpp/pull/3862)

Important changes:

* [BUILD] Revisit EventLogger deprecation
Expand All @@ -39,6 +42,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)
Expand Down
2 changes: 1 addition & 1 deletion examples/configuration/main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion sdk/src/configuration/yaml_configuration_parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ std::unique_ptr<Configuration> 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);
Expand Down
Loading