From 5273f5ea1210523023b094c9ac3dd060359ab093 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 8 May 2025 08:18:34 +0200 Subject: [PATCH 1/2] fix(stackable-telemetry): Only derive clap::ValueEnum if the clap feature is enabled --- .../stackable-telemetry/src/tracing/settings/console_log.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/stackable-telemetry/src/tracing/settings/console_log.rs b/crates/stackable-telemetry/src/tracing/settings/console_log.rs index cdcd43637..18a8aa2bb 100644 --- a/crates/stackable-telemetry/src/tracing/settings/console_log.rs +++ b/crates/stackable-telemetry/src/tracing/settings/console_log.rs @@ -24,9 +24,8 @@ pub enum ConsoleLogSettings { /// Console subscriber log event output formats. /// /// Currently, only [Plain][Format::Plain] is supported. -#[derive( - Clone, Debug, Default, Eq, PartialEq, strum::EnumString, strum::Display, clap::ValueEnum, -)] +#[derive(Clone, Debug, Default, Eq, PartialEq, strum::EnumString, strum::Display)] +#[cfg_attr(feature = "clap", derive(clap::ValueEnum))] #[strum(serialize_all = "snake_case")] pub enum Format { /// Use the plain unstructured log output. From 9c33146e2552c5c506a7d37f331a4b182e63a3fe Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 8 May 2025 08:22:31 +0200 Subject: [PATCH 2/2] chore(stackable-telemetry): Update changelog --- crates/stackable-telemetry/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crates/stackable-telemetry/CHANGELOG.md b/crates/stackable-telemetry/CHANGELOG.md index 6bda3fc40..2d9b6b82b 100644 --- a/crates/stackable-telemetry/CHANGELOG.md +++ b/crates/stackable-telemetry/CHANGELOG.md @@ -8,7 +8,12 @@ All notable changes to this project will be documented in this file. - Bump `opentelemetry` and related crates to `0.29.x` and `tracing-opentelemetry` to `0.30.0` ([#1021]). +### Fixed + +- Only derive `clap::ValueEnum` if the `clap` feature is enabled ([#1026]). + [#1021]: https://github.com/stackabletech/operator-rs/pull/1021 +[#1026]: https://github.com/stackabletech/operator-rs/pull/1026 ## [0.6.0] - 2025-04-14