@instana/shared-metrics 2.5.0 → 2.6.2

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2.6.2 (2022-08-17)
+
+**Note:** Version bump only for package @instana/shared-metrics
+
+
+
+
+
+## [2.6.1](https://github.com/instana/nodejs/compare/v2.6.0...v2.6.1) (2022-08-09)
+
+**Note:** Version bump only for package @instana/shared-metrics
+
+
+
+
+
+# [2.6.0](https://github.com/instana/nodejs/compare/v2.5.0...v2.6.0) (2022-06-28)
+
+**Note:** Version bump only for package @instana/shared-metrics
+
+
+
+
+
 # [2.5.0](https://github.com/instana/nodejs/compare/v2.4.0...v2.5.0) (2022-06-23)
 
 **Note:** Version bump only for package @instana/shared-metrics

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instana/shared-metrics",
-  "version": "2.5.0",
+  "version": "2.6.2",
   "description": "Internal metrics plug-in package for Node.js monitoring with Instana",
   "author": {
     "name": "Bastian Krol",
@@ -67,7 +67,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@instana/core": "2.5.0",
+    "@instana/core": "2.6.2",
     "detect-libc": "^1.0.3",
     "event-loop-lag": "^1.4.0",
     "recursive-copy": "^2.0.13",
@@ -82,5 +82,5 @@
     "event-loop-stats": "1.4.1",
     "gcstats.js": "1.0.0"
   },
-  "gitHead": "0d11b04a5bee77f5a8dd8255bcc756b4c313804f"
+  "gitHead": "14403f521e832904e6aff83f873ef90a2f8ded51"
 }

package/src/gc.js

@@ -53,9 +53,10 @@ const nativeModuleLoader = require('./util/nativeModuleRetry')({
   moduleRoot: path.join(__dirname, '..'),
   message:
     'Could not load gcstats.js. You will not be able to see GC information in Instana for this application. This ' +
-    'typically occurs when native addons could not be installed during module installation (npm install). See the ' +
+    'typically occurs when native addons could not be built during module installation (npm install/yarn) or when ' +
+    'npm install --no-optional or yarn --ignore-optional have been used to install dependencies. See the ' +
     'instructions to learn more about the requirements of the collector: ' +
-    'https://www.ibm.com/docs/de/obi/current?topic=nodejs-collector-installation#native-addons'
+    'https://www.ibm.com/docs/de/obi/current?topic=nodejs-collector-installation#native-add-ons'
 });
 
 /** @type {NodeJS.Timeout} */

package/src/libuv.js

@@ -18,11 +18,11 @@ const nativeModuleLoader = require('./util/nativeModuleRetry')({
   nativeModuleName: 'event-loop-stats',
   moduleRoot: path.join(__dirname, '..'),
   message:
-    'Could not load event-loop-stats. You will only see limited event loop information in ' +
-    'Instana for this application. This typically occurs when native addons could not be ' +
-    'installed during module installation (npm install). See the instructions to learn more ' +
-    'about the requirements of the collector: ' +
-    'https://www.ibm.com/docs/de/obi/current?topic=nodejs-collector-installation#native-addons'
+    'Could not load event-loop-stats. You will only see limited event loop information in Instana for this ' +
+    'application. This typically occurs when native addons could not be built during module installation ' +
+    '(npm install/yarn) or when npm install --no-optional or yarn --ignore-optional have been used to install ' +
+    'dependencies. See the instructions to learn more about the requirements of the collector: ' +
+    'https://www.ibm.com/docs/de/obi/current?topic=nodejs-collector-installation#native-add-ons'
 });
 
 nativeModuleLoader.once('loaded', eventLoopStats_ => {

package/src/name.js

@@ -20,24 +20,26 @@ exports.payloadPrefix = 'name';
 // @ts-ignore
 exports.currentPayload = undefined;
 
-const MAX_ATTEMPTS = 60;
-const DELAY = 1000;
+exports.MAX_ATTEMPTS = 60;
+exports.DELAY = 1000;
 let attempts = 0;
 
 exports.activate = function activate() {
   attempts++;
+
   applicationUnderMonitoring.getMainPackageJsonStartingAtMainModule((err, packageJson) => {
     if (err) {
       return logger.warn('Failed to determine main package json. Reason: ', err.message, err.stack);
-    } else if (!packageJson && attempts < MAX_ATTEMPTS) {
+    } else if (!packageJson && attempts < exports.MAX_ATTEMPTS) {
       logger.debug('Main package.json could not be found. Will try again later.');
-      setTimeout(exports.activate, DELAY).unref();
+      setTimeout(exports.activate, exports.DELAY).unref();
       return;
     } else if (!packageJson) {
-      if (process.mainModule) {
+      if (require.main) {
         // @ts-ignore
-        exports.currentPayload = process.mainModule.filename;
+        exports.currentPayload = require.main.filename;
       }
+
       return logger.warn(
         `Main package.json could not be found. This Node.js app will be labeled "${
           exports.currentPayload ? exports.currentPayload : 'Unknown'
@@ -49,3 +51,9 @@ exports.activate = function activate() {
     exports.currentPayload = packageJson.name;
   });
 };
+
+exports.reset = () => {
+  exports.currentPayload = undefined;
+  exports.MAX_ATTEMPTS = 60;
+  exports.DELAY = 1000;
+};