diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a4e92b354..d00b6752c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -81,8 +81,19 @@ Increment the: * [CODE HEALTH] Fix clang-tidy performance warnings [#3941](https://github.com/open-telemetry/opentelemetry-cpp/pull/3941) +* [SDK] Swap Tracer/Meter/LoggerConfig disabled for enabled + [#3942](https://github.com/open-telemetry/opentelemetry-cpp/pull/3942) + Important changes: +* [SDK] Swap Tracer/Meter/LoggerConfig disabled for enabled + [#3942](https://github.com/open-telemetry/opentelemetry-cpp/pull/3942) + + * In TracerConfig(bool), MeterConfig(bool), and LoggerConfig(bool), + the boolean parameter now represents `enabled` instead of `disabled`. + * User code calling these constructors explicitly must be adjusted + to pass `false` to disable. + * [BUILD] Revisit EventLogger deprecation [#3855](https://github.com/open-telemetry/opentelemetry-cpp/pull/3855) diff --git a/sdk/include/opentelemetry/sdk/logs/logger_config.h b/sdk/include/opentelemetry/sdk/logs/logger_config.h index 6504102995..961320ee63 100644 --- a/sdk/include/opentelemetry/sdk/logs/logger_config.h +++ b/sdk/include/opentelemetry/sdk/logs/logger_config.h @@ -49,9 +49,9 @@ class OPENTELEMETRY_EXPORT LoggerConfig static LoggerConfig Default(); private: - explicit LoggerConfig(const bool disabled = false) : disabled_(disabled) {} + explicit LoggerConfig(const bool enabled = true) : enabled_(enabled) {} - bool disabled_; + bool enabled_; }; } // namespace logs } // namespace sdk diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_config.h b/sdk/include/opentelemetry/sdk/metrics/meter_config.h index 3523230e1c..e02fdd21b4 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter_config.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter_config.h @@ -49,8 +49,8 @@ class OPENTELEMETRY_EXPORT MeterConfig static MeterConfig Default(); private: - explicit MeterConfig(const bool disabled = false) : disabled_(disabled) {} - bool disabled_; + explicit MeterConfig(const bool enabled = true) : enabled_(enabled) {} + bool enabled_; }; } // namespace metrics } // namespace sdk diff --git a/sdk/include/opentelemetry/sdk/trace/tracer_config.h b/sdk/include/opentelemetry/sdk/trace/tracer_config.h index 3fa5a144d3..9f67687dc8 100644 --- a/sdk/include/opentelemetry/sdk/trace/tracer_config.h +++ b/sdk/include/opentelemetry/sdk/trace/tracer_config.h @@ -49,8 +49,8 @@ class OPENTELEMETRY_EXPORT TracerConfig static TracerConfig Default(); private: - explicit TracerConfig(const bool disabled = false) : disabled_(disabled) {} - bool disabled_; + explicit TracerConfig(const bool enabled = true) : enabled_(enabled) {} + bool enabled_; }; } // namespace trace } // namespace sdk diff --git a/sdk/src/logs/logger_config.cc b/sdk/src/logs/logger_config.cc index 2bc8aeb5f4..e4fd47c397 100644 --- a/sdk/src/logs/logger_config.cc +++ b/sdk/src/logs/logger_config.cc @@ -11,12 +11,12 @@ namespace logs OPENTELEMETRY_EXPORT bool LoggerConfig::operator==(const LoggerConfig &other) const noexcept { - return disabled_ == other.disabled_; + return enabled_ == other.enabled_; } OPENTELEMETRY_EXPORT bool LoggerConfig::IsEnabled() const noexcept { - return !disabled_; + return enabled_; } OPENTELEMETRY_EXPORT LoggerConfig LoggerConfig::Enabled() @@ -26,7 +26,7 @@ OPENTELEMETRY_EXPORT LoggerConfig LoggerConfig::Enabled() OPENTELEMETRY_EXPORT LoggerConfig LoggerConfig::Disabled() { - static const auto kDisabledConfig = LoggerConfig(true); + static const auto kDisabledConfig = LoggerConfig(false); return kDisabledConfig; } diff --git a/sdk/src/metrics/meter_config.cc b/sdk/src/metrics/meter_config.cc index 85f7d4caf7..3def638f57 100644 --- a/sdk/src/metrics/meter_config.cc +++ b/sdk/src/metrics/meter_config.cc @@ -10,17 +10,17 @@ namespace metrics OPENTELEMETRY_EXPORT bool MeterConfig::operator==(const MeterConfig &other) const noexcept { - return disabled_ == other.disabled_; + return enabled_ == other.enabled_; } OPENTELEMETRY_EXPORT bool MeterConfig::IsEnabled() const noexcept { - return !disabled_; + return enabled_; } OPENTELEMETRY_EXPORT MeterConfig MeterConfig::Disabled() { - static const auto kDisabledConfig = MeterConfig(true); + static const auto kDisabledConfig = MeterConfig(false); return kDisabledConfig; } diff --git a/sdk/src/trace/tracer_config.cc b/sdk/src/trace/tracer_config.cc index f32c2d78e1..26f0b21fec 100644 --- a/sdk/src/trace/tracer_config.cc +++ b/sdk/src/trace/tracer_config.cc @@ -11,7 +11,7 @@ namespace trace OPENTELEMETRY_EXPORT TracerConfig TracerConfig::Disabled() { - static const auto kDisabledConfig = TracerConfig(true); + static const auto kDisabledConfig = TracerConfig(false); return kDisabledConfig; } @@ -28,12 +28,12 @@ OPENTELEMETRY_EXPORT TracerConfig TracerConfig::Default() OPENTELEMETRY_EXPORT bool TracerConfig::IsEnabled() const noexcept { - return !disabled_; + return enabled_; } OPENTELEMETRY_EXPORT bool TracerConfig::operator==(const TracerConfig &other) const noexcept { - return disabled_ == other.disabled_; + return enabled_ == other.enabled_; } } // namespace trace