Skip to content

Commit ad8110b

Browse files
committed
chore: Make telemetry changes consistent with the other operators
1 parent d91ea3e commit ad8110b

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

Cargo.toml

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

1212
[workspace.dependencies]
13-
stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.7.1" }
13+
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
1414
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.89.1" }
1515
stackable-telemetry = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-telemetry-0.4.0" }
16-
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.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: 2 additions & 2 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
12+
product-config.workspace = true
1313
stackable-operator.workspace = true
1414
stackable-telemetry.workspace = true
15-
product-config.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
@@ -41,6 +41,9 @@ mod built_info {
4141
include!(concat!(env!("OUT_DIR"), "/built.rs"));
4242
}
4343

44+
// TODO (@NickLarsenNZ): Change the variable to `CONSOLE_LOG`
45+
pub const ENV_VAR_CONSOLE_LOG: &str = "AIRFLOW_OPERATOR_LOG";
46+
4447
#[derive(Parser)]
4548
#[clap(about, author)]
4649
struct Opts {
@@ -67,8 +70,7 @@ async fn main() -> anyhow::Result<()> {
6770
// TODO (@Techassi): This should be a constant
6871
.service_name("airflow-operator")
6972
.with_console_output((
70-
// TODO (@Techassi): Change to CONSOLE_LOG, create constant
71-
"AIRFLOW_OPERATOR_LOG",
73+
ENV_VAR_CONSOLE_LOG,
7274
LevelFilter::INFO,
7375
!telemetry_arguments.no_console_output,
7476
))
@@ -84,7 +86,7 @@ async fn main() -> anyhow::Result<()> {
8486

8587
Settings::builder()
8688
// TODO (@Techassi): Change to CONSOLE_LOG or FILE_LOG, create constant
87-
.with_environment_variable("AIRFLOW_OPERATOR_LOG")
89+
.with_environment_variable(ENV_VAR_CONSOLE_LOG)
8890
.with_default_level(LevelFilter::INFO)
8991
.file_log_settings_builder(log_directory, "tracing-rs.log")
9092
.with_rotation_period(rotation_period)

0 commit comments

Comments
 (0)