2.0.29

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartlog",
-  "version": "2.0.24",
+  "version": "2.0.29",
   "private": false,
   "description": "minimalistic distributed and extensible logging tool",
   "keywords": [
@@ -17,7 +17,7 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web)",
+    "build": "(tsbuild --web && tsbundle npm)",
     "format": "(gitzone format)"
   },
   "devDependencies": {
@@ -25,13 +25,14 @@
     "@gitzone/tsrun": "^1.2.12",
     "@gitzone/tstest": "^1.0.33",
     "@pushrocks/tapbundle": "^3.2.1",
-    "@types/node": "^14.0.11",
+    "@types/node": "^14.0.13",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
+    "@gitzone/tsbundle": "^1.0.69",
     "@pushrocks/isounique": "^1.0.4",
-    "@pushrocks/smartlog-interfaces": "^2.0.15"
+    "@pushrocks/smartlog-interfaces": "^2.0.19"
   },
   "files": [
     "ts/**/*",

readme.md

@@ -76,7 +76,6 @@ The following destinations are available:
 // TBD
 ```
 
-
 ## Contribution
 
 We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)

test/test.ts

@@ -1,24 +1,43 @@
 import { expect, tap } from '@pushrocks/tapbundle';
 import * as smartlog from '../ts/index';
 
-let defaultLogger: smartlog.Smartlog;
+let testConsoleLog: smartlog.ConsoleLog;
+let testSmartLog: smartlog.Smartlog;
+
+tap.test('should produce a valid ConsoleLog instance', async () => {
+  testConsoleLog = new smartlog.ConsoleLog();
+  testConsoleLog.log('ok', 'this is ok');
+});
 
 tap.test('should produce instance of Smartlog', async () => {
-  defaultLogger = smartlog.defaultLogger;
-  expect(defaultLogger).to.be.instanceOf(smartlog.Smartlog);
+  testSmartLog = new smartlog.Smartlog({
+    logContext: {
+      environment: 'test',
+      runtime: 'node',
+      zone: 'gitzone',
+      company: 'Lossless GmbH',
+      companyunit: 'Lossless Cloud',
+      containerName: 'testing'
+    }
+  });
 });
 
 tap.test('should enable console logging', async () => {
-  defaultLogger.enableConsole({
+  testSmartLog.enableConsole({
     captureAll: true
   });
   console.log('this is a normal log that should be captured');
   console.log(new Error('hi there'));
-  defaultLogger.log('info', 'this should only be printed once');
+  testSmartLog.log('info', 'this should only be printed once');
 });
 
 tap.test('should be able to log things', async () => {
-  defaultLogger.log('silly', 'hi');
+  testSmartLog.log('silly', 'hi');
+});
+
+tap.test('should create a log group', async () => {
+  const logGroup = testSmartLog.createLogGroup('some cool transaction');
+  logGroup.log('info', 'this is logged from a log group');
 });
 
 tap.start();

ts/index.ts

@@ -1,16 +1,6 @@
 import * as plugins from './smartlog.plugins';
+import { ConsoleLog } from './smartlog.classes.consolelog';
+import { LogGroup } from './smartlog.classes.loggroup';
 import { Smartlog } from './smartlog.classes.smartlog';
-const defaultLogger: Smartlog = new Smartlog({
-  logContext: {
-    company: 'undefined',
-    companyunit: 'undefefined',
-    containerName: 'undefined',
-    environment: 'local',
-    runtime: 'node',
-    zone: 'undefined'
-  }
-});
 
-defaultLogger.enableConsole();
-
-export { Smartlog, defaultLogger };
+export { ConsoleLog, LogGroup, Smartlog };

ts/smartlog.classes.consolelog.ts

@@ -0,0 +1,10 @@
+import * as plugins from './smartlog.plugins';
+
+/**
+ * a console log optimized for smartlog
+ */
+export class ConsoleLog {
+  public log(logLevelArg: plugins.smartlogInterfaces.TLogLevel, logMessageArg: string) {
+    console.log(`__# ${logLevelArg}: ${logMessageArg}`);
+  }
+}

ts/smartlog.classes.loggroup.ts

@@ -0,0 +1,27 @@
+import * as plugins from './smartlog.plugins';
+import { Smartlog } from './smartlog.classes.smartlog';
+
+export class LogGroup {
+  public smartlogRef: Smartlog;
+  public transactionId: string;
+  public groupId = plugins.isounique.uni();
+
+  constructor(smartlogInstance: Smartlog, transactionIdArg: string) {
+    this.smartlogRef = smartlogInstance;
+    this.transactionId = transactionIdArg;
+  }
+
+  public log(
+    logLevelArg: plugins.smartlogInterfaces.TLogLevel,
+    logMessageArg: string,
+    logDataArg?: any
+  ) {
+    this.smartlogRef.log(logLevelArg, logMessageArg, logDataArg, {
+      id: plugins.isounique.uni(),
+      type: 'none',
+      group: this.groupId,
+      instance: this.smartlogRef.uniInstanceId,
+      transaction: this.transactionId
+    });
+  }
+}

ts/smartlog.classes.logrouter.ts

@@ -15,9 +15,9 @@ export class LogRouter {
   }
 
   // routes the log according to added logDestinations
-  routeLog(logPackageArg: ILogPackage) {
+  public async routeLog(logPackageArg: ILogPackage) {
     for (const logDestination of this.logDestinations) {
-      logDestination.handleLog(logPackageArg);
+      await logDestination.handleLog(logPackageArg);
     }
   }
 }

ts/smartlog.classes.smartlog.ts

@@ -1,6 +1,7 @@
 import * as plugins from './smartlog.plugins';
 
 import { LogRouter } from './smartlog.classes.logrouter';
+import { LogGroup } from '.';
 
 export interface ISmartlogContructorOptions {
   logContext: plugins.smartlogInterfaces.ILogContext;
@@ -11,6 +12,8 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
   private logContext: plugins.smartlogInterfaces.ILogContext;
   private minimumLogLevel: plugins.smartlogInterfaces.TLogLevel;
 
+  public uniInstanceId: string = plugins.isounique.uni();
+
   private consoleEnabled: boolean;
 
   private logRouter = new LogRouter();
@@ -32,7 +35,7 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
    * enables console logging
    */
   public enableConsole(optionsArg?: { captureAll: boolean }) {
-    if (optionsArg && optionsArg.captureAll) {
+    if (process && optionsArg && optionsArg.captureAll) {
       const write = process.stdout.write;
       /* import * as fs from 'fs';
       const fileStream = fs.createWriteStream(plugins.path.join(paths.nogitDir, 'output.txt'), {
@@ -47,6 +50,16 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
         write.apply(process.stdout, args);
         return true;
       };
+
+      process.stderr.write = (...args) => {
+        if (!args[0].startsWith('LOG')) {
+          this.log('info', args[0]);
+          return;
+        }
+        // fileStream.write(args[0]);
+        write.apply(process.stderr, args);
+        return true;
+      };
     }
     this.consoleEnabled = true;
   }
@@ -61,18 +74,25 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
    * @param logDataArg - any additional log data
    * @param correlationArg - info about corrleations
    */
-  public log(
+  public async log(
     logLevelArg: plugins.smartlogInterfaces.TLogLevel,
     logMessageArg: string,
     logDataArg?: any,
-    correlationArg: plugins.smartlogInterfaces.ILogCorrelation = {
-      id: plugins.isounique.uni(),
-      type: 'none'
-    }
+    correlationArg?: plugins.smartlogInterfaces.ILogCorrelation
   ) {
+    correlationArg = {
+      ...{
+        id: plugins.isounique.uni(),
+        type: 'none',
+        instance: this.uniInstanceId
+      },
+      ...correlationArg
+    };
+
     if (this.consoleEnabled) {
       this.safeConsoleLog(`${logLevelArg}: ${logMessageArg}`);
     }
+
     const logPackage: plugins.smartlogInterfaces.ILogPackage = {
       timestamp: Date.now(),
       type: 'log',
@@ -84,7 +104,7 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
     if (logDataArg) {
       logPackage.data = logDataArg;
     }
-    this.logRouter.routeLog(logPackage);
+    await this.logRouter.routeLog(logPackage);
   }
 
   public increment(
@@ -118,4 +138,8 @@ export class Smartlog implements plugins.smartlogInterfaces.ILogDestination {
       `LOG => ${new Date().getHours()}:${new Date().getMinutes()}:${new Date().getSeconds()} => ${logLine}`
     );
   }
+
+  public createLogGroup(transactionId: string = 'none') {
+    return new LogGroup(this, transactionId);
+  }
 }