From 697a7f39a75a8b9a848abdf62d78971e44161e6d Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 19 Mar 2025 16:15:59 +0100 Subject: [PATCH 1/3] chore(stackable-operator): Deprecate initialize_logging function --- crates/stackable-operator/CHANGELOG.md | 12 ++++++++++++ crates/stackable-operator/src/logging/mod.rs | 2 ++ 2 files changed, 14 insertions(+) diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md index ff1f57902..7d564007e 100644 --- a/crates/stackable-operator/CHANGELOG.md +++ b/crates/stackable-operator/CHANGELOG.md @@ -4,8 +4,20 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Changed + +- Deprecate `stackable_operator::logging::initialize_logging()`. It's recommended to use `stackable-telemetry` instead ([#950]). + +[#950]: https://github.com/stackabletech/operator-rs/pull/950 + ## [0.87.4] - 2025-03-17 +### Changed + +- Bump `kube` to 0.99.0 and `json-patch` to 4.0.0 ([#982]). + +[#982]: https://github.com/stackabletech/operator-rs/pull/982 + ## [0.87.3] - 2025-03-14 ### Added diff --git a/crates/stackable-operator/src/logging/mod.rs b/crates/stackable-operator/src/logging/mod.rs index 861edfa51..71a14045a 100644 --- a/crates/stackable-operator/src/logging/mod.rs +++ b/crates/stackable-operator/src/logging/mod.rs @@ -28,6 +28,7 @@ impl Default for TracingTarget { /// /// Log output can be copied to a file by setting `{env}_DIRECTORY` (e.g. `FOOBAR_OPERATOR_DIRECTORY`) /// to a directory path. This file will be rotated regularly. +#[deprecated(note = "Use stackable-telemetry instead, use OTLP instead of Jaeger protocol")] pub fn initialize_logging(env: &str, app_name: &str, tracing_target: TracingTarget) { let filter = match EnvFilter::try_from_env(env) { Ok(env_filter) => env_filter, @@ -94,6 +95,7 @@ mod tests { // NOT_SET=debug cargo test default_tracing -- --nocapture // to see them all. #[test] + #[allow(deprecated)] fn default_tracing_level_is_set_to_info() { super::initialize_logging("NOT_SET", "test", TracingTarget::None); From e7fb059df7b0ac90ef32a085f62fe89ab7ff78f2 Mon Sep 17 00:00:00 2001 From: Techassi Date: Mon, 31 Mar 2025 14:21:42 +0200 Subject: [PATCH 2/3] fix(docs): Remove duplicate imports --- crates/stackable-operator/src/cluster_resources.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/crates/stackable-operator/src/cluster_resources.rs b/crates/stackable-operator/src/cluster_resources.rs index 03dc2d9da..937c2f1df 100644 --- a/crates/stackable-operator/src/cluster_resources.rs +++ b/crates/stackable-operator/src/cluster_resources.rs @@ -5,6 +5,8 @@ use std::{ fmt::Debug, }; +#[cfg(doc)] +use k8s_openapi::api::core::v1::{NodeSelector, Pod}; use k8s_openapi::{ api::{ apps::v1::{ @@ -26,11 +28,6 @@ use snafu::{OptionExt, ResultExt, Snafu}; use strum::Display; use tracing::{debug, info, warn}; -#[cfg(doc)] -use crate::k8s_openapi::api::{ - apps::v1::Deployment, - core::v1::{NodeSelector, Pod}, -}; use crate::{ client::{Client, GetApi}, commons::{ From 626c69cf94909f7e7ef99017604910be70b6bcfe Mon Sep 17 00:00:00 2001 From: Techassi Date: Mon, 31 Mar 2025 16:54:02 +0200 Subject: [PATCH 3/3] chore: Apply suggestion Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com> --- crates/stackable-operator/src/logging/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/stackable-operator/src/logging/mod.rs b/crates/stackable-operator/src/logging/mod.rs index 71a14045a..6f6678838 100644 --- a/crates/stackable-operator/src/logging/mod.rs +++ b/crates/stackable-operator/src/logging/mod.rs @@ -28,7 +28,7 @@ impl Default for TracingTarget { /// /// Log output can be copied to a file by setting `{env}_DIRECTORY` (e.g. `FOOBAR_OPERATOR_DIRECTORY`) /// to a directory path. This file will be rotated regularly. -#[deprecated(note = "Use stackable-telemetry instead, use OTLP instead of Jaeger protocol")] +#[deprecated(note = "Use stackable-telemetry with the OTLP instead of the Jaeger protocol")] pub fn initialize_logging(env: &str, app_name: &str, tracing_target: TracingTarget) { let filter = match EnvFilter::try_from_env(env) { Ok(env_filter) => env_filter,