fix(native): Init logger earlier without javascript side (silient errors) (#7228)

Author: ovr

packages/cubejs-backend-native/Cargo.lock

@@ -28,6 +28,7 @@ libc = "0.2"
 findshlibs = "0.10.2"
 convert_case = "0.6.0"
 minijinja = { version = "1", features = ["json", "loader"] }
+log-reroute = "0.1"
 # python
 pyo3 = { version = "0.19", features = [], optional = true }
 pyo3-asyncio = { version = "0.19", features = ["tokio-runtime", "attributes"], optional = true }

packages/cubejs-backend-native/Cargo.toml

@@ -20,6 +20,7 @@ use std::sync::Arc;
 use crate::cross::CLRepr;
 use auth::NodeBridgeAuthService;
 use config::NodeConfig;
+use cubesql::telemetry::LocalReporter;
 use cubesql::{config::CubeServices, telemetry::ReportingLogger, CubeError};
 use log::Level;
 use logger::NodeBridgeLogger;
@@ -58,6 +59,15 @@ fn tokio_runtime() -> Result<&'static Runtime, CubeError> {
     })
 }
 
+fn create_logger(log_level: log::Level) -> SimpleLogger {
+    SimpleLogger::new()
+        .with_level(Level::Error.to_level_filter())
+        .with_module_level("cubesql", log_level.to_level_filter())
+        .with_module_level("cubejs_native", log_level.to_level_filter())
+        .with_module_level("datafusion", Level::Warn.to_level_filter())
+        .with_module_level("pg_srv", Level::Warn.to_level_filter())
+}
+
 fn setup_logger(mut cx: FunctionContext) -> JsResult<JsUndefined> {
     let options = cx.argument::<JsObject>(0)?;
     let cube_logger = options
@@ -80,15 +90,10 @@ fn setup_logger(mut cx: FunctionContext) -> JsResult<JsUndefined> {
         Level::Trace
     };
 
-    let logger = SimpleLogger::new()
-        .with_level(Level::Error.to_level_filter())
-        .with_module_level("cubesql", log_level.to_level_filter())
-        .with_module_level("cubejs_native", log_level.to_level_filter())
-        .with_module_level("datafusion", Level::Warn.to_level_filter())
-        .with_module_level("pg_srv", Level::Warn.to_level_filter());
+    let logger = create_logger(log_level);
+    log_reroute::reroute_boxed(Box::new(logger));
 
     ReportingLogger::init(
-        Box::new(logger),
         Box::new(NodeBridgeLogger::new(cx.channel(), cube_logger)),
         log_level.to_level_filter(),
     )
@@ -222,6 +227,18 @@ fn debug_js_to_clrepr_to_js(mut cx: FunctionContext) -> JsResult<JsValue> {
 
 #[neon::main]
 fn main(mut cx: ModuleContext) -> NeonResult<()> {
+    // We use log_rerouter to swap logger, because we init logger from js side in api-gateway
+    log_reroute::init().unwrap();
+
+    let logger = Box::new(create_logger(Level::Error));
+    log_reroute::reroute_boxed(logger);
+
+    ReportingLogger::init(
+        Box::new(LocalReporter::new()),
+        Level::Error.to_level_filter(),
+    )
+    .unwrap();
+
     cx.export_function("setupLogger", setup_logger)?;
     cx.export_function("registerInterface", register_interface)?;
     cx.export_function("shutdownInterface", shutdown_interface)?;

packages/cubejs-backend-native/src/lib.rs

@@ -9,6 +9,7 @@ documentation = "https://cube.dev/docs"
 homepage = "https://cube.dev"
 
 [dependencies]
+arc-swap = "1"
 datafusion = { git = 'https://github.com/cube-js/arrow-datafusion.git', rev = "be967a63967f23bdd946a45925d07af0a11dcc39", default-features = false, features = ["regex_expressions", "unicode_expressions"] }
 anyhow = "1.0"
 thiserror = "1.0"

rust/cubesql/Cargo.lock

@@ -43,12 +43,9 @@ fn main() {
         .with_module_level("datafusion", Level::Warn.to_level_filter())
         .with_module_level("pg_srv", Level::Warn.to_level_filter());
 
-    ReportingLogger::init(
-        Box::new(logger),
-        Box::new(LocalReporter::new()),
-        log_level.to_level_filter(),
-    )
-    .unwrap();
+    log::set_boxed_logger(Box::new(logger)).unwrap();
+
+    ReportingLogger::init(Box::new(LocalReporter::new()), log_level.to_level_filter()).unwrap();
 
     rt.block_on(async {
         let mut runner = TestsRunner::new();

rust/cubesql/cubesql/Cargo.toml

@@ -31,12 +31,8 @@ fn main() {
 
     // console_subscriber::init();
 
-    ReportingLogger::init(
-        Box::new(logger),
-        Box::new(LocalReporter::new()),
-        log_level.to_level_filter(),
-    )
-    .unwrap();
+    log::set_boxed_logger(Box::new(logger)).unwrap();
+    ReportingLogger::init(Box::new(LocalReporter::new()), log_level.to_level_filter()).unwrap();
 
     let config = Config::default();
 

rust/cubesql/cubesql/e2e/main.rs

@@ -1,13 +1,11 @@
 use crate::{sql::SessionState, CubeError};
-use log::{Level, LevelFilter, Log};
-use std::{
-    collections::HashMap,
-    fmt::Debug,
-    sync::{Arc, RwLock},
-};
+use arc_swap::ArcSwap;
+use log::{Level, LevelFilter};
+use std::{collections::HashMap, fmt::Debug, sync::Arc};
 
 lazy_static! {
-    static ref REPORTER: RwLock<Box<dyn LogReporter>> = RwLock::new(Box::new(LocalReporter::new()));
+    static ref REPORTER: ArcSwap<Box<dyn LogReporter>> =
+        ArcSwap::from_pointee(Box::new(LocalReporter::new()));
 }
 
 pub trait LogReporter: Send + Sync + Debug {
@@ -37,23 +35,18 @@ impl LogReporter for LocalReporter {
 pub struct ReportingLogger {}
 
 impl ReportingLogger {
-    pub fn init(
-        logger: Box<dyn Log>,
-        reporter: Box<dyn LogReporter>,
-        max_level: LevelFilter,
-    ) -> Result<(), CubeError> {
-        let mut guard = REPORTER
-            .write()
-            .expect("failed to unlock REPORTER for writing");
-        *guard = reporter;
-
-        log::set_boxed_logger(logger)?;
+    pub fn init(reporter: Box<dyn LogReporter>, max_level: LevelFilter) -> Result<(), CubeError> {
+        REPORTER.swap(Arc::new(reporter));
         log::set_max_level(max_level);
 
         Ok(())
     }
 }
 
+pub fn set_reporter(reporter: Box<dyn LogReporter>) {
+    REPORTER.swap(Arc::new(reporter));
+}
+
 pub trait ContextLogger: Send + Sync + Debug {
     fn error(&self, message: &str, props: Option<HashMap<String, String>>);
 }
@@ -93,9 +86,7 @@ impl ContextLogger for SessionLogger {
 }
 
 fn report(event: String, properties: HashMap<String, String>, level: Level) -> bool {
-    let guard = REPORTER
-        .read()
-        .expect("failed to unlock REPORTER for reading");
+    let guard = REPORTER.load();
     if !guard.is_active() {
         return false;
     }