Merge branch 'main' into feat/deployment-condition

Author: razvan

crates/stackable-operator/CHANGELOG.md

@@ -9,6 +9,12 @@ All notable changes to this project will be documented in this file.
 - Add Deployments to `ClusterResource`s ([#992]).
 - Add `DeploymentConditionBuilder`  ([#993]).
 
+### Changed
+
+- Deprecate `stackable_operator::logging::initialize_logging()`. It's recommended to use `stackable-telemetry` instead ([#950], [#989]).
+
+[#950]: https://github.com/stackabletech/operator-rs/pull/950
+[#989]: https://github.com/stackabletech/operator-rs/pull/989
 [#992]: https://github.com/stackabletech/operator-rs/pull/992
 [#993]: https://github.com/stackabletech/operator-rs/pull/993
 

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,8 +28,6 @@ use snafu::{OptionExt, ResultExt, Snafu};
 use strum::Display;
 use tracing::{debug, info, warn};
 
-#[cfg(doc)]
-use crate::k8s_openapi::api::core::v1::{NodeSelector, Pod};
 use crate::{
     client::{Client, GetApi},
     commons::{

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 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,
@@ -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);