[pull] master from cube-js:master

packages/cubejs-api-gateway/src/sql-server.ts

@@ -47,7 +47,8 @@ export class SQLServer {
   ) {
     setupLogger(
       ({ event }) => apiGateway.log(event),
-      process.env.CUBEJS_LOG_LEVEL === 'trace' ? 'trace' : 'warn'
+      process.env.CUBEJS_LOG_LEVEL === 'trace' ? 'trace' : 'warn',
+      process.env.NODE_ENV === 'production'
     );
 
     // Actually, proxy is enabled in gateway

packages/cubejs-backend-native/Cargo.toml

@@ -44,7 +44,7 @@ serde_json = "1.0.127"
 simple_logger = "1.7.0"
 tokio = { version = "1", features = ["full", "rt"] }
 uuid = { version = "1", features = ["v4"] }
-log_nonblock = { version = "0.1.6", optional = true }
+log_nonblock = { version = "0.1.7", features = ["json"], optional = true }
 
 [dependencies.neon]
 version = "=1"

packages/cubejs-backend-native/js/index.ts

@@ -353,9 +353,9 @@ function wrapNativeFunctionWithStream(
 
 type LogLevel = 'error' | 'warn' | 'info' | 'debug' | 'trace';
 
-export const setupLogger = (logger: (extra: any) => unknown, logLevel: LogLevel): void => {
+export const setupLogger = (logger: (extra: any) => unknown, logLevel: LogLevel, prodLogger: boolean = false): void => {
   const native = loadNative();
-  native.setupLogger({ logger: wrapNativeFunctionWithChannelCallback(logger), logLevel });
+  native.setupLogger({ logger: wrapNativeFunctionWithChannelCallback(logger), logLevel, prodLogger });
 };
 
 /// Reset local to default implementation, which uses STDOUT

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

@@ -601,7 +601,16 @@ pub fn setup_logger(mut cx: FunctionContext) -> JsResult<JsUndefined> {
     let log_level_handle = options.get_value(&mut cx, "logLevel")?;
     let log_level = get_log_level_from_variable(log_level_handle, &mut cx)?;
 
-    let logger = create_logger(log_level);
+    let prod_logger_handle = options.get_value(&mut cx, "prodLogger")?;
+    let prod_logger = if prod_logger_handle.is_a::<JsBoolean, _>(&mut cx) {
+        prod_logger_handle
+            .downcast_or_throw::<JsBoolean, _>(&mut cx)?
+            .value(&mut cx)
+    } else {
+        false
+    };
+
+    let logger = create_logger(log_level, prod_logger);
     log_reroute::reroute_boxed(Box::new(logger));
 
     ReportingLogger::init(
@@ -614,7 +623,7 @@ pub fn setup_logger(mut cx: FunctionContext) -> JsResult<JsUndefined> {
 }
 
 #[cfg(not(feature = "async-log"))]
-pub fn create_logger(log_level: log::Level) -> Box<dyn log::Log> {
+pub fn create_logger(log_level: log::Level, _prod_logger: bool) -> Box<dyn log::Log> {
     let logger = SimpleLogger::new()
         .with_level(log::Level::Error.to_level_filter())
         .with_module_level("cubesql", log_level.to_level_filter())
@@ -628,23 +637,27 @@ pub fn create_logger(log_level: log::Level) -> Box<dyn log::Log> {
 }
 
 #[cfg(feature = "async-log")]
-pub fn create_logger(log_level: log::Level) -> Box<dyn log::Log> {
-    let logger = NonBlockingLoggerBuilder::new()
+pub fn create_logger(log_level: log::Level, prod_logger: bool) -> Box<dyn log::Log> {
+    let builder = NonBlockingLoggerBuilder::new()
         .with_level(log::Level::Error.to_level_filter())
         .with_module_level("cubesql", log_level.to_level_filter())
         .with_module_level("cube_xmla", log_level.to_level_filter())
         .with_module_level("cube_xmla_engine", log_level.to_level_filter())
         .with_module_level("cubejs_native", log_level.to_level_filter())
         .with_module_level("datafusion", log::Level::Warn.to_level_filter())
-        .with_module_level("pg_srv", log::Level::Warn.to_level_filter())
-        .build()
-        .unwrap();
+        .with_module_level("pg_srv", log::Level::Warn.to_level_filter());
+
+    let logger = if prod_logger {
+        builder.with_json().build().unwrap()
+    } else {
+        builder.build().unwrap()
+    };
 
     Box::new(logger)
 }
 
 pub fn setup_local_logger(log_level: log::Level) {
-    let logger = create_logger(log_level);
+    let logger = create_logger(log_level, false);
     log_reroute::reroute_boxed(Box::new(logger));
 
     ReportingLogger::init(

packages/cubejs-backend-native/test/cross.test.ts

@@ -1,6 +1,6 @@
 import { loadNative, setupLogger } from '../js';
 
-setupLogger(({ event }) => console.log(event), 'trace');
+setupLogger(({ event }) => console.log(event), 'trace', false);
 
 describe('Cross language representation (CLR)', () => {
   it('all types', async () => {

packages/cubejs-backend-native/test/python.ts

@@ -7,6 +7,7 @@ import * as native from '../js';
   native.setupLogger(
     ({ event }) => console.log(event),
     'trace',
+    false
   );
 
   const content = await fs.readFile(path.join(process.cwd(), 'test', 'config.py'), 'utf8');

packages/cubejs-backend-native/test/python_async_bench.ts

@@ -7,6 +7,7 @@ import * as native from '../js';
   native.setupLogger(
     ({ event }) => console.log(event),
     'trace',
+    false,
   );
 
   const content = await fs.readFile(path.join(process.cwd(), 'test', 'config.py'), 'utf8');

packages/cubejs-backend-native/test/server.js

@@ -116,6 +116,7 @@ const meta_fixture = require('./meta');
   native.setupLogger(
     ({ event }) => console.log(event),
     'trace',
+    false,
   );
 
   const server = await native.registerInterface({