@instana/shared-metrics 4.5.1 → 4.5.3

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.5.3](https://github.com/instana/nodejs/compare/v4.5.2...v4.5.3) (2025-01-14)
+
+### Bug Fixes
+
+- resolved more logging objects structure ([#1510](https://github.com/instana/nodejs/issues/1510)) ([bd4c9bb](https://github.com/instana/nodejs/commit/bd4c9bbda2c82aee7f6c59fcca03ac5588566839))
+
+## [4.5.2](https://github.com/instana/nodejs/compare/v4.5.1...v4.5.2) (2025-01-13)
+
+### Bug Fixes
+
+- resolved logging objects being undefined or missing ([#1509](https://github.com/instana/nodejs/issues/1509)) ([7715fed](https://github.com/instana/nodejs/commit/7715fed5843716a6e49d79f221efcec33a9a1c9d))
+
 ## [4.5.1](https://github.com/instana/nodejs/compare/v4.5.0...v4.5.1) (2025-01-13)
 
 **Note:** Version bump only for package @instana/shared-metrics

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instana/shared-metrics",
-  "version": "4.5.1",
+  "version": "4.5.3",
   "description": "Internal metrics plug-in package for Node.js monitoring with Instana",
   "author": {
     "name": "Bastian Krol",
@@ -59,7 +59,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@instana/core": "4.5.1",
+    "@instana/core": "4.5.3",
     "detect-libc": "^2.0.2",
     "event-loop-lag": "^1.4.0",
     "semver": "^7.5.4",
@@ -74,5 +74,5 @@
     "event-loop-stats": "1.4.1",
     "gcstats.js": "1.0.0"
   },
-  "gitHead": "41c09b8fdd23f6cb0df992c7e479d71532ac91b4"
+  "gitHead": "cac14d4c9f5efa60edee223d45d6220a79336508"
 }

package/src/dependencies.js

@@ -44,7 +44,7 @@ exports.activate = function activate() {
   const started = Date.now();
   util.applicationUnderMonitoring.getMainPackageJsonPathStartingAtMainModule((err, mainPackageJsonPath) => {
     if (err) {
-      return logger.warn('Failed to determine main package.json. Reason: %s %s ', err.message, err.stack);
+      return logger.warn(`Failed to determine main package.json. Reason: ${err?.message}, ${err?.stack}`);
     } else if (!mainPackageJsonPath && attempts < exports.MAX_ATTEMPTS) {
       logger.debug(`Main package.json could not be found at ${mainPackageJsonPath}. Will try again later.`);
       setTimeout(exports.activate, DELAY).unref();
@@ -55,7 +55,7 @@ exports.activate = function activate() {
       );
       util.applicationUnderMonitoring.findNodeModulesFolder((errNodeModules, nodeModulesFolder) => {
         if (errNodeModules) {
-          return logger.warn('Failed to determine node_modules folder. Reason: %s %s ', err.message, err.stack);
+          return logger.warn(`Failed to determine node_modules folder. Reason: ${err?.message}, ${err?.stack}`);
         } else if (!nodeModulesFolder) {
           return logger.warn(
             'Neither the package.json file nor the node_modules folder could be found. Stopping dependency analysis.'
@@ -116,7 +116,7 @@ function addAllDependencies(dependencyDir, started, packageJsonPath) {
 function addDependenciesFromDir(dependencyDir, callback) {
   fs.readdir(dependencyDir, (readDirErr, dependencies) => {
     if (readDirErr || !dependencies) {
-      logger.warn('Cannot analyse dependencies due to %s', readDirErr.message);
+      logger.warn(`Cannot analyse dependencies due to ${readDirErr?.message}`);
       callback();
       return;
     }
@@ -150,7 +150,7 @@ function addDependenciesFromDir(dependencyDir, callback) {
         fs.stat(fullDirPath, (statErr, stats) => {
           if (statErr) {
             countDownLatch.countDown();
-            logger.warn('Cannot analyse dependency %s due to %s', fullDirPath, statErr.message);
+            logger.warn(`Cannot analyse dependency ${fullDirPath} due to ${statErr?.message}`);
             return;
           }
           if (!stats.isDirectory()) {
@@ -185,10 +185,8 @@ function addDependency(dependency, dependencyDirPath, countDownLatch) {
     } else if (err) {
       countDownLatch.countDown();
       logger.info(
-        'Failed to identify version of %s dependency due to: %s. This means that you will not be ' +
-          'able to see details about this dependency within Instana.',
-        dependency,
-        err.message
+        `Failed to identify version of ${dependency} dependency due to: ${err?.message}. ` +
+          'This means that you will not be able to see details about this dependency within Instana.'
       );
       return;
     }
@@ -200,10 +198,8 @@ function addDependency(dependency, dependencyDirPath, countDownLatch) {
       }
     } catch (parseErr) {
       return logger.info(
-        'Failed to identify version of %s dependency due to: %s. This means that you will not be ' +
-          'able to see details about this dependency within Instana.',
-        dependency,
-        parseErr.message
+        `Failed to identify version of ${dependency} dependency due to: ${parseErr?.message}. 
+          This means that you will not be able to see details about this dependency within Instana.`
       );
     }
 

package/src/description.js

@@ -31,7 +31,7 @@ exports.activate = function activate(config) {
   attempts++;
   applicationUnderMonitoring.getMainPackageJsonStartingAtMainModule(config, (err, packageJson) => {
     if (err) {
-      return logger.warn('Failed to determine main package json. Reason: ', err.message, err.stack);
+      return logger.warn(`Failed to determine main package json. Reason: ${err?.message} ${err?.stack}`);
     } else if (!packageJson && attempts < MAX_ATTEMPTS) {
       setTimeout(() => {
         exports.activate(config);

package/src/directDependencies.js

@@ -38,9 +38,8 @@ exports.activate = function activate() {
   util.applicationUnderMonitoring.getMainPackageJsonPathStartingAtMainModule((err, packageJsonPath) => {
     if (err) {
       return logger.info(
-        'Failed to determine main package.json for analysis of direct dependencies. Reason: %s %s ',
-        err.message,
-        err.stack
+        `Failed to determine main package.json for analysis of direct dependencies. 
+        Reason: ${err?.message} ${err?.stack}`
       );
     } else if (!packageJsonPath && attempts < MAX_ATTEMPTS) {
       setTimeout(exports.activate, DELAY).unref();
@@ -63,7 +62,7 @@ function addDirectDependenciesFromMainPackageJson(packageJsonPath) {
   const started = Date.now();
   fs.readFile(packageJsonPath, { encoding: 'utf8' }, (err, contents) => {
     if (err) {
-      return logger.debug('Failed to analyze direct dependencies dependency due to: %s.', err.message);
+      return logger.debug(`Failed to analyze direct dependencies dependency due to: ${err?.message}`);
     }
 
     try {
@@ -75,7 +74,7 @@ function addDirectDependenciesFromMainPackageJson(packageJsonPath) {
       logger.debug(`Collection of direct dependencies took ${Date.now() - started} ms.`);
     } catch (subErr) {
       logger.debug(`Collection of direct dependencies took ${Date.now() - started} ms.`);
-      return logger.debug('Failed to parse package.json %s dependency due to: %s', packageJsonPath, subErr.message);
+      return logger.debug(`Failed to parse package.json ${packageJsonPath} dependency due to: ${subErr?.message}`);
     }
   });
 }

package/src/healthchecks.js

@@ -79,7 +79,7 @@ function gatherHealthcheckResults() {
     .catch(function onHealthcheckResultFailure(/** @type {*} */ err) {
       // @ts-ignore
       exports.currentPayload = {};
-      logger.warn('Unexpected error while getting healthcheck results', err);
+      logger.warn(`Unexpected error while getting healthcheck results. ${err?.message} ${err?.stack}`);
       timeoutHandle = setTimeout(gatherHealthcheckResults, timeBetweenHealthcheckCalls);
       timeoutHandle.unref();
     });

package/src/keywords.js

@@ -31,7 +31,7 @@ exports.activate = function activate(config) {
   attempts++;
   applicationUnderMonitoring.getMainPackageJsonStartingAtMainModule(config, (err, packageJson) => {
     if (err) {
-      return logger.warn('Failed to determine main package json. Reason: ', err.message, err.stack);
+      return logger.warn(`Failed to determine main package json. Reason: ${err?.message} ${err?.stack}`);
     } else if (!packageJson && attempts < MAX_ATTEMPTS) {
       setTimeout(() => {
         exports.activate(config);

package/src/name.js

@@ -32,7 +32,7 @@ exports.activate = function activate(config) {
 
   applicationUnderMonitoring.getMainPackageJsonStartingAtMainModule(config, (err, packageJson) => {
     if (err) {
-      return logger.warn('Failed to determine main package json. Reason: ', err.message, err.stack);
+      return logger.warn(`Failed to determine main package json. Reason: ${err?.message} ${err?.stack}`);
     } else if (!packageJson && attempts < exports.MAX_ATTEMPTS) {
       logger.debug('Main package.json could not be found. Will try again later.');
 

package/src/util/DependencyDistanceCalculator.js

@@ -73,10 +73,8 @@ class DependencyDistanceCalculator {
       fs.readFile(packageJsonPath, { encoding: 'utf8' }, (err, contents) => {
         if (err) {
           logger.debug(
-            'Failed to calculate transitive distances for some dependencies, could not read package.json file at ' +
-              '%s: %s.',
-            packageJsonPath,
-            err.message
+            `Failed to calculate transitive distances for some dependencies, could not read package.json file at
+              ${packageJsonPath}: ${err?.message}.`
           );
 
           // If we cannot parse the package.json or if it does not exist, we need to decrement by 3 immediately because
@@ -90,10 +88,8 @@ class DependencyDistanceCalculator {
           parsedPackageJson = JSON.parse(contents);
         } catch (parseErr) {
           logger.debug(
-            'Failed to calculate transitive distances for some dependencies, could not parse package.json file at ' +
-              '%s: %s',
-            packageJsonPath,
-            parseErr.message
+            `Failed to calculate transitive distances for some dependencies, could not parse package.json file at 
+              ${packageJsonPath}: ${parseErr?.message}.`
           );
           this.globalCountDownLatchAllPackages.countDown(3);
           return;
@@ -109,9 +105,8 @@ class DependencyDistanceCalculator {
       // This catch-block is for synchronous errors from fs.readFile, which can also happen in addition to the callback
       // being called with an error.
       logger.debug(
-        'Failed to calculate transitive distances for some dependencies, synchronous error from fs.readFile for %s:',
-        packageJsonPath,
-        fsReadFileErr
+        `Failed to calculate transitive distances for some dependencies, synchronous error from fs.readFile for 
+          ${packageJsonPath}: ${fsReadFileErr?.message}`
       );
       this.globalCountDownLatchAllPackages.countDown(3);
     }
@@ -197,8 +192,7 @@ class DependencyDistanceCalculator {
         localCountDownLatchForThisNode.countDown();
         logger.debug(
           `Ignoring failure to find the package.json file for dependency ${dependency} for dependency distance ` +
-            'calculation.',
-          err
+            `calculation. ${err?.message} ${err?.stack}`
         );
         return;
       }

package/src/util/nativeModuleRetry.js

@@ -115,7 +115,9 @@ function attemptRequire(opts, loaderEmitter, mechanism) {
     logger.debug(`Attempt to load native add-on ${opts.nativeModuleName} ${mechanism} has been successful.`);
     return true;
   } catch (e) {
-    logger.debug(`Attempt to load native add-on ${opts.nativeModuleName} ${mechanism} has failed.`, e);
+    logger.debug(
+      `Attempt to load native add-on ${opts.nativeModuleName} ${mechanism} has failed. ${e?.message} ${e?.stack}`
+    );
     return false;
   }
 }
@@ -167,7 +169,10 @@ function copyPrecompiled(opts, loaderEmitter, callback) {
       callback(false);
       return;
     } else if (statsErr) {
-      logger.warn(`Looking for a precompiled version for ${opts.nativeModuleName} ${label} failed.`, statsErr);
+      logger.warn(
+        `Looking for a precompiled version for ${opts.nativeModuleName} ${label} failed. 
+        ${statsErr?.message} ${statsErr?.stack}`
+      );
       callback(false);
       return;
     }
@@ -206,12 +211,16 @@ function copyPrecompiled(opts, loaderEmitter, callback) {
             callback(true);
           })
           .catch(error => {
-            logger.warn(`Copying the precompiled build for ${opts.nativeModuleName} ${label} failed.`, error);
+            logger.warn(
+              `Copying the precompiled build for ${opts.nativeModuleName} ${label} failed. 
+              ${error?.message} ${error?.stack}`
+            );
             callback(false);
           });
       })
       .catch(tarErr => {
-        logger.warn(`Unpacking the precompiled build for ${opts.nativeModuleName} ${label} failed.`, tarErr);
+        logger.warn(`Unpacking the precompiled build for ${opts.nativeModuleName} ${label} failed. 
+          ${tarErr?.message} ${tarErr?.stack}`);
         callback(false);
       });
   });
@@ -245,7 +254,9 @@ function findNativeModulePath(opts) {
     opts.nativeModuleParentPath = path.join(opts.nativeModulePath, '..');
     return true;
   } catch (e) {
-    logger.debug(`Could not find location for ${opts.nativeModuleName}. Will create a path for it.`, e);
+    logger.debug(
+      `Could not find location for ${opts.nativeModuleName}. Will create a path for it. ${e?.message} ${e?.stack}`
+    );
     return createNativeModulePath(opts);
   }
 }

package/src/version.js

@@ -30,7 +30,7 @@ exports.activate = function activate(config) {
   attempts++;
   applicationUnderMonitoring.getMainPackageJsonStartingAtMainModule(config, (err, packageJson) => {
     if (err) {
-      return logger.warn('Failed to determine main package json. Reason: ', err.message, err.stack);
+      return logger.warn(`Failed to determine main package json. Reason: ${err?.message} ${err?.stack}`);
     } else if (!packageJson && attempts < MAX_ATTEMPTS) {
       setTimeout(() => {
         exports.activate(config);