@@ -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
3228use crate :: crd:: { DruidCluster , OPERATOR_NAME , v1alpha1} ;
3329
@@ -67,44 +63,12 @@ async fn main() -> anyhow::Result<()> {
6763 telemetry_arguments,
6864 cluster_info_opts,
6965 } ) => {
70- let _tracing_guard = Tracing :: builder ( )
71- // TODO (@Techassi): This should be a constant
72- . service_name ( "druid-operator" )
73- . with_console_output ( (
74- ENV_VAR_CONSOLE_LOG ,
75- LevelFilter :: INFO ,
76- !telemetry_arguments. no_console_output ,
77- ) )
78- // NOTE (@Techassi): Before stackable-telemetry was used, the log directory was
79- // set via an env: `DRUID_OPERATOR_LOG_DIRECTORY`.
80- // See: https://github.com/stackabletech/operator-rs/blob/f035997fca85a54238c8de895389cc50b4d421e2/crates/stackable-operator/src/logging/mod.rs#L40
81- // Now it will be `ROLLING_LOGS` (or via `--rolling-logs <DIRECTORY>`).
82- . with_file_output ( telemetry_arguments. rolling_logs . map ( |log_directory| {
83- let rotation_period = telemetry_arguments
84- . rolling_logs_period
85- . unwrap_or ( RollingPeriod :: Hourly )
86- . clone ( ) ;
87-
88- Settings :: builder ( )
89- // TODO (@Techassi): Change to CONSOLE_LOG or FILE_LOG, create constant
90- . with_environment_variable ( ENV_VAR_CONSOLE_LOG )
91- . with_default_level ( LevelFilter :: INFO )
92- . file_log_settings_builder ( log_directory, "tracing-rs.json" )
93- . with_rotation_period ( rotation_period)
94- . build ( )
95- } ) )
96- . with_otlp_log_exporter ( (
97- "OTLP_LOG" ,
98- LevelFilter :: DEBUG ,
99- telemetry_arguments. otlp_logs ,
100- ) )
101- . with_otlp_trace_exporter ( (
102- "OTLP_TRACE" ,
103- LevelFilter :: DEBUG ,
104- telemetry_arguments. otlp_traces ,
105- ) )
106- . build ( )
107- . init ( ) ?;
66+ // NOTE (@NickLarsenNZ): Before stackable-telemetry was used:
67+ // - The console log level was set by `DRUID_OPERATOR_LOG`, and is now `CONSOLE_LOG` (when using Tracing::pre_configured).
68+ // - The file log level was set by `DRUID_OPERATOR_LOG`, and is now set via `FILE_LOG` (when using Tracing::pre_configured).
69+ // - The file log directory was set by `DRUID_OPERATOR_LOG_DIRECTORY`, and is now set by `ROLLING_LOGS_DIR` (or via `--rolling-logs <DIRECTORY>`).
70+ let _tracing_guard =
71+ Tracing :: pre_configured ( built_info:: PKG_NAME , telemetry_arguments) . init ( ) ?;
10872
10973 tracing:: info!(
11074 built_info. pkg_version = built_info:: PKG_VERSION ,
0 commit comments