Skip to content

Commit 39f7bb8

Browse files
committed
feat!: Use Tracing::pre_configured from stackable-telemetry
BREAKING: The console log level, file log level and directory variables have been changed
1 parent 5e686cf commit 39f7bb8

1 file changed

Lines changed: 7 additions & 42 deletions

File tree

rust/operator-binary/src/main.rs

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ use stackable_operator::{
2222
},
2323
logging::controller::report_controller_reconciled,
2424
shared::yaml::SerializeOptions,
25-
telemetry::{
26-
Tracing,
27-
tracing::{RollingPeriod, settings::Settings},
28-
},
25+
telemetry::Tracing,
2926
};
30-
use tracing::level_filters::LevelFilter;
3127

3228
use crate::{
3329
airflow_controller::AIRFLOW_FULL_CONTROLLER_NAME,
@@ -72,43 +68,12 @@ async fn main() -> anyhow::Result<()> {
7268
telemetry_arguments,
7369
cluster_info_opts,
7470
}) => {
75-
let _tracing_guard = Tracing::builder()
76-
// TODO (@Techassi): This should be a constant
77-
.service_name("airflow-operator")
78-
.with_console_output((
79-
ENV_VAR_CONSOLE_LOG,
80-
LevelFilter::INFO,
81-
!telemetry_arguments.no_console_output,
82-
))
83-
// note, before, log dir was set via an env: `AIRFLOW_OPERATOR_LOG_DIRECTORY`.
84-
// See: https://github.com/stackabletech/operator-rs/blob/f035997fca85a54238c8de895389cc50b4d421e2/crates/stackable-operator/src/logging/mod.rs#L40
85-
// Now it will be `ROLLING_LOGS` (or via `--rolling-logs <DIRECTORY>`)
86-
.with_file_output(telemetry_arguments.rolling_logs.map(|log_directory| {
87-
let rotation_period = telemetry_arguments
88-
.rolling_logs_period
89-
.unwrap_or(RollingPeriod::Hourly)
90-
.clone();
91-
92-
Settings::builder()
93-
// TODO (@Techassi): Change to CONSOLE_LOG or FILE_LOG, create constant
94-
.with_environment_variable(ENV_VAR_CONSOLE_LOG)
95-
.with_default_level(LevelFilter::INFO)
96-
.file_log_settings_builder(log_directory, "tracing-rs.json")
97-
.with_rotation_period(rotation_period)
98-
.build()
99-
}))
100-
.with_otlp_log_exporter((
101-
"OTLP_LOG",
102-
LevelFilter::DEBUG,
103-
telemetry_arguments.otlp_logs,
104-
))
105-
.with_otlp_trace_exporter((
106-
"OTLP_TRACE",
107-
LevelFilter::DEBUG,
108-
telemetry_arguments.otlp_traces,
109-
))
110-
.build()
111-
.init()?;
71+
// NOTE (@NickLarsenNZ): Before stackable-telemetry was used:
72+
// - The console log level was set by `AIRFLOW_OPERATOR_LOG`, and is now `CONSOLE_LOG` (when using Tracing::pre_configured).
73+
// - The file log level was set by `AIRFLOW_OPERATOR_LOG`, and is now set via `FILE_LOG` (when using Tracing::pre_configured).
74+
// - The file log directory was set by `AIRFLOW_OPERATOR_LOG_DIRECTORY`, and is now set by `ROLLING_LOGS_DIR` (or via `--rolling-logs <DIRECTORY>`).
75+
let _tracing_guard =
76+
Tracing::pre_configured(built_info::PKG_NAME, telemetry_arguments).init()?;
11277

11378
tracing::info!(
11479
built_info.pkg_version = built_info::PKG_VERSION,

0 commit comments

Comments
 (0)