Skip to content

Commit 50aca84

Browse files
committed
chore: Make telemetry changes consistent with the other operators
1 parent 86fa881 commit 50aca84

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/hbase-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
@@ -39,6 +39,9 @@ mod built_info {
3939

4040
const OPERATOR_NAME: &str = "hbase.stackable.com";
4141

42+
// TODO (@NickLarsenNZ): Change the variable to `CONSOLE_LOG`
43+
pub const ENV_VAR_CONSOLE_LOG: &str = "HBASE_OPERATOR_LOG";
44+
4245
#[derive(Parser)]
4346
#[clap(about, author)]
4447
struct Opts {
@@ -64,8 +67,7 @@ async fn main() -> anyhow::Result<()> {
6467
// TODO (@Techassi): This should be a constant
6568
.service_name("hbase-operator")
6669
.with_console_output((
67-
// TODO (@Techassi): Change to CONSOLE_LOG, create constant
68-
"HBASE_OPERATOR_LOG",
70+
ENV_VAR_CONSOLE_LOG,
6971
LevelFilter::INFO,
7072
!telemetry_arguments.no_console_output,
7173
))
@@ -82,7 +84,7 @@ async fn main() -> anyhow::Result<()> {
8284

8385
Settings::builder()
8486
// TODO (@Techassi): Change to CONSOLE_LOG or FILE_LOG, create constant
85-
.with_environment_variable("HBASE_OPERATOR_LOG")
87+
.with_environment_variable(ENV_VAR_CONSOLE_LOG)
8688
.with_default_level(LevelFilter::INFO)
8789
.file_log_settings_builder(log_directory, "tracing-rs.log")
8890
.with_rotation_period(rotation_period)

0 commit comments

Comments
 (0)