chore: Merge branch 'main' into chore/add-crd-versioning

Author: Techassi

Cargo.lock

@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.91.1] - 2025-04-09
+
+### Added
+
+- Add re-exports for `stackable-telemetry` and `stackable-versioned` ([#1007]).
+- Add new features: `default`, `full`, `telemetry`, and `versioned` ([#1007]).
+
+[#1007]: https://github.com/stackabletech/operator-rs/pull/1007
+
+## [0.91.0] - 2025-04-08
+
+### Changed
+
+- BREAKING: Remove `cli::TelemetryArguments` and `cli::RollingPeriod` which are both replaced by
+  types from `stackable_telemetry` ([#1001]).
+- BREAKING: The `ProductOperatorRun` struct now uses `stackable_telemetry::tracing::TelemetryOptions`
+  for the `telemetry_arguments` field ([#1001]).
+
+[#1001]: https://github.com/stackabletech/operator-rs/pull/1001
+
+## [0.90.0] - 2025-04-07
+
 ### Added
 
 - BREAKING: Inject vector aggregator address into vector config file using an environment variable ([#1000]).

crates/stackable-operator/CHANGELOG.md

@@ -1,16 +1,21 @@
 [package]
 name = "stackable-operator"
 description = "Stackable Operator Framework"
-version = "0.89.1"
+version = "0.91.1"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
 
 [features]
+full = ["time", "telemetry", "versioned"]
+default = ["telemetry", "versioned"]
 time = ["dep:time"]
+telemetry = []
+versioned = []
 
 [dependencies]
+stackable-telemetry = { path = "../stackable-telemetry", features = ["clap"] }
 stackable-versioned = { path = "../stackable-versioned", features = ["k8s"] }
 stackable-operator-derive = { path = "../stackable-operator-derive" }
 stackable-shared = { path = "../stackable-shared" }

crates/stackable-operator/Cargo.toml

@@ -108,13 +108,13 @@
 //!
 use std::{
     ffi::OsStr,
-    ops::Deref,
     path::{Path, PathBuf},
 };
 
 use clap::Args;
 use product_config::ProductConfigManager;
 use snafu::{ResultExt, Snafu};
+use stackable_telemetry::tracing::TelemetryOptions;
 
 use crate::{namespace::WatchNamespace, utils::cluster_info::KubernetesClusterInfoOpts};
 
@@ -165,10 +165,8 @@ pub enum Command<Run: Args = ProductOperatorRun> {
 /// ```rust
 /// # use stackable_operator::cli::{Command, ProductOperatorRun, ProductConfigPath};
 /// use clap::Parser;
-/// use stackable_operator::{
-///     cli::TelemetryArguments,
-///     namespace::WatchNamespace,
-/// };
+/// use stackable_operator::namespace::WatchNamespace;
+/// use stackable_telemetry::tracing::TelemetryOptions;
 ///
 /// #[derive(clap::Parser, Debug, PartialEq, Eq)]
 /// struct Run {
@@ -184,7 +182,7 @@ pub enum Command<Run: Args = ProductOperatorRun> {
 ///     common: ProductOperatorRun {
 ///         product_config: ProductConfigPath::from("bar".as_ref()),
 ///         watch_namespace: WatchNamespace::One("foobar".to_string()),
-///         telemetry_arguments: TelemetryArguments::default(),
+///         telemetry_arguments: TelemetryOptions::default(),
 ///         cluster_info_opts: Default::default(),
 ///     },
 /// }));
@@ -219,7 +217,7 @@ pub struct ProductOperatorRun {
     pub watch_namespace: WatchNamespace,
 
     #[command(flatten)]
-    pub telemetry_arguments: TelemetryArguments,
+    pub telemetry_arguments: TelemetryOptions,
 
     #[command(flatten)]
     pub cluster_info_opts: KubernetesClusterInfoOpts,
@@ -280,50 +278,6 @@ impl ProductConfigPath {
     }
 }
 
-#[derive(Debug, Default, PartialEq, Eq, Args)]
-pub struct TelemetryArguments {
-    /// Disable console output.
-    #[arg(long, env)]
-    pub no_console_output: bool,
-
-    /// Enable logging to rolling files located in the specified DIRECTORY.
-    #[arg(long, env, value_name = "DIRECTORY", group = "rolling_logs_group")]
-    pub rolling_logs: Option<PathBuf>,
-
-    /// Time PERIOD after which log files are rolled over.
-    #[arg(long, env, value_name = "PERIOD", requires = "rolling_logs_group")]
-    pub rolling_logs_period: Option<RollingPeriod>,
-
-    /// Enable exporting traces via OTLP.
-    #[arg(long, env)]
-    pub otlp_traces: bool,
-
-    /// Enable exporting logs via OTLP.
-    #[arg(long, env)]
-    pub otlp_logs: bool,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, strum::Display, strum::EnumString, clap::ValueEnum)]
-pub enum RollingPeriod {
-    Minutely,
-    Hourly,
-    Daily,
-    Never,
-}
-
-impl Deref for RollingPeriod {
-    type Target = tracing_appender::rolling::Rotation;
-
-    fn deref(&self) -> &Self::Target {
-        match self {
-            RollingPeriod::Minutely => &tracing_appender::rolling::Rotation::MINUTELY,
-            RollingPeriod::Hourly => &tracing_appender::rolling::Rotation::HOURLY,
-            RollingPeriod::Daily => &tracing_appender::rolling::Rotation::DAILY,
-            RollingPeriod::Never => &tracing_appender::rolling::Rotation::NEVER,
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use std::{env, fs::File};

crates/stackable-operator/src/cli.rs

@@ -1,3 +1,11 @@
+//! ## Crate Features
+//!
+//! - `default` enables a default set of features which most operators need.
+//! - `full` enables all available features.
+//! - `time` enables interoperability between [`time::Duration`] and the `time` crate.
+//! - `telemetry` enables various helpers for emitting telemetry data.
+//! - `versioned` enables the macro for CRD versioning.
+
 pub mod builder;
 pub mod cli;
 pub mod client;
@@ -22,14 +30,16 @@ pub mod time;
 pub mod utils;
 pub mod validation;
 
+// External re-exports
+pub use k8s_openapi;
+pub use kube;
+pub use schemars;
 // Internal re-exports
+// TODO (@Techassi): Ideally we would want webhook and certs exported here as
+// well, but that would require some restructuring of crates.
+pub use stackable_shared as shared;
 pub use stackable_shared::{crd::CustomResourceExt, yaml::YamlSchema};
-
-pub mod shared {
-    pub use stackable_shared::*;
-}
-
-// External re-exports
-pub use ::k8s_openapi;
-pub use ::kube;
-pub use ::schemars;
+#[cfg(feature = "telemetry")]
+pub use stackable_telemetry as telemetry;
+#[cfg(feature = "versioned")]
+pub use stackable_versioned as versioned;

crates/stackable-operator/src/lib.rs

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.5.0] - 2025-04-08
+
+### Added
+
+- Add new `Tracing::pre_configured` method ([#1001]).
+  - Add `TelemetryOptions` struct and `RollingPeriod` enum
+  - Add `clap` feature to enable `TelemetryOptions` being used as CLI arguments
+
+### Changed
+
+- BREAKING: Change `FileLogSettingsBuilder::with_rotation_period` to take `impl Into<Rotation>`
+  instead of `Rotation` ([#1001]).
+
+[#1001]: https://github.com/stackabletech/operator-rs/pull/1001
+
 ## [0.4.0] - 2025-04-02
 
 ### Added

crates/stackable-telemetry/CHANGELOG.md

@@ -1,13 +1,17 @@
 [package]
 name = "stackable-telemetry"
-version = "0.4.0"
+version = "0.5.0"
 authors.workspace = true
 license.workspace = true
 edition.workspace = true
 repository.workspace = true
 
+[features]
+clap = ["dep:clap"]
+
 [dependencies]
 axum.workspace = true
+clap = { workspace = true, optional = true }
 futures-util.workspace = true
 opentelemetry = { workspace = true, features = ["logs"] }
 opentelemetry-appender-tracing.workspace = true
@@ -16,6 +20,7 @@ opentelemetry-otlp = { workspace = true, features = ["grpc-tonic", "gzip-tonic",
 opentelemetry_sdk = { workspace = true, features = ["logs", "rt-tokio", "spec_unstable_logs_enabled"] }
 pin-project.workspace = true
 snafu.workspace = true
+strum.workspace = true
 tokio.workspace = true
 tower.workspace = true
 tracing.workspace = true