@mimik/sumologic-winston-logger 2.1.12 → 2.1.13

package/configuration/config.js

@@ -8,6 +8,7 @@ import {
   ENV_LOCAL,
   NONE_MODE,
   SUMOLOGIC,
+  isNil,
 } from '../lib/common.js';
 import process from 'node:process';
 import { readFileSync } from 'node:fs';
@@ -152,8 +153,8 @@ if (configuration.mode.includes(AWS_KINESIS)) {
     },
   };
 
-  if (process.env.KINESIS_AWS_ACCESS_KEY_ID !== undefined) configuration[AWS_KINESIS].accessKeyId = process.env.KINESIS_AWS_ACCESS_KEY_ID;
-  if (process.env.KINESIS_AWS_SECRET_ACCESS_KEY !== undefined) configuration[AWS_KINESIS].secretAccessKey = process.env.KINESIS_AWS_SECRET_ACCESS_KEY;
+  if (!isNil(process.env.KINESIS_AWS_ACCESS_KEY_ID)) configuration[AWS_KINESIS].accessKeyId = process.env.KINESIS_AWS_ACCESS_KEY_ID;
+  if (!isNil(process.env.KINESIS_AWS_SECRET_ACCESS_KEY)) configuration[AWS_KINESIS].secretAccessKey = process.env.KINESIS_AWS_SECRET_ACCESS_KEY;
 }
 if (configuration.mode.includes(AWS_S3)) {
   configuration[AWS_S3] = {
@@ -164,8 +165,8 @@ if (configuration.mode.includes(AWS_S3)) {
     maxEvents: parseInt(process.env.S3_AWS_MAX_EVENTS, DECIMAL) || 1000,
   };
 
-  if (process.env.S3_AWS_ACCESS_KEY_ID !== undefined) configuration[AWS_S3].accessKeyId = process.env.S3_AWS_ACCESS_KEY_ID;
-  if (process.env.S3_AWS_SECRET_ACCESS_KEY !== undefined) configuration[AWS_S3].secretAccessKey = process.env.S3_AWS_SECRET_ACCESS_KEY;
+  if (!isNil(process.env.S3_AWS_ACCESS_KEY_ID)) configuration[AWS_S3].accessKeyId = process.env.S3_AWS_ACCESS_KEY_ID;
+  if (!isNil(process.env.S3_AWS_SECRET_ACCESS_KEY)) configuration[AWS_S3].secretAccessKey = process.env.S3_AWS_SECRET_ACCESS_KEY;
 }
 const { filter } = configuration;
 let filterConfig = [];

package/lib/common.js

@@ -53,6 +53,8 @@ const safeStringify = (obj) => {
   });
 };
 
+const isNil = value => value === null || value === undefined;
+
 export {
   ALL_MODE,
   ALL_MODES,
@@ -65,7 +67,6 @@ export {
   ERROR,
   FLUSH,
   FLUSH_EXIT,
-  TEST_FLUSH_TIMEOUT,
   INFO,
   LEVEL,
   LOG,
@@ -79,13 +80,15 @@ export {
   OTHER,
   PARTITION_KEY,
   SPLAT,
-  TEST_START_TIMEOUT,
   SUMOLOGIC,
   SYSTEM_ERROR,
   TEAPOT_ERROR,
+  TEST_FLUSH_TIMEOUT,
+  TEST_START_TIMEOUT,
   UNAUTHORIZED_ERROR,
   UNKNOWN_TYPE,
   UNKNOWN_ID,
   WARN,
   safeStringify,
+  isNil,
 };

package/lib/formatLib.js

@@ -20,7 +20,7 @@ const isReserved = (value) => {
 
 const stackInfo = format((origInfo, opts) => {
   const { env, noStack } = opts;
-  const info = origInfo;
+  const info = { ...origInfo };
 
   if (info.level === 'error') {
     info.stackInfo = parseStack(new Error());

package/lib/stackLib.js

@@ -45,8 +45,8 @@ const parseStack = (newError) => {
   stackInfo.hash = createHash('sha256')
     .update(stackInfo.stack)
     .digest('hex');
-  // this is a hash of the stacktrace for easier searching for the stacktrace
-  // security of this is not a concern since stacktrace is also sent unencrypted
+  // this is a hash of the stack trace for easier searching for the stack trace
+  // security of this is not a concern since the stack trace is also sent unencrypted
   return stackInfo;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mimik/sumologic-winston-logger",
-  "version": "2.1.12",
+  "version": "2.1.13",
   "description": "Log wrapper for sumo, s3, kinesis and winston",
   "main": "./index.js",
   "type": "module",

package/test/logger.spec.js

@@ -183,6 +183,18 @@ describe('Sumologic transport', function SumoTests() {
     });
     sumo.log({ level: 'info', message: 'test globalThis' });
   });
+
+  it('falls back to unknownServerId when globalThis.serverId is not set', (done) => {
+    globalThis.serverType = 'mSumoRemote';
+    sumo.code = '401';
+    sumo.once('warn', (resp) => {
+      resp.data.should.have.property('serverType', 'mSumoRemote');
+      resp.data.should.have.property('serverId', 'unknownServerId@clients');
+      delete globalThis.serverType;
+      done();
+    });
+    sumo.log({ level: 'info', message: 'test serverId fallback' });
+  });
 });
 
 describe('S3 transport', function S3Tests() {