From 5d6a07fb7db5e1b7694317e5a0f0adea135d3ac1 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 22 Apr 2025 16:48:20 +0200 Subject: [PATCH 1/4] chore!: Bump stackable-operator to 0.92.0 --- Cargo.lock | 81 +++++++++++++++++++++----------- Cargo.toml | 3 +- rust/olm-deployer/Cargo.toml | 1 - rust/olm-deployer/src/main.rs | 2 +- rust/operator-binary/Cargo.toml | 1 - rust/operator-binary/src/main.rs | 2 +- 6 files changed, 56 insertions(+), 34 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6c410fe..1449577 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -475,6 +475,15 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "convert_case" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -1480,6 +1489,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "k8s-version" +version = "0.1.2" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1" +dependencies = [ + "darling", + "regex", + "snafu 0.8.5", +] + [[package]] name = "kube" version = "0.99.0" @@ -2673,7 +2692,6 @@ dependencies = [ "snafu 0.8.5", "socket2", "stackable-operator", - "stackable-telemetry 0.5.0 (git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.5.0)", "strum", "tokio", "tokio-stream", @@ -2693,7 +2711,6 @@ dependencies = [ "serde_json", "serde_yaml", "stackable-operator", - "stackable-telemetry 0.5.0 (git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.5.0)", "tokio", "tracing", "walkdir", @@ -2701,8 +2718,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.91.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#26b2cee294e0fdc468133a1eafb11fafe3d50f8e" +version = "0.92.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1" dependencies = [ "chrono", "clap", @@ -2726,7 +2743,8 @@ dependencies = [ "snafu 0.8.5", "stackable-operator-derive", "stackable-shared", - "stackable-telemetry 0.5.0 (git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0)", + "stackable-telemetry", + "stackable-versioned", "strum", "tokio", "tracing", @@ -2738,7 +2756,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#26b2cee294e0fdc468133a1eafb11fafe3d50f8e" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1" dependencies = [ "darling", "proc-macro2", @@ -2749,7 +2767,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#26b2cee294e0fdc468133a1eafb11fafe3d50f8e" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1" dependencies = [ "kube", "semver", @@ -2760,8 +2778,8 @@ dependencies = [ [[package]] name = "stackable-telemetry" -version = "0.5.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#26b2cee294e0fdc468133a1eafb11fafe3d50f8e" +version = "0.6.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1" dependencies = [ "axum 0.8.3", "clap", @@ -2782,26 +2800,27 @@ dependencies = [ ] [[package]] -name = "stackable-telemetry" -version = "0.5.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.5.0#26b2cee294e0fdc468133a1eafb11fafe3d50f8e" +name = "stackable-versioned" +version = "0.7.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1" dependencies = [ - "axum 0.8.3", - "clap", - "futures-util", - "opentelemetry", - "opentelemetry-appender-tracing", - "opentelemetry-otlp", - "opentelemetry_sdk", - "pin-project", - "snafu 0.8.5", - "strum", - "tokio", - "tower 0.5.2", - "tracing", - "tracing-appender", - "tracing-opentelemetry", - "tracing-subscriber", + "stackable-versioned-macros", +] + +[[package]] +name = "stackable-versioned-macros" +version = "0.7.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1" +dependencies = [ + "convert_case", + "darling", + "itertools", + "k8s-openapi", + "k8s-version", + "kube", + "proc-macro2", + "quote", + "syn 2.0.99", ] [[package]] @@ -3303,6 +3322,12 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + [[package]] name = "unicode-xid" version = "0.2.6" diff --git a/Cargo.toml b/Cargo.toml index 12ac302..a23fa91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,7 @@ edition = "2021" repository = "https://github.com/stackabletech/listener-operator" [workspace.dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.91.0" } -stackable-telemetry = { git = "https://github.com/stackabletech/operator-rs.git", features = ["clap"], tag = "stackable-telemetry-0.5.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.92.0" } anyhow = "1.0" built = { version = "0.7", features = ["chrono", "git2"] } diff --git a/rust/olm-deployer/Cargo.toml b/rust/olm-deployer/Cargo.toml index 423e423..3149d2b 100644 --- a/rust/olm-deployer/Cargo.toml +++ b/rust/olm-deployer/Cargo.toml @@ -10,7 +10,6 @@ publish = false [dependencies] stackable-operator.workspace = true -stackable-telemetry.workspace = true anyhow.workspace = true clap.workspace = true diff --git a/rust/olm-deployer/src/main.rs b/rust/olm-deployer/src/main.rs index bc178bd..f4c93eb 100644 --- a/rust/olm-deployer/src/main.rs +++ b/rust/olm-deployer/src/main.rs @@ -29,9 +29,9 @@ use stackable_operator::{ core::GroupVersionKind, discovery::{ApiResource, Discovery, Scope}, }, + telemetry::{Tracing, tracing::TelemetryOptions}, utils::cluster_info::KubernetesClusterInfoOpts, }; -use stackable_telemetry::{Tracing, tracing::TelemetryOptions}; pub const APP_NAME: &str = "stkbl-listener-olm-deployer"; diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index 2e16dba..7cca170 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -11,7 +11,6 @@ publish = false [dependencies] csi-grpc = { path = "../csi-grpc" } stackable-operator.workspace = true -stackable-telemetry.workspace = true clap.workspace = true const_format.workspace = true diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index c8d765b..e7cc7f5 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -12,9 +12,9 @@ use futures::{FutureExt, TryStreamExt, pin_mut}; use stackable_operator::{ self, CustomResourceExt, commons::listener::{Listener, ListenerClass, PodListeners}, + telemetry::{Tracing, tracing::TelemetryOptions}, utils::cluster_info::KubernetesClusterInfoOpts, }; -use stackable_telemetry::{Tracing, tracing::TelemetryOptions}; use tokio::signal::unix::{SignalKind, signal}; use tokio_stream::wrappers::UnixListenerStream; use tonic::transport::Server; From 2c9bc3993532f2e18dd795dc518a83929a76a3b0 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 22 Apr 2025 16:53:56 +0200 Subject: [PATCH 2/4] chore: Update changelog --- CHANGELOG.md | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1bd3f0..9a29849 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,20 +4,30 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Added + +- Adds new telemetry CLI arguments and environment variables ([#299]). + - Use `--file-log-max-files` (or `FILE_LOG_MAX_FILES`) to limit the number of log files kept. + - The file log rotation period is now configurable via `FILE_LOG_ROTATION_PERIOD`. + - Use `--console-log-format` (or `CONSOLE_LOG_FORMAT`) to set the format to `plain` (default) or `json`. + ### Changed -- BREAKING: Replace stackable-operator `initialize_logging` with stackable-telemetry `Tracing` ([#291]). +- BREAKING: Replace stackable-operator `initialize_logging` with stackable-telemetry `Tracing` ([#291], [#299]). - operator-binary - - The file log directory was set by `LISTENER_OPERATOR_LOG_DIRECTORY`, and is now set by - `ROLLING_LOGS_DIR` (or via `--rolling-logs `). - - The console log level was set by `LISTENER_OPERATOR_LOG`, and is now set by `CONSOLE_LOG`. + - The console log level was set by `LISTENER_OPERATOR_LOG`, and is now set by `CONSOLE_LOG_LEVEL`. + - The file log level was set by `LISTENER_OPERATOR_LOG`, and is now set by `FILE_LOG_LEVEL`. + - The file log directory was set by `LISTENER_OPERATOR_LOG_DIRECTORY`, and is now set + by `FILE_LOG_DIRECTORY` (or via `--file-log-directory `). - olm-deployer - - The file log directory was set by `STKBL_LISTENER_OLM_DEPLOYER_LOG_DIRECTORY`, and is now set by - `ROLLING_LOGS_DIR` (or via `--rolling-logs `). - - The console log level was set by `STKBL_LISTENER_OLM_DEPLOYER_LOG`, and is now set by `CONSOLE_LOG`. + - The console log level was set by `STKBL_LISTENER_OLM_DEPLOYER_LOG`, and is now set by `CONSOLE_LOG_LEVEL`. + - The file log level was set by `STKBL_LISTENER_OLM_DEPLOYER_LOG`, and is now set by `FILE_LOG_LEVEL`. + - The file log directory was set by `STKBL_LISTENER_OLM_DEPLOYER_LOG_DIRECTORY`, and is now set + by `FILE_LOG_DIRECTORY` (or via `--file-log-directory `). - Replace stackable-operator `print_startup_string` with `tracing::info!` with fields. [#291]: https://github.com/stackabletech/listener-operator/pull/291 +[#299]: https://github.com/stackabletech/listener-operator/pull/299 ## [25.3.0] - 2025-03-21 From ba1f68e6672569875ee815a51f7c93f08c391d9a Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 22 Apr 2025 16:55:51 +0200 Subject: [PATCH 3/4] chore: make regenerate-nix --- Cargo.nix | 525 ++++++++++++++++++++++++++-------------------- crate-hashes.json | 12 +- 2 files changed, 300 insertions(+), 237 deletions(-) diff --git a/Cargo.nix b/Cargo.nix index b0d84e5..a86bbeb 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -1565,6 +1565,25 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; + "convert_case" = rec { + crateName = "convert_case"; + version = "0.8.0"; + edition = "2021"; + sha256 = "17zqy79xlr1n7nc0n1mlnw5qpp8l2nbxrk13jixrhlavrbna1ams"; + authors = [ + "rutrum " + ]; + dependencies = [ + { + name = "unicode-segmentation"; + packageId = "unicode-segmentation"; + } + ]; + features = { + "rand" = [ "dep:rand" ]; + "random" = [ "rand" ]; + }; + }; "core-foundation 0.10.0" = rec { crateName = "core-foundation"; version = "0.10.0"; @@ -2903,216 +2922,6 @@ rec { }; resolvedDefaultFeatures = [ "read" "read-core" ]; }; - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#stackable-telemetry@0.5.0" = rec { - crateName = "stackable-telemetry"; - version = "0.5.0"; - edition = "2024"; - workspace_member = null; - src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "26b2cee294e0fdc468133a1eafb11fafe3d50f8e"; - sha256 = "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8"; - }; - libName = "stackable_telemetry"; - authors = [ - "Stackable GmbH " - ]; - dependencies = [ - { - name = "axum"; - packageId = "axum 0.8.3"; - } - { - name = "clap"; - packageId = "clap"; - optional = true; - features = [ "derive" "cargo" "env" ]; - } - { - name = "futures-util"; - packageId = "futures-util"; - } - { - name = "opentelemetry"; - packageId = "opentelemetry"; - features = [ "logs" ]; - } - { - name = "opentelemetry-appender-tracing"; - packageId = "opentelemetry-appender-tracing"; - } - { - name = "opentelemetry-otlp"; - packageId = "opentelemetry-otlp"; - features = [ "grpc-tonic" "gzip-tonic" "logs" ]; - } - { - name = "opentelemetry_sdk"; - packageId = "opentelemetry_sdk"; - features = [ "rt-tokio" "logs" "rt-tokio" "spec_unstable_logs_enabled" ]; - } - { - name = "pin-project"; - packageId = "pin-project"; - } - { - name = "snafu"; - packageId = "snafu 0.8.5"; - } - { - name = "strum"; - packageId = "strum"; - features = [ "derive" ]; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "macros" "rt-multi-thread" "fs" ]; - } - { - name = "tower"; - packageId = "tower 0.5.2"; - features = [ "util" ]; - } - { - name = "tracing"; - packageId = "tracing"; - } - { - name = "tracing-appender"; - packageId = "tracing-appender"; - } - { - name = "tracing-opentelemetry"; - packageId = "tracing-opentelemetry"; - } - { - name = "tracing-subscriber"; - packageId = "tracing-subscriber"; - features = [ "env-filter" "json" "env-filter" ]; - } - ]; - devDependencies = [ - { - name = "tokio"; - packageId = "tokio"; - features = [ "macros" "rt-multi-thread" "fs" ]; - } - { - name = "tracing-opentelemetry"; - packageId = "tracing-opentelemetry"; - } - ]; - features = { - "clap" = [ "dep:clap" ]; - }; - resolvedDefaultFeatures = [ "clap" ]; - }; - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.5.0#stackable-telemetry@0.5.0" = rec { - crateName = "stackable-telemetry"; - version = "0.5.0"; - edition = "2024"; - workspace_member = null; - src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "26b2cee294e0fdc468133a1eafb11fafe3d50f8e"; - sha256 = "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8"; - }; - libName = "stackable_telemetry"; - authors = [ - "Stackable GmbH " - ]; - dependencies = [ - { - name = "axum"; - packageId = "axum 0.8.3"; - } - { - name = "clap"; - packageId = "clap"; - optional = true; - features = [ "derive" "cargo" "env" ]; - } - { - name = "futures-util"; - packageId = "futures-util"; - } - { - name = "opentelemetry"; - packageId = "opentelemetry"; - features = [ "logs" ]; - } - { - name = "opentelemetry-appender-tracing"; - packageId = "opentelemetry-appender-tracing"; - } - { - name = "opentelemetry-otlp"; - packageId = "opentelemetry-otlp"; - features = [ "grpc-tonic" "gzip-tonic" "logs" ]; - } - { - name = "opentelemetry_sdk"; - packageId = "opentelemetry_sdk"; - features = [ "rt-tokio" "logs" "rt-tokio" "spec_unstable_logs_enabled" ]; - } - { - name = "pin-project"; - packageId = "pin-project"; - } - { - name = "snafu"; - packageId = "snafu 0.8.5"; - } - { - name = "strum"; - packageId = "strum"; - features = [ "derive" ]; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "macros" "rt-multi-thread" "fs" ]; - } - { - name = "tower"; - packageId = "tower 0.5.2"; - features = [ "util" ]; - } - { - name = "tracing"; - packageId = "tracing"; - } - { - name = "tracing-appender"; - packageId = "tracing-appender"; - } - { - name = "tracing-opentelemetry"; - packageId = "tracing-opentelemetry"; - } - { - name = "tracing-subscriber"; - packageId = "tracing-subscriber"; - features = [ "env-filter" "json" "env-filter" ]; - } - ]; - devDependencies = [ - { - name = "tokio"; - packageId = "tokio"; - features = [ "macros" "rt-multi-thread" "fs" ]; - } - { - name = "tracing-opentelemetry"; - packageId = "tracing-opentelemetry"; - } - ]; - features = { - "clap" = [ "dep:clap" ]; - }; - resolvedDefaultFeatures = [ "clap" ]; - }; "git2" = rec { crateName = "git2"; version = "0.20.0"; @@ -4893,6 +4702,40 @@ rec { }; resolvedDefaultFeatures = [ "schemars" "v1_32" ]; }; + "k8s-version" = rec { + crateName = "k8s-version"; + version = "0.1.2"; + edition = "2024"; + workspace_member = null; + src = pkgs.fetchgit { + url = "https://github.com/stackabletech/operator-rs.git"; + rev = "5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1"; + sha256 = "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw"; + }; + libName = "k8s_version"; + authors = [ + "Stackable GmbH " + ]; + dependencies = [ + { + name = "darling"; + packageId = "darling"; + optional = true; + } + { + name = "regex"; + packageId = "regex"; + } + { + name = "snafu"; + packageId = "snafu 0.8.5"; + } + ]; + features = { + "darling" = [ "dep:darling" ]; + }; + resolvedDefaultFeatures = [ "darling" ]; + }; "kube" = rec { crateName = "kube"; version = "0.99.0"; @@ -8986,11 +8829,6 @@ rec { name = "futures"; packageId = "futures"; } - { - name = "stackable-telemetry"; - packageId = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.5.0#stackable-telemetry@0.5.0"; - features = [ "clap" ]; - } { name = "h2"; packageId = "h2"; @@ -9023,6 +8861,7 @@ rec { { name = "stackable-operator"; packageId = "stackable-operator"; + features = [ "telemetry" "versioned" ]; } { name = "strum"; @@ -9085,11 +8924,6 @@ rec { name = "clap"; packageId = "clap"; } - { - name = "stackable-telemetry"; - packageId = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.5.0#stackable-telemetry@0.5.0"; - features = [ "clap" ]; - } { name = "serde"; packageId = "serde"; @@ -9105,6 +8939,7 @@ rec { { name = "stackable-operator"; packageId = "stackable-operator"; + features = [ "telemetry" "versioned" ]; } { name = "tokio"; @@ -9131,13 +8966,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.91.0"; + version = "0.92.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "26b2cee294e0fdc468133a1eafb11fafe3d50f8e"; - sha256 = "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8"; + rev = "5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1"; + sha256 = "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw"; }; libName = "stackable_operator"; authors = [ @@ -9180,11 +9015,6 @@ rec { name = "futures"; packageId = "futures"; } - { - name = "stackable-telemetry"; - packageId = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#stackable-telemetry@0.5.0"; - features = [ "clap" ]; - } { name = "indexmap"; packageId = "indexmap 2.7.1"; @@ -9247,6 +9077,16 @@ rec { name = "stackable-shared"; packageId = "stackable-shared"; } + { + name = "stackable-telemetry"; + packageId = "stackable-telemetry"; + features = [ "clap" ]; + } + { + name = "stackable-versioned"; + packageId = "stackable-versioned"; + features = [ "k8s" ]; + } { name = "strum"; packageId = "strum"; @@ -9277,8 +9117,11 @@ rec { } ]; features = { + "default" = [ "telemetry" "versioned" ]; + "full" = [ "time" "telemetry" "versioned" ]; "time" = [ "dep:time" ]; }; + resolvedDefaultFeatures = [ "default" "telemetry" "versioned" ]; }; "stackable-operator-derive" = rec { crateName = "stackable-operator-derive"; @@ -9287,8 +9130,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "26b2cee294e0fdc468133a1eafb11fafe3d50f8e"; - sha256 = "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8"; + rev = "5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1"; + sha256 = "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -9322,8 +9165,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "26b2cee294e0fdc468133a1eafb11fafe3d50f8e"; - sha256 = "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8"; + rev = "5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1"; + sha256 = "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw"; }; libName = "stackable_shared"; authors = [ @@ -9356,6 +9199,211 @@ rec { ]; }; + "stackable-telemetry" = rec { + crateName = "stackable-telemetry"; + version = "0.6.0"; + edition = "2024"; + workspace_member = null; + src = pkgs.fetchgit { + url = "https://github.com/stackabletech/operator-rs.git"; + rev = "5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1"; + sha256 = "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw"; + }; + libName = "stackable_telemetry"; + authors = [ + "Stackable GmbH " + ]; + dependencies = [ + { + name = "axum"; + packageId = "axum 0.8.3"; + } + { + name = "clap"; + packageId = "clap"; + optional = true; + features = [ "derive" "cargo" "env" ]; + } + { + name = "futures-util"; + packageId = "futures-util"; + } + { + name = "opentelemetry"; + packageId = "opentelemetry"; + features = [ "logs" ]; + } + { + name = "opentelemetry-appender-tracing"; + packageId = "opentelemetry-appender-tracing"; + } + { + name = "opentelemetry-otlp"; + packageId = "opentelemetry-otlp"; + features = [ "grpc-tonic" "gzip-tonic" "logs" ]; + } + { + name = "opentelemetry_sdk"; + packageId = "opentelemetry_sdk"; + features = [ "rt-tokio" "logs" "rt-tokio" "spec_unstable_logs_enabled" ]; + } + { + name = "pin-project"; + packageId = "pin-project"; + } + { + name = "snafu"; + packageId = "snafu 0.8.5"; + } + { + name = "strum"; + packageId = "strum"; + features = [ "derive" ]; + } + { + name = "tokio"; + packageId = "tokio"; + features = [ "macros" "rt-multi-thread" "fs" ]; + } + { + name = "tower"; + packageId = "tower 0.5.2"; + features = [ "util" ]; + } + { + name = "tracing"; + packageId = "tracing"; + } + { + name = "tracing-appender"; + packageId = "tracing-appender"; + } + { + name = "tracing-opentelemetry"; + packageId = "tracing-opentelemetry"; + } + { + name = "tracing-subscriber"; + packageId = "tracing-subscriber"; + features = [ "env-filter" "json" "env-filter" ]; + } + ]; + devDependencies = [ + { + name = "tokio"; + packageId = "tokio"; + features = [ "macros" "rt-multi-thread" "fs" ]; + } + { + name = "tracing-opentelemetry"; + packageId = "tracing-opentelemetry"; + } + ]; + features = { + "clap" = [ "dep:clap" ]; + }; + resolvedDefaultFeatures = [ "clap" ]; + }; + "stackable-versioned" = rec { + crateName = "stackable-versioned"; + version = "0.7.1"; + edition = "2024"; + workspace_member = null; + src = pkgs.fetchgit { + url = "https://github.com/stackabletech/operator-rs.git"; + rev = "5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1"; + sha256 = "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw"; + }; + libName = "stackable_versioned"; + authors = [ + "Stackable GmbH " + ]; + dependencies = [ + { + name = "stackable-versioned-macros"; + packageId = "stackable-versioned-macros"; + } + ]; + features = { + "full" = [ "k8s" ]; + "k8s" = [ "stackable-versioned-macros/k8s" ]; + }; + resolvedDefaultFeatures = [ "k8s" ]; + }; + "stackable-versioned-macros" = rec { + crateName = "stackable-versioned-macros"; + version = "0.7.1"; + edition = "2024"; + workspace_member = null; + src = pkgs.fetchgit { + url = "https://github.com/stackabletech/operator-rs.git"; + rev = "5fdc47a10de685e4eea49fd0a3f6c3a15a4966c1"; + sha256 = "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw"; + }; + procMacro = true; + libName = "stackable_versioned_macros"; + authors = [ + "Stackable GmbH " + ]; + dependencies = [ + { + name = "convert_case"; + packageId = "convert_case"; + } + { + name = "darling"; + packageId = "darling"; + } + { + name = "itertools"; + packageId = "itertools"; + } + { + name = "k8s-openapi"; + packageId = "k8s-openapi"; + optional = true; + usesDefaultFeatures = false; + features = [ "schemars" "v1_32" ]; + } + { + name = "k8s-version"; + packageId = "k8s-version"; + features = [ "darling" ]; + } + { + name = "kube"; + packageId = "kube"; + optional = true; + usesDefaultFeatures = false; + features = [ "client" "jsonpatch" "runtime" "derive" "rustls-tls" "ring" ]; + } + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.99"; + } + ]; + devDependencies = [ + { + name = "k8s-openapi"; + packageId = "k8s-openapi"; + usesDefaultFeatures = false; + features = [ "schemars" "v1_32" ]; + } + ]; + features = { + "full" = [ "k8s" ]; + "k8s" = [ "dep:kube" "dep:k8s-openapi" ]; + }; + resolvedDefaultFeatures = [ "k8s" ]; + }; "strsim" = rec { crateName = "strsim"; version = "0.11.1"; @@ -11225,6 +11273,19 @@ rec { ]; }; + "unicode-segmentation" = rec { + crateName = "unicode-segmentation"; + version = "1.12.0"; + edition = "2018"; + sha256 = "14qla2jfx74yyb9ds3d2mpwpa4l4lzb9z57c6d2ba511458z5k7n"; + libName = "unicode_segmentation"; + authors = [ + "kwantam " + "Manish Goregaokar " + ]; + features = { + }; + }; "unicode-xid" = rec { crateName = "unicode-xid"; version = "0.2.6"; diff --git a/crate-hashes.json b/crate-hashes.json index 4a1e05d..9dcf61e 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,8 +1,10 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#stackable-operator-derive@0.3.1": "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#stackable-operator@0.91.0": "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#stackable-shared@0.0.1": "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.91.0#stackable-telemetry@0.5.0": "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.5.0#stackable-telemetry@0.5.0": "0lwa2n85x2x9bmyb5dgcychan6frv7nj3kfl2qah22sp8m21alw8", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#k8s-version@0.1.2": "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#stackable-operator-derive@0.3.1": "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#stackable-operator@0.92.0": "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#stackable-shared@0.0.1": "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#stackable-telemetry@0.6.0": "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#stackable-versioned-macros@0.7.1": "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.92.0#stackable-versioned@0.7.1": "0li9smdrz7danqz17lfkl0j9zl2i84csgc7d01lxs5qi8jcs9fzw", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file From 3afd9780c959483cda542018d48d0c3d993203a9 Mon Sep 17 00:00:00 2001 From: Nick <10092581+NickLarsenNZ@users.noreply.github.com> Date: Tue, 22 Apr 2025 17:14:22 +0200 Subject: [PATCH 4/4] Apply suggestions from code review --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a29849..a11d9b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file. - Adds new telemetry CLI arguments and environment variables ([#299]). - Use `--file-log-max-files` (or `FILE_LOG_MAX_FILES`) to limit the number of log files kept. - - The file log rotation period is now configurable via `FILE_LOG_ROTATION_PERIOD`. + - Use `--file-log-rotation-period` (or `FILE_LOG_ROTATION_PERIOD`) to configure the frequency of rotation. - Use `--console-log-format` (or `CONSOLE_LOG_FORMAT`) to set the format to `plain` (default) or `json`. ### Changed