@apolitical/logger 2.0.0-beta.6 → 2.0.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apolitical/logger",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "Node.js module to expose Apolitical's logger service",
   "author": "Apolitical Group Limited <engineering@apolitical.co>",
   "license": "MIT",

package/src/config.js

@@ -9,7 +9,6 @@ module.exports = {
   },
   LOGGER: {
     LOGGING_LEVELS: ['error', 'warn', 'info', 'debug'],
-    ALLOWED_LABELS: ['name', 'version'],
     TRANSPORTS: {
       FILE: {
         ERROR_OPTIONS: {

package/src/services/logger.service.js

@@ -2,20 +2,11 @@
 
 module.exports =
   ({ path, winston, winstonGoogle, config }) =>
-  ({ logLevel = 'info', labels = {} }) => {
-    const { LOGGING_LEVELS, ALLOWED_LABELS } = config.LOGGER;
+  ({ labels = {}, logLevel = 'info' }) => {
+    const { LOGGING_LEVELS } = config.LOGGER;
     const { ERROR_OPTIONS, COMBINED_OPTIONS } = config.LOGGER.TRANSPORTS.FILE;
     const { CLOUD_FUNCTION, CREDENTIALS } = config.GOOGLE;
 
-    function allowedLabels() {
-      return ALLOWED_LABELS.reduce((acc, cv) => {
-        if (labels[cv]) {
-          acc[cv] = labels[cv];
-        }
-        return acc;
-      }, {});
-    }
-
     function loggingLevels() {
       return LOGGING_LEVELS.reduce((acc, cv, idx) => {
         acc[cv] = idx;
@@ -52,10 +43,10 @@ module.exports =
     }
 
     function createWrapper(logger) {
-      function where(filePath, method) {
+      function where(filePath, method, otherLabels = {}) {
         const file = path.basename(filePath);
         const childLogger = logger.child({
-          labels: Object.assign({}, allowedLabels(), { file, method }),
+          labels: Object.assign({ file, method }, labels, otherLabels),
         });
         return createWrapper(childLogger);
       }
@@ -66,7 +57,7 @@ module.exports =
     }
 
     const loggerInstance = winston.createLogger({
-      labels: allowedLabels(),
+      labels,
       level: logLevel,
       levels: loggingLevels(),
       format: loggerFormat(),