Skip to content

Commit 4c3e3df

Browse files
committed
chore: Make telemetry changes consistent with the other operators
1 parent 5304ca0 commit 4c3e3df

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ edition = "2021"
1010
repository = "https://github.com/stackabletech/druid-operator"
1111

1212
[workspace.dependencies]
13-
stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.7.1" }
14-
stackable-telemetry = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-telemetry-0.4.0" }
15-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.89.1" }
1613
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
14+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.89.1" }
15+
stackable-telemetry = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-telemetry-0.4.0" }
16+
stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.7.1" }
1717

1818
anyhow = "1.0"
1919
built = { version = "0.7", features = ["chrono", "git2"] }

rust/operator-binary/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ repository.workspace = true
99
publish = false
1010

1111
[dependencies]
12-
stackable-versioned.workspace = true
13-
stackable-telemetry.workspace = true
14-
stackable-operator.workspace = true
1512
product-config.workspace = true
13+
stackable-operator.workspace = true
14+
stackable-telemetry.workspace = true
15+
stackable-versioned.workspace = true
1616

1717
anyhow.workspace = true
1818
clap.workspace = true

rust/operator-binary/src/main.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ mod built_info {
4040
include!(concat!(env!("OUT_DIR"), "/built.rs"));
4141
}
4242

43+
// TODO (@NickLarsenNZ): Change the variable to `CONSOLE_LOG`
44+
pub const ENV_VAR_CONSOLE_LOG: &str = "DRUID_OPERATOR_LOG";
45+
4346
#[derive(Parser)]
4447
#[clap(about, author)]
4548
struct Opts {
@@ -63,8 +66,7 @@ async fn main() -> anyhow::Result<()> {
6366
// TODO (@Techassi): This should be a constant
6467
.service_name("druid-operator")
6568
.with_console_output((
66-
// TODO (@Techassi): Change to CONSOLE_LOG, create constant
67-
"DRUID_OPERATOR_LOG",
69+
ENV_VAR_CONSOLE_LOG,
6870
LevelFilter::INFO,
6971
!telemetry_arguments.no_console_output,
7072
))
@@ -81,7 +83,7 @@ async fn main() -> anyhow::Result<()> {
8183

8284
Settings::builder()
8385
// TODO (@Techassi): Change to CONSOLE_LOG or FILE_LOG, create constant
84-
.with_environment_variable("DRUID_OPERATOR_LOG")
86+
.with_environment_variable(ENV_VAR_CONSOLE_LOG)
8587
.with_default_level(LevelFilter::INFO)
8688
.file_log_settings_builder(log_directory, "tracing-rs.log")
8789
.with_rotation_period(rotation_period)

0 commit comments

Comments
 (0)