Feature/fix logger (#14)

* Fix context info

* bump dependencies

* add traceId as tag

Author: thiagoazeredo-quintoandar

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "quintoandar-logger",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Winston logger with custom 5A configuration",
   "main": "src/main.js",
   "dependencies": {
-    "@sentry/node": "^5.19.2",
-    "lodash": "^4.17.19",
+    "@sentry/node": "^5.27.2",
+    "lodash": "^4.17.20",
     "stack-trace": "0.0.10",
     "util": "^0.12.3",
     "winston": "^3.3.3",

package.json

@@ -74,24 +74,22 @@ function formatParams(params, module, funcCallerParam) {
     }
 
     for (let i = 1; i < params.length; i++) {
-        if (params[i] instanceof Error) {
+        if (params[i] instanceof Error && !metadata.error) {
             metadata.error = params[i];
         } else if (params[i] && typeof params[i] === 'object') {
             if (!metadata.extra) {
                 metadata.extra = {};
             }
-            const name = (params[i].constructor && params[i].constructor.name) || params[i].name
+            const name = (params[i].constructor && params[i].constructor.name) || params[i].name;
 
             if (name) {
-                if (name in metadata.extra) {
-                    Object.assign(metadata.extra[name], params[i])
-                }
-                else {
-                    metadata.extra[name] = params[i]
-                }
+                let suffix = 0
+                for (; name + '.' + suffix.toString() in metadata.extra; suffix++) { }
+
+                metadata.extra[name + '.' + suffix.toString()] = params[i];
             }
             else {
-                Object.assign(metadata.extra, params[i]);
+                metadata.extra = Object.assign(metadata.extra, params[i]);
             }
         }
     }

src/main.js

@@ -49,20 +49,21 @@ class SentryTransport extends Transport {
             info.error = util.inspect(error, { showHidden: false, depth: null });
         }
 
-        Sentry.configureScope((scope) => {
+        Sentry.withScope((scope) => {
             scope.setLevel(this._levelsMap[info.level]);
-            Object.entries(info)
-            .filter(([ key ]) => ['error', 'level'].includes(key) === false)
-            .forEach(([ key, value ]) => {
-                scope.setExtra(key, value);
-            })
+            if (info.traceId) {
+                scope.setTag("traceId", info.traceId)
+            }
+            scope.setContext(info)
+            scope.setExtras(info);
+            if (thereIsErrorExtraData) {
+                Sentry.captureException(error);
+            }
+            else Sentry.captureMessage(info.message);
+
         });
 
-        if (thereIsErrorExtraData) {
-            Sentry.setExtra(error);
-            Sentry.captureMessage(error);
-        }
-        else Sentry.captureMessage(info.message);
+
 
         return next();
     }