@instana/core - npm Package Compare versions

Comparing version 1.81.0 to 1.81.1

package.json

 {
   "name": "@instana/core",
-  "version": "1.81.0",
+  "version": "1.81.1",
   "description": "Core library for Instana's Node.js packages",
@@ -135,3 +135,3 @@ "main": "src/index.js",
   },
-  "gitHead": "28aedfe40f810da68b47fb20c27281ba47690b83"
+  "gitHead": "32d1e9bfd2117afe734213facf465565b950d1bd"
 }

src/tracing/instrumentation/loggers/winston.js

@@ -61,2 +61,19 @@ 'use strict';
         }
+
+        if (
+          arguments.length === 1 &&
+          !!arguments[0] &&
+          typeof arguments[0] === 'object' &&
+          typeof arguments[0].message === 'string'
+        ) {
+          // this is the case logger.$level({ message: '...'})
+          message = arguments[0].message;
+        } else if (arguments.length >= 1) {
+          for (var j = arguments.length - 1; j >= 1; j--) {
+            if (!!arguments[j] && typeof arguments[j] === 'object' && typeof arguments[j].message === 'string') {
+              message += arguments[j].message;
+            }
+          }
+        }
+
         var ctx = this;
@@ -83,6 +100,28 @@ return createSpan(ctx, originalMethod, originalArgs, message, markAsError);
   return function(level, message) {
-    if (arguments.length === 1) {
+    if (arguments.length === 1 && typeof arguments[0] === 'string') {
       // this is actually level 'info'
       return originalMethod.apply(this, arguments);
+    } else if (arguments.length === 1 && !!arguments[0] && typeof arguments[0] === 'object') {
+      // this is the case logger.log({level: 'something', message: '...'})
+      if (typeof arguments[0].level === 'string') {
+        level = arguments[0].level;
+      }
+      if (typeof arguments[0].message === 'string') {
+        message = arguments[0].message;
+      }
+    } else if (
+      arguments.length === 2 &&
+      !!arguments[1] &&
+      typeof arguments[1] === 'object' &&
+      typeof arguments[1].message === 'string'
+    ) {
+      message = arguments[1].message;
+    } else if (arguments.length >= 2) {
+      for (var i = arguments.length - 1; i >= 1; i--) {
+        if (!!arguments[i] && typeof arguments[i] === 'object' && typeof arguments[i].message === 'string') {
+          message += arguments[i].message;
+        }
+      }
     }
+
     if (levelIsTraced(level) && isActive && cls.isTracing()) {
@@ -92,4 +131,4 @@ var parentSpan = cls.getCurrentSpan();
         var originalArgs = new Array(arguments.length);
-        for (var i = 0; i < arguments.length; i++) {
-          originalArgs[i] = arguments[i];
+        for (var j = 0; j < arguments.length; j++) {
+          originalArgs[j] = arguments[j];
         }
@@ -96,0 +135,0 @@ var ctx = this;

No alert changes

Improved metrics

Total package byte prevSize

253553

increased by0.58%

Lines of code

7069

increased by0.51%

No dependency changes