1.0.39

.gitlab-ci.yml

@@ -19,23 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojoio/logdna",
-  "version": "1.0.29",
+  "version": "1.0.39",
   "private": false,
   "description": "an unoffical package for the logdna api",
   "main": "dist_ts/index.js",
@@ -9,24 +9,23 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web)",
+    "build": "(tsbuild --web)"
-    "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.33",
+    "@gitzone/tstest": "^1.0.54",
-    "@pushrocks/qenv": "^4.0.6",
+    "@pushrocks/qenv": "^4.0.10",
-    "@pushrocks/tapbundle": "^3.2.1",
+    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^14.0.9",
+    "@types/node": "^14.0.11",
-    "tslint": "^6.1.2",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/lik": "^4.0.13",
+    "@pushrocks/lik": "^4.0.20",
-    "@pushrocks/smartlog-interfaces": "^2.0.9",
+    "@pushrocks/smartlog-interfaces": "^2.0.22",
-    "@pushrocks/smartrequest": "^1.1.47",
+    "@pushrocks/smartrequest": "^1.1.52",
-    "@pushrocks/smartstring": "^3.0.18",
+    "@pushrocks/smartstring": "^3.0.24",
-    "@pushrocks/taskbuffer": "^2.1.1"
+    "@pushrocks/taskbuffer": "^2.1.13"
   },
   "files": [
     "ts/**/*",
@@ -39,5 +38,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -53,9 +53,9 @@ const smartlogPackage: ILogPackage = {
     containerName: 'ci-mojoio-logdna',
     environment: 'test',
     runtime: 'node',
-    zone: 'shipzone'
+    zone: 'shipzone',
   },
-  message: 'this is an awesome log message sent by the tapbundle test'
+  message: 'this is an awesome log message sent by the tapbundle test',
 };
 
 const logdnaMessage = LogdnaMessage.fromSmartLogPackage(smartlogPackage);

test/test.ts

@@ -24,9 +24,13 @@ tap.test('should create a standard log message', async () => {
       containerName: 'ci-mojoio-logdna',
       environment: 'test',
       runtime: 'node',
-      zone: 'shipzone'
+      zone: 'shipzone',
     },
-    message: 'this is an awesome log message sent by the tapbundle test'
+    correlation: {
+      id: '123',
+      type: 'none',
+    },
+    message: 'this is an awesome log message sent by the tapbundle test',
   });
 });
 
@@ -47,9 +51,13 @@ tap.test('should send in order', async () => {
         containerName: 'ci-mojoio-logdna',
         environment: 'test',
         runtime: 'node',
-        zone: 'shipzone'
+        zone: 'shipzone',
+      },
+      message: `this is an awesome log message sent by the tapbundle test #${i}`,
+      correlation: {
+        id: '123',
+        type: 'none',
       },
-      message: `this is an awesome log message sent by the tapbundle test #${i}`
     };
     testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage);
     i++;
@@ -65,9 +73,13 @@ tap.test('should send in order', async () => {
       containerName: 'ci-mojoio-logdna',
       environment: 'test',
       runtime: 'node',
-      zone: 'shipzone'
+      zone: 'shipzone',
     },
-    message: `this is an awesome log message sent by the tapbundle test #${i}`
+    correlation: {
+      id: '123',
+      type: 'none',
+    },
+    message: `this is an awesome log message sent by the tapbundle test #${i}`,
   };
   testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage2);
 
@@ -81,9 +93,13 @@ tap.test('should send in order', async () => {
       containerName: 'ci-mojoio-logdna',
       environment: 'test',
       runtime: 'node',
-      zone: 'shipzone'
+      zone: 'shipzone',
     },
-    message: `this is an awesome log message sent by the tapbundle test #${i}`
+    correlation: {
+      id: '123',
+      type: 'none',
+    },
+    message: `this is an awesome log message sent by the tapbundle test #${i}`,
   };
   testLogDnaAccount.sendSmartlogPackage(testSmartlogMessage3);
 });

ts/logdna.aggregator.ts

@@ -25,7 +25,7 @@ export class LogAggregator {
   }
 
   public addLog(urlIdentifierArg: string, logLineArg: any) {
-    let existinglogCandidate = this.logObjectMap.find(logCandidate => {
+    let existinglogCandidate = this.logObjectMap.find((logCandidate) => {
       return logCandidate.urlIdentifier === urlIdentifierArg;
     });
     if (!existinglogCandidate) {
@@ -41,18 +41,16 @@ export class LogAggregator {
   private async sendAggregatedLogs(logCandidate: ILogCandidate) {
     this.logObjectMap.remove(logCandidate);
     // lets post the message to logdna
-    const response = await plugins.smartrequest.postJson(
+    const url = `${this.baseUrl}${logCandidate.urlIdentifier}&now=${Date.now()}`;
-      `${this.baseUrl}${logCandidate.urlIdentifier}&now=${Date.now()}`,
+    const response = await plugins.smartrequest.postJson(url, {
-      {
+      headers: {
-        headers: {
+        Authorization: this.createBasicAuth(),
-          Authorization: this.createBasicAuth(),
+        charset: 'UTF-8',
-          charset: 'UTF-8'
+      },
-        },
+      requestBody: {
-        requestBody: {
+        lines: logCandidate.logLines,
-          lines: logCandidate.logLines
+      },
-        }
+    });
-      }
-    );
     if (response.statusCode !== 200) {
       console.log(response.body);
     }

ts/logdna.classes.logmessage.ts

@@ -71,7 +71,9 @@ export class LogdnaMessage {
       line: smartlogPackageArg.message,
       meta: {
         ...smartlogPackageArg.context,
-        logType: smartlogPackageArg.type
+        logType: smartlogPackageArg.type,
+        correlation: smartlogPackageArg.correlation,
+        data: smartlogPackageArg.data || {},
       },
       env: smartlogPackageArg.context.environment,
       hostname: smartlogPackageArg.context.zone,
@@ -84,7 +86,7 @@ export class LogdnaMessage {
         return tagArray;
       })(),
       ip: '0.0.0.0',
-      mac: 'aa:aa:aa:aa:aa:aa'
+      mac: 'aa:aa:aa:aa:aa:aa',
     });
   }
 

ts/logdna.logdnaaccount.ts

@@ -31,8 +31,13 @@ export class LogdnaAccount {
     const uriIp = euc(lm.options.ip);
     const uriTags = euc(
       (() => {
+        let first = true;
         return lm.options.tags.reduce((reduced, newItem) => {
-          return `${reduced},${newItem}`;
+          if (first) {
+            first = false;
+            reduced = euc(reduced);
+          }
+          return `${reduced},${euc(newItem)}`;
         });
       })()
     );
@@ -46,7 +51,7 @@ export class LogdnaAccount {
       app: lm.options.app,
       level: lm.options.level,
       env: lm.options.env,
-      meta: lm.options.meta
+      meta: lm.options.meta,
     };
 
     this.logAggregator.addLog(requestUrlWithParams, logLine);
@@ -64,9 +69,9 @@ export class LogdnaAccount {
    */
   public get smartlogDestination(): ILogDestination {
     return {
-      handleLog: logPackageArg => {
+      handleLog: async (logPackageArg) => {
         this.sendSmartlogPackage(logPackageArg);
-      }
+      },
     };
   }
 }