@budibase/backend-core 2.5.6-alpha.42 → 2.5.6-alpha.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.5.6-alpha.42",
+  "version": "2.5.6-alpha.44",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "2.5.6-alpha.42",
+    "@budibase/types": "2.5.6-alpha.44",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
@@ -90,5 +90,5 @@
     "tsconfig-paths": "4.0.0",
     "typescript": "4.7.3"
   },
-  "gitHead": "e11b03273c6a691698b672901736eb38a5132be2"
+  "gitHead": "e971aa3e642cf65ab66fbf07c1c1bcc079de8482"
 }

package/src/environment.ts

@@ -154,6 +154,7 @@ const environment = {
     ? process.env.ENABLE_SSO_MAINTENANCE_MODE
     : false,
   VERSION: findVersion(),
+  DISABLE_PINO_LOGGER: process.env.DISABLE_PINO_LOGGER,
   _set(key: any, value: any) {
     process.env[key] = value
     // @ts-ignore

package/src/logging/index.ts

@@ -1,5 +1,5 @@
 export * as correlation from "./correlation/correlation"
-export { logger, disableLogger } from "./pino/logger"
+export { logger } from "./pino/logger"
 export * from "./alerts"
 
 // turn off or on context logging i.e. tenantId, appId etc

package/src/logging/pino/logger.ts

@@ -5,184 +5,169 @@ import * as correlation from "../correlation"
 import { IdentityType } from "@budibase/types"
 import { LOG_CONTEXT } from "../index"
 
-// CORE LOGGERS - for disabling
-
-const BUILT_INS = {
-  log: console.log,
-  error: console.error,
-  info: console.info,
-  warn: console.warn,
-  trace: console.trace,
-  debug: console.debug,
-}
-
 // LOGGER
 
-const pinoOptions: LoggerOptions = {
-  level: env.LOG_LEVEL,
-  formatters: {
-    level: label => {
-      return { level: label.toUpperCase() }
-    },
-    bindings: () => {
-      return {}
-    },
-  },
-  timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
-}
-
-if (env.isDev()) {
-  pinoOptions.transport = {
-    target: "pino-pretty",
-    options: {
-      singleLine: true,
+let pinoInstance: pino.Logger | undefined
+if (!env.DISABLE_PINO_LOGGER) {
+  const pinoOptions: LoggerOptions = {
+    level: env.LOG_LEVEL,
+    formatters: {
+      level: label => {
+        return { level: label.toUpperCase() }
+      },
+      bindings: () => {
+        return {}
+      },
     },
+    timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
   }
-}
 
-export const logger = pino(pinoOptions)
+  if (env.isDev()) {
+    pinoOptions.transport = {
+      target: "pino-pretty",
+      options: {
+        singleLine: true,
+      },
+    }
+  }
 
-export function disableLogger() {
-  console.log = BUILT_INS.log
-  console.error = BUILT_INS.error
-  console.info = BUILT_INS.info
-  console.warn = BUILT_INS.warn
-  console.trace = BUILT_INS.trace
-  console.debug = BUILT_INS.debug
-}
+  pinoInstance = pino(pinoOptions)
 
-// CONSOLE OVERRIDES
+  // CONSOLE OVERRIDES
 
-interface MergingObject {
-  objects?: any[]
-  tenantId?: string
-  appId?: string
-  identityId?: string
-  identityType?: IdentityType
-  correlationId?: string
-  err?: Error
-}
+  interface MergingObject {
+    objects?: any[]
+    tenantId?: string
+    appId?: string
+    identityId?: string
+    identityType?: IdentityType
+    correlationId?: string
+    err?: Error
+  }
 
-function isPlainObject(obj: any) {
-  return typeof obj === "object" && obj !== null && !(obj instanceof Error)
-}
+  function isPlainObject(obj: any) {
+    return typeof obj === "object" && obj !== null && !(obj instanceof Error)
+  }
 
-function isError(obj: any) {
-  return obj instanceof Error
-}
+  function isError(obj: any) {
+    return obj instanceof Error
+  }
 
-function isMessage(obj: any) {
-  return typeof obj === "string"
-}
+  function isMessage(obj: any) {
+    return typeof obj === "string"
+  }
 
-/**
- * Backwards compatibility between console logging statements
- * and pino logging requirements.
- */
-function getLogParams(args: any[]): [MergingObject, string] {
-  let error = undefined
-  let objects: any[] = []
-  let message = ""
-
-  args.forEach(arg => {
-    if (isMessage(arg)) {
-      message = `${message} ${arg}`.trimStart()
-    }
-    if (isPlainObject(arg)) {
-      objects.push(arg)
+  /**
+   * Backwards compatibility between console logging statements
+   * and pino logging requirements.
+   */
+  function getLogParams(args: any[]): [MergingObject, string] {
+    let error = undefined
+    let objects: any[] = []
+    let message = ""
+
+    args.forEach(arg => {
+      if (isMessage(arg)) {
+        message = `${message} ${arg}`.trimStart()
+      }
+      if (isPlainObject(arg)) {
+        objects.push(arg)
+      }
+      if (isError(arg)) {
+        error = arg
+      }
+    })
+
+    const identity = getIdentity()
+
+    let contextObject = {}
+
+    if (LOG_CONTEXT) {
+      contextObject = {
+        tenantId: getTenantId(),
+        appId: getAppId(),
+        identityId: identity?._id,
+        identityType: identity?.type,
+        correlationId: correlation.getId(),
+      }
     }
-    if (isError(arg)) {
-      error = arg
+
+    const mergingObject = {
+      objects: objects.length ? objects : undefined,
+      err: error,
+      ...contextObject,
     }
-  })
 
-  const identity = getIdentity()
+    return [mergingObject, message]
+  }
 
-  let contextObject = {}
+  console.log = (...arg: any[]) => {
+    const [obj, msg] = getLogParams(arg)
+    pinoInstance?.info(obj, msg)
+  }
+  console.info = (...arg: any[]) => {
+    const [obj, msg] = getLogParams(arg)
+    pinoInstance?.info(obj, msg)
+  }
+  console.warn = (...arg: any[]) => {
+    const [obj, msg] = getLogParams(arg)
+    pinoInstance?.warn(obj, msg)
+  }
+  console.error = (...arg: any[]) => {
+    const [obj, msg] = getLogParams(arg)
+    pinoInstance?.error(obj, msg)
+  }
 
-  if (LOG_CONTEXT) {
-    contextObject = {
-      tenantId: getTenantId(),
-      appId: getAppId(),
-      identityId: identity?._id,
-      identityType: identity?.type,
-      correlationId: correlation.getId(),
+  /**
+   * custom trace impl - this resembles the node trace behaviour rather
+   * than traditional trace logging
+   * @param arg
+   */
+  console.trace = (...arg: any[]) => {
+    const [obj, msg] = getLogParams(arg)
+    if (!obj.err) {
+      // to get stack trace
+      obj.err = new Error()
     }
+    pinoInstance?.trace(obj, msg)
   }
 
-  const mergingObject = {
-    objects: objects.length ? objects : undefined,
-    err: error,
-    ...contextObject,
+  console.debug = (...arg: any) => {
+    const [obj, msg] = getLogParams(arg)
+    pinoInstance?.debug(obj, msg)
   }
 
-  return [mergingObject, message]
-}
+  // CONTEXT
 
-console.log = (...arg: any[]) => {
-  const [obj, msg] = getLogParams(arg)
-  logger.info(obj, msg)
-}
-console.info = (...arg: any[]) => {
-  const [obj, msg] = getLogParams(arg)
-  logger.info(obj, msg)
-}
-console.warn = (...arg: any[]) => {
-  const [obj, msg] = getLogParams(arg)
-  logger.warn(obj, msg)
-}
-console.error = (...arg: any[]) => {
-  const [obj, msg] = getLogParams(arg)
-  logger.error(obj, msg)
-}
-
-/**
- * custom trace impl - this resembles the node trace behaviour rather
- * than traditional trace logging
- * @param arg
- */
-console.trace = (...arg: any[]) => {
-  const [obj, msg] = getLogParams(arg)
-  if (!obj.err) {
-    // to get stack trace
-    obj.err = new Error()
-  }
-  logger.trace(obj, msg)
-}
-
-console.debug = (...arg: any) => {
-  const [obj, msg] = getLogParams(arg)
-  logger.debug(obj, msg)
-}
-
-// CONTEXT
-
-const getTenantId = () => {
-  let tenantId
-  try {
-    tenantId = context.getTenantId()
-  } catch (e: any) {
-    // do nothing
+  const getTenantId = () => {
+    let tenantId
+    try {
+      tenantId = context.getTenantId()
+    } catch (e: any) {
+      // do nothing
+    }
+    return tenantId
   }
-  return tenantId
-}
 
-const getAppId = () => {
-  let appId
-  try {
-    appId = context.getAppId()
-  } catch (e) {
-    // do nothing
+  const getAppId = () => {
+    let appId
+    try {
+      appId = context.getAppId()
+    } catch (e) {
+      // do nothing
+    }
+    return appId
   }
-  return appId
-}
 
-const getIdentity = () => {
-  let identity
-  try {
-    identity = context.getIdentity()
-  } catch (e) {
-    // do nothing
+  const getIdentity = () => {
+    let identity
+    try {
+      identity = context.getIdentity()
+    } catch (e) {
+      // do nothing
+    }
+    return identity
   }
-  return identity
 }
+
+export const logger = pinoInstance