Merge pull request #192 from layerx-labs/dev

BEPRO 2.22

Author: moshmage

elastic-apm-node.js

@@ -1,9 +1,9 @@
 require(`dotenv`).config();
 
 module.exports = {
-  serverUrl: process.env.ELASTIC_APM_SERVER_URL,  // E.g. https://my-deployment-name.apm.us-west2.gcp.elastic-cloud.com
-  secretToken: process.env.ELASTIC_APM_SECRET_TOKEN,
-  serviceName: process.env.ELASTIC_APM_SERVICE_NAME,
-  active: process.env.ELASTIC_APM_ACTIVE === "true",
-  logLevel: process.env.ELASTIC_APM_LOG_LEVEL
+  serverUrl: process.env.NEXT_ELASTIC_APM_SERVER_URL,  // E.g. https://my-deployment-name.apm.us-west2.gcp.elastic-cloud.com
+  secretToken: process.env.NEXT_ELASTIC_APM_SECRET_TOKEN,
+  serviceName: process.env.NEXT_ELASTIC_APM_SERVICE_NAME,
+  active: process.env.NEXT_ELASTIC_APM_ACTIVE === "true",
+  logLevel: process.env.NEXT_ELASTIC_APM_LOG_LEVEL
 }

src/utils/elastic-logger.ts

@@ -0,0 +1,42 @@
+import {Client} from "@elastic/elasticsearch";
+import {LoggerPlugin} from "@taikai/scribal/dist/lib/types";
+
+const {
+  NEXT_ELASTIC_SEARCH_URL: node,
+  NEXT_ELASTIC_SEARCH_USERNAME: username,
+  NEXT_ELASTIC_SEARCH_PASSWORD: password,
+  NEXT_LOG_APP_NAME: index = "webnetwork-events-logs"
+} = process.env;
+
+export const elasticLoggerMaker = (): LoggerPlugin => ({
+  log(level, contents) {
+    if (!node || !username || !password) {
+      console.debug(`\n\tTrying to use elastic-search indexer but missing env-vars\n`);
+      return;
+    }
+
+    /* this is needed because Scribal makes magic */
+    const _params = contents?.[1]?.[0];
+    const params =
+      (typeof _params === "string" || typeof _params === "number")
+        ? {value: _params}
+        : Array.isArray(_params)
+          ? {value_array: _params}
+          : _params;
+
+    new Client({node, auth: {username, password}})
+      .index({
+        index: `bepro-processor-logs-${index}`,
+        document: {
+          level,
+          message: contents[0],
+          params,
+          createdAt: new Date().toISOString(),
+        }
+      })
+      .catch(e => {
+        console.log(`Failed to log on elastic`, e);
+      });
+
+  }
+})

src/utils/logger-handler.ts

@@ -1,11 +1,11 @@
 import Scribal from "./scribal";
 
 /* eslint-disable */
-export const info = (message: string, ...rest) => Scribal.i(message, ...rest);
-export const error = (message: string, ...rest) => Scribal.e(message, ...rest);
-export const log = (message: string, ...rest) => Scribal.d(message, ...rest);
-export const warn = (message: string, ...rest) => Scribal.w(message, ...rest);
-export const debug = (message: string, ...rest) => Scribal.d(message, ...rest);
-export const trace = (message: string, ...rest) => Scribal.d(message, ...rest);
+export const info = (message: string, ...rest) => Scribal.i([message, rest]);
+export const error = (message: string, ...rest) => Scribal.e([message, rest]);
+export const log = (message: string, ...rest) => Scribal.d([message, rest]);
+export const warn = (message: string, ...rest) => Scribal.w([message, rest]);
+export const debug = (message: string, ...rest) => Scribal.d([message, rest]);
+export const trace = (message: string, ...rest) => Scribal.d([message, rest]);
 
 export default {error, info, warn, log, debug, trace}

src/utils/scribal.ts

@@ -1,34 +1,36 @@
 import Scribal from "@taikai/scribal";
+import {elasticLoggerMaker} from "src/utils/elastic-logger";
 
 const ScribalConfig = {
   logService: {
     console: {
-      silent: process.env.LOG_TO_CONSOLE === 'false',
-      logLevel: (process.env.LOG_LEVEL || 'debug') as any,
+      silent: process.env.NEXT_LOG_TO_CONSOLE === 'false',
+      logLevel: (process.env.NEXT_LOG_LEVEL || 'debug') as any,
     },
     elastic: {
-      silent: process.env.LOG_TO_ELASTIC === 'false',
-      level: (process.env.LOG_LEVEL || 'debug') as any,
+      silent: process.env.NEXT_LOG_TO_ELASTIC === 'false',
+      level: (process.env.NEXT_LOG_LEVEL || 'debug') as any,
     },
     file: {
-      silent: process.env.LOG_TO_FILE === 'false',
-      logLevel: (process.env.LOG_LEVEL || 'debug') as any,
-      logFileDir: process.env.LOG_FILE_DIR || 'logs',
-      logDailyRotation: process.env.DAILY_ROTATION_FILE === 'true',
+      silent: process.env.NEXT_LOG_TO_FILE === 'false',
+      logLevel: (process.env.NEXT_LOG_LEVEL || 'debug') as any,
+      logFileDir: process.env.NEXT_LOG_FILE_DIR || 'logs',
+      logDailyRotation: process.env.NEXT_DAILY_ROTATION_FILE === 'true',
       logDailyRotationOptions: {
-        maxSize: process.env.DAILY_ROTATION_FILE_MAX_SIZE || '20m',
-        datePattern: process.env.DAILY_ROTATION_FILE_DATE_PATTERN || 'YYYY-MM-DD',
+        maxSize: process.env.NEXT_DAILY_ROTATION_FILE_MAX_SIZE || '20m',
+        datePattern: process.env.NEXT_DAILY_ROTATION_FILE_DATE_PATTERN || 'YYYY-MM-DD',
       },
     },
   }
 }
 
 export default (() => {
-  const appName = process.env.LOG_APP_NAME || `bepro-events`;
+  const appName = process.env.LOG_APP_NAME || `webnetwork-events-logs`;
   const hostname = process.env.LOG_HOST_NAME || `localhost`;
 
   const scribal = new Scribal([]);
   scribal.init({appName, hostname, version: '*', ...ScribalConfig.logService});
+  scribal.addLogger(elasticLoggerMaker, ScribalConfig.logService.elastic);
 
   return scribal;
 })()