@instana/shared-metrics 1.126.2 → 1.127.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instana/shared-metrics",
-  "version": "1.126.2",
+  "version": "1.127.0",
   "description": "Internal metrics plug-in package for Node.js monitoring with Instana",
   "author": {
     "name": "Bastian Krol",
@@ -55,24 +55,24 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@instana/core": "1.126.2",
+    "@instana/core": "1.127.0",
     "detect-libc": "^1.0.3",
     "event-loop-lag": "^1.4.0",
-    "recursive-copy": "^2.0.11",
+    "recursive-copy": "^2.0.13",
     "tar": "^5.0.5"
   },
   "devDependencies": {
-    "eslint": "^7.27.0",
-    "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint": "^7.30.0",
+    "eslint-config-airbnb-base": "^14.2.1",
+    "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-mocha": "^8.1.0",
     "mocha": "^7.2.0",
-    "prettier": "^2.2.1"
+    "prettier": "^2.3.2"
   },
   "optionalDependencies": {
     "event-loop-stats": "1.3.0",
     "gcstats.js": "1.0.0",
     "node-gyp": "^7.1.2"
   },
-  "gitHead": "54884807739adf043c25dfb3789ec9444bcd2c01"
+  "gitHead": "17186489c515d8b4df5b4142c9d4d6269496d155"
 }

package/src/activeHandles.js

@@ -9,6 +9,7 @@ exports.payloadPrefix = 'activeHandles';
 
 Object.defineProperty(exports, 'currentPayload', {
   get: function () {
+    // @ts-ignore
     return process._getActiveHandles().length;
   }
 });

package/src/activeRequests.js

@@ -9,6 +9,7 @@ exports.payloadPrefix = 'activeRequests';
 
 Object.defineProperty(exports, 'currentPayload', {
   get: function () {
+    // @ts-ignore
     return process._getActiveRequests().length;
   }
 });

package/src/dependencies.js

@@ -8,14 +8,19 @@
 const path = require('path');
 const fs = require('fs');
 
-const applicationUnderMonitoring = require('@instana/core').util.applicationUnderMonitoring;
+const { applicationUnderMonitoring } = require('@instana/core').util;
 
 let logger = require('@instana/core').logger.getLogger('metrics');
+
+/**
+ * @param {import('@instana/core/src/logger').GenericLogger} _logger
+ */
 exports.setLogger = function setLogger(_logger) {
   logger = _logger;
 };
 
 exports.payloadPrefix = 'dependencies';
+/** @type {Object.<string, *>} */
 exports.currentPayload = {};
 
 const MAX_ATTEMPTS = 20;
@@ -24,7 +29,7 @@ let attempts = 0;
 
 exports.activate = function activate() {
   attempts++;
-  applicationUnderMonitoring.getMainPackageJsonPath((err, packageJsonPath) => {
+  applicationUnderMonitoring.getMainPackageJsonPathStartingAtMainModule((err, packageJsonPath) => {
     if (err) {
       return logger.warn('Failed to determine main package.json. Reason: %s %s ', err.message, err.stack);
     } else if (!packageJsonPath && attempts < MAX_ATTEMPTS) {
@@ -58,6 +63,9 @@ exports.activate = function activate() {
   });
 };
 
+/**
+ * @param {string} dependencyDir
+ */
 function addDependenciesFromDir(dependencyDir) {
   fs.readdir(dependencyDir, (readDirErr, dependencies) => {
     if (readDirErr) {
@@ -92,6 +100,10 @@ function addDependenciesFromDir(dependencyDir) {
   });
 }
 
+/**
+ * @param {*} dependency
+ * @param {string} packageJsonPath
+ */
 function addDependency(dependency, packageJsonPath) {
   fs.readFile(packageJsonPath, { encoding: 'utf8' }, (err, contents) => {
     if (err && err.code === 'ENOENT') {

package/src/description.js

@@ -5,14 +5,19 @@
 
 'use strict';
 
-const applicationUnderMonitoring = require('@instana/core').util.applicationUnderMonitoring;
+const { applicationUnderMonitoring } = require('@instana/core').util;
 
 let logger = require('@instana/core').logger.getLogger('metrics');
+
+/**
+ * @param {import('@instana/core/src/logger').GenericLogger} _logger
+ */
 exports.setLogger = _logger => {
   logger = _logger;
 };
 
 exports.payloadPrefix = 'description';
+// @ts-ignore
 exports.currentPayload = undefined;
 
 const MAX_ATTEMPTS = 20;
@@ -21,7 +26,7 @@ let attempts = 0;
 
 exports.activate = function activate() {
   attempts++;
-  applicationUnderMonitoring.getMainPackageJson((err, packageJson) => {
+  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) {
@@ -32,6 +37,7 @@ exports.activate = function activate() {
       return;
     }
 
+    // @ts-ignore
     exports.currentPayload = packageJson.description;
   });
 };

package/src/directDependencies.js

@@ -7,14 +7,20 @@
 
 const fs = require('fs');
 
-const applicationUnderMonitoring = require('@instana/core').util.applicationUnderMonitoring;
+const { applicationUnderMonitoring } = require('@instana/core').util;
 
 let logger = require('@instana/core').logger.getLogger('metrics');
+
+/**
+ * @param {import('@instana/core/src/logger').GenericLogger} _logger
+ */
 exports.setLogger = function setLogger(_logger) {
   logger = _logger;
 };
 
 exports.payloadPrefix = 'directDependencies';
+
+/** @type {Object.<string, *>} */
 exports.currentPayload = {
   dependencies: {},
   peerDependencies: {},
@@ -27,7 +33,7 @@ let attempts = 0;
 
 exports.activate = function activate() {
   attempts++;
-  applicationUnderMonitoring.getMainPackageJsonPath((err, packageJsonPath) => {
+  applicationUnderMonitoring.getMainPackageJsonPathStartingAtMainModule((err, packageJsonPath) => {
     if (err) {
       return logger.info(
         'Failed to determine main package.json for analysis of direct dependencies. Reason: %s %s ',
@@ -46,6 +52,9 @@ exports.activate = function activate() {
   });
 };
 
+/**
+ * @param {string} packageJsonPath
+ */
 function addDirectDependenciesFromMainPackageJson(packageJsonPath) {
   fs.readFile(packageJsonPath, { encoding: 'utf8' }, (err, contents) => {
     if (err) {

package/src/gc.js

@@ -16,11 +16,22 @@ const incrementalMarkingsWindow = slidingWindow.create(windowOpts);
 const processWeakCallbacksWindow = slidingWindow.create(windowOpts);
 const gcPauseWindow = slidingWindow.create(windowOpts);
 
+/** @type {*} */
 let gcStats;
 let activateHasBeenCalled = false;
 let hasBeenActivated = false;
 
 exports.payloadPrefix = 'gc';
+
+/** @type {{
+ * minorGcs: number
+ * majorGcs: number
+ * incrementalMarkings: number
+ * weakCallbackProcessing: number
+ * gcPause: number
+ * statsSupported?: boolean
+ * usedHeapSizeAfterGc?: number
+ * }} */
 exports.currentPayload = {
   minorGcs: 0,
   majorGcs: 0,
@@ -46,6 +57,7 @@ const nativeModuleLoader = require('./util/nativeModuleRetry')({
     'https://www.instana.com/docs/ecosystem/node-js/installation/#native-addons'
 });
 
+/** @type {NodeJS.Timeout} */
 let senseIntervalHandle;
 
 nativeModuleLoader.once('loaded', gcStats_ => {
@@ -65,7 +77,7 @@ function actuallyActivate() {
     return;
   }
   hasBeenActivated = true;
-  gcStats.on('stats', stats => {
+  gcStats.on('stats', (/** @type {*} */ stats) => {
     // gcstats exposes start and end in nanoseconds
     const pause = (stats.end - stats.start) / 1000000;
     gcPauseWindow.addPoint(pause);

package/src/healthchecks.js

@@ -5,27 +5,40 @@
 
 'use strict';
 
-const requireHook = require('@instana/core').util.requireHook;
+const { requireHook } = require('@instana/core').util;
 
 let logger = require('@instana/core').logger.getLogger('metrics');
+
+/**
+ * @param {import('@instana/core/src/logger').GenericLogger} _logger
+ */
 exports.setLogger = function setLogger(_logger) {
   logger = _logger;
 };
 
+/** @type {number} */
 let timeBetweenHealthcheckCalls;
 const healthy = 1;
 const unhealthy = 0;
 
+/** @type {*} */
 let adminPluginHealthcheck;
+/** @type {NodeJS.Timeout} */
 let timeoutHandle;
 
 exports.payloadPrefix = 'healthchecks';
+// @ts-ignore
 exports.currentPayload = {};
 
-requireHook.onModuleLoad('admin-plugin-healthcheck', function onAdminPluginHealthcheckLoaded(_adminPluginHealthcheck) {
+requireHook.onModuleLoad('admin-plugin-healthcheck', function onAdminPluginHealthcheckLoaded(
+  /** @type {*} */ _adminPluginHealthcheck
+) {
   adminPluginHealthcheck = _adminPluginHealthcheck;
 });
 
+/**
+ * @param {import('@instana/core/src/util/normalizeConfig').InstanaConfig} config
+ */
 exports.activate = function activate(config) {
   timeBetweenHealthcheckCalls = config.metrics.timeBetweenHealthcheckCalls;
 
@@ -37,8 +50,10 @@ exports.activate = function activate(config) {
 function gatherHealthcheckResults() {
   adminPluginHealthcheck
     .getHealthCheckResult()
-    .then(function onHealthcheckResults(adminHealthcheckResults) {
+    .then(function onHealthcheckResults(/** @type{*} */ adminHealthcheckResults) {
+      /** @type {Object.<string, *>} */
       const results = {};
+      /** @type {Object.<string, *>} */
       const previousResults = exports.currentPayload;
 
       // eslint-disable-next-line no-restricted-syntax
@@ -55,11 +70,13 @@ function gatherHealthcheckResults() {
         }
       }
 
+      // @ts-ignore
       exports.currentPayload = results;
       timeoutHandle = setTimeout(gatherHealthcheckResults, timeBetweenHealthcheckCalls);
       timeoutHandle.unref();
     })
-    .catch(function onHealthcheckResultFailure(err) {
+    .catch(function onHealthcheckResultFailure(/** @type {*} */ err) {
+      // @ts-ignore
       exports.currentPayload = {};
       logger.warn('Unexpected error while getting healthcheck results', err);
       timeoutHandle = setTimeout(gatherHealthcheckResults, timeBetweenHealthcheckCalls);

package/src/heapSpaces.js

@@ -5,6 +5,7 @@
 
 'use strict';
 
+/** @type {import('v8')} */
 let v8;
 try {
   v8 = require('v8');
@@ -14,8 +15,10 @@ try {
 }
 
 exports.payloadPrefix = 'heapSpaces';
+// @ts-ignore
 exports.currentPayload = {};
 
+/** @type {NodeJS.Timeout} */
 let activeIntervalHandle = null;
 
 exports.activate = function activate() {
@@ -32,6 +35,7 @@ function gatherHeapSpaceStatistics() {
 
   // We are changing the native format to a format which can be more
   // efficiently compressed and processed in the backend.
+  /** @type {Object.<string, *>} */
   const processedStats = {};
 
   for (let i = 0, len = rawStats.length; i < len; i++) {
@@ -44,10 +48,12 @@ function gatherHeapSpaceStatistics() {
     };
   }
 
+  // @ts-ignore
   exports.currentPayload = processedStats;
 }
 
 exports.deactivate = function deactivate() {
+  // @ts-ignore
   exports.currentPayload = {};
   if (activeIntervalHandle) {
     clearInterval(activeIntervalHandle);

package/src/http.js

@@ -6,6 +6,7 @@
 'use strict';
 
 exports.payloadPrefix = 'http';
+/** @type {Object.<string, *>} */
 exports.currentPayload = {};
 
 exports.activate = function activate() {};
@@ -14,15 +15,20 @@ exports.deactivate = function deactivate() {};
 instrumentHttpModule('http');
 instrumentHttpModule('https');
 
+/**
+ * @param {string} httpModuleName
+ */
 function instrumentHttpModule(httpModuleName) {
   const coreHttpModule = require(httpModuleName);
   const originalCreateServer = coreHttpModule.createServer;
 
   coreHttpModule.createServer = function createServer() {
     const server = originalCreateServer.apply(coreHttpModule, arguments);
+    /** @type {*} */
     const payloadContext = {
       type: httpModuleName
     };
+    /** @type {string} */
     let key;
 
     server.on('listening', () => {

package/src/index.js

@@ -5,7 +5,7 @@
 
 'use strict';
 
-exports.allMetrics = [
+const allMetrics = [
   require('./activeHandles'),
   require('./activeRequests'),
   require('./args'),
@@ -25,8 +25,25 @@ exports.allMetrics = [
   require('./version')
 ];
 
-exports.util = require('./util');
+const util = require('./util');
 
-exports.setLogger = function (logger) {
-  exports.util.setLogger(logger);
+/**
+ * @param {import('@instana/core/src/logger').GenericLogger} logger
+ */
+const setLogger = function (logger) {
+  util.setLogger(logger);
+};
+
+/**
+ * @typedef {Object} InstanaSharedMetrics
+ * @property {Array.<*>} allMetrics
+ * @property {*} util
+ * @property {*} setLogger
+ */
+
+/** @type {InstanaSharedMetrics} */
+module.exports = {
+  allMetrics,
+  util,
+  setLogger
 };

package/src/keywords.js

@@ -5,14 +5,19 @@
 
 'use strict';
 
-const applicationUnderMonitoring = require('@instana/core').util.applicationUnderMonitoring;
+const { applicationUnderMonitoring } = require('@instana/core').util;
 
 let logger = require('@instana/core').logger.getLogger('metrics');
+/**
+ * @param {import('@instana/core/src/logger').GenericLogger} _logger
+ */
 exports.setLogger = function setLogger(_logger) {
   logger = _logger;
 };
 
 exports.payloadPrefix = 'keywords';
+/** @type {Array.<*>} */
+// @ts-ignore
 exports.currentPayload = [];
 
 const MAX_ATTEMPTS = 20;
@@ -21,7 +26,7 @@ let attempts = 0;
 
 exports.activate = function activate() {
   attempts++;
-  applicationUnderMonitoring.getMainPackageJson((err, packageJson) => {
+  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) {
@@ -33,6 +38,7 @@ exports.activate = function activate() {
     }
 
     if (packageJson.keywords) {
+      // @ts-ignore
       exports.currentPayload = packageJson.keywords;
     }
   });

package/src/libuv.js

@@ -9,10 +9,10 @@ const path = require('path');
 
 const lag = require('event-loop-lag')(1000);
 
+/** @type {*} */
 let eventLoopStats;
 
 exports.payloadPrefix = 'libuv';
-exports.currentPayload = {};
 
 const nativeModuleLoader = require('./util/nativeModuleRetry')({
   nativeModuleName: 'event-loop-stats',

package/src/memory.js

@@ -6,8 +6,10 @@
 'use strict';
 
 exports.payloadPrefix = 'memory';
+// @ts-ignore
 exports.currentPayload = {};
 
+/** @type {NodeJS.Timer} */
 let activeIntervalHandle = null;
 
 exports.activate = function activate() {
@@ -17,10 +19,12 @@ exports.activate = function activate() {
 };
 
 function gatherMemoryUsageStatistics() {
+  // @ts-ignore
   exports.currentPayload = process.memoryUsage();
 }
 
 exports.deactivate = function deactivate() {
+  // @ts-ignore
   exports.currentPayload = {};
   if (activeIntervalHandle) {
     clearInterval(activeIntervalHandle);

package/src/name.js

@@ -5,14 +5,19 @@
 
 'use strict';
 
-const applicationUnderMonitoring = require('@instana/core').util.applicationUnderMonitoring;
+const { applicationUnderMonitoring } = require('@instana/core').util;
 
 let logger = require('@instana/core').logger.getLogger('metrics');
+
+/**
+ * @param {import('@instana/core/src/logger').GenericLogger} _logger
+ */
 exports.setLogger = function setLogger(_logger) {
   logger = _logger;
 };
 
 exports.payloadPrefix = 'name';
+// @ts-ignore
 exports.currentPayload = undefined;
 
 const MAX_ATTEMPTS = 60;
@@ -21,7 +26,7 @@ let attempts = 0;
 
 exports.activate = function activate() {
   attempts++;
-  applicationUnderMonitoring.getMainPackageJson((err, packageJson) => {
+  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) {
@@ -30,6 +35,7 @@ exports.activate = function activate() {
       return;
     } else if (!packageJson) {
       if (process.mainModule) {
+        // @ts-ignore
         exports.currentPayload = process.mainModule.filename;
       }
       return logger.warn(
@@ -39,6 +45,7 @@ exports.activate = function activate() {
       );
     }
 
+    // @ts-ignore
     exports.currentPayload = packageJson.name;
   });
 };

package/src/util/index.js

@@ -5,9 +5,13 @@
 
 'use strict';
 
-module.exports = exports = {
-  nativeModuleRetry: require('./nativeModuleRetry'),
+const nativeModuleRetry = require('./nativeModuleRetry');
+module.exports = {
+  nativeModuleRetry,
+  /**
+   * @param {import('@instana/core/src/logger').GenericLogger} logger
+   */
   setLogger: function setLogger(logger) {
-    exports.nativeModuleRetry.setLogger(logger);
+    nativeModuleRetry.setLogger(logger);
   }
 };

package/src/util/nativeModuleRetry.js

@@ -16,6 +16,17 @@ const tar = require('tar');
 const { fork } = require('child_process');
 const detectLibc = require('detect-libc');
 
+/**
+ * @typedef {Object} InstanaSharedMetricsOptions
+ * @property {string} [nativeModuleName]
+ * @property {string} [nativeModulePath]
+ * @property {string} [nativeModuleParentPath]
+ * @property {string} [moduleRoot]
+ * @property {string} [message]
+ * @property {string} [loadFrom]
+ */
+
+/** @type {Array.<string>} */
 const retryMechanisms = [];
 if (
   !process.env.INSTANA_COPY_PRECOMPILED_NATIVE_ADDONS ||
@@ -40,6 +51,10 @@ if (!family) {
 
 class ModuleLoadEmitter extends EventEmitter {}
 
+/**
+ * @param {InstanaSharedMetricsOptions} opts
+ * @returns {ModuleLoadEmitter}
+ */
 function loadNativeAddOn(opts) {
   const loaderEmitter = new ModuleLoadEmitter();
   // Give clients a chance to register event listeners on the emitter that we return by attempting to load the module
@@ -49,6 +64,13 @@ function loadNativeAddOn(opts) {
   return loaderEmitter;
 }
 
+/**
+ * @param {InstanaSharedMetricsOptions} opts
+ * @param {EventEmitter} loaderEmitter
+ * @param {number} retryIndex
+ * @param {boolean} skipAttempt
+ * @returns
+ */
 function loadNativeAddOnInternal(opts, loaderEmitter, retryIndex, skipAttempt) {
   try {
     const { isMainThread } = require('worker_threads');
@@ -80,6 +102,11 @@ function loadNativeAddOnInternal(opts, loaderEmitter, retryIndex, skipAttempt) {
   }
 }
 
+/**
+ * @param {InstanaSharedMetricsOptions} opts
+ * @param {EventEmitter} loaderEmitter
+ * @param {number} retryIndex
+ */
 function prepareNextRetry(opts, loaderEmitter, retryIndex) {
   // The first pre-condition for all retry mechanisms is that we can find the path to the native add-on that can not be
   // required.
@@ -109,6 +136,11 @@ function prepareNextRetry(opts, loaderEmitter, retryIndex) {
   }
 }
 
+/**
+ * @param {InstanaSharedMetricsOptions} opts
+ * @param {EventEmitter} loaderEmitter
+ * @param {number} retryIndex
+ */
 function copyPrecompiled(opts, loaderEmitter, retryIndex) {
   logger.debug(`Trying to copy precompiled version of ${opts.nativeModuleName} for Node.js ${process.version}.`);
 
@@ -149,15 +181,11 @@ function copyPrecompiled(opts, loaderEmitter, retryIndex) {
         cwd: os.tmpdir(),
         file: precompiledTarGzPath
       })
-      .then(tarErr => {
-        if (tarErr) {
-          logger.warn(`Unpacking the precompiled build for ${opts.nativeModuleName} ${label} failed.`, tarErr);
-          process.nextTick(loadNativeAddOnInternal.bind(null, opts, loaderEmitter, ++retryIndex, true));
-          return;
-        }
-
+      .then(() => {
         // See below for the reason why we append 'precompiled' to the path.
         const targetDir = path.join(opts.nativeModulePath, 'precompiled');
+
+        // @ts-ignore
         copy(
           path.join(os.tmpdir(), opts.nativeModuleName),
           targetDir,
@@ -165,6 +193,7 @@ function copyPrecompiled(opts, loaderEmitter, retryIndex) {
             overwrite: true,
             dot: true
           },
+          // @ts-ignore
           cpErr => {
             if (cpErr) {
               logger.warn(`Copying the precompiled build for ${opts.nativeModuleName} ${label} failed.`, cpErr);
@@ -187,15 +216,26 @@ function copyPrecompiled(opts, loaderEmitter, retryIndex) {
             process.nextTick(loadNativeAddOnInternal.bind(null, opts, loaderEmitter, ++retryIndex));
           }
         );
+      })
+      .catch(tarErr => {
+        logger.warn(`Unpacking the precompiled build for ${opts.nativeModuleName} ${label} failed.`, tarErr);
+        process.nextTick(loadNativeAddOnInternal.bind(null, opts, loaderEmitter, ++retryIndex, true));
       });
   });
 }
 
-// This is mainly for the scenario where @instana/collector and its dependencies has been provided by  an external
-// mechanism (like copying a bundled version contained in the Instana agent package) without running an npm install on
-// the target system. Native addons are present, but might have been build for a different operating system/Node ABI,
-// libc familiy, ...). Thus, they need to be rebuilt.
+/**
+ * This is mainly for the scenario where @instana/collector and its dependencies has been provided by  an external
+ * mechanism (like copying a bundled version contained in the Instana agent package) without running an npm install on
+ * the target system. Native addons are present, but might have been build for a different operating system/Node ABI,
+ * libc familiy, ...). Thus, they need to be rebuilt.
+ *
+ * @param {InstanaSharedMetricsOptions} opts
+ * @param {EventEmitter} loaderEmitter
+ * @param {number} retryIndex
+ */
 function rebuildOnDemand(opts, loaderEmitter, retryIndex) {
+  /** @type {string} */
   let nodeGypExecutable;
   try {
     const nodeGypPath = require.resolve('node-gyp');
@@ -245,6 +285,9 @@ function rebuildOnDemand(opts, loaderEmitter, retryIndex) {
   });
 }
 
+/**
+ * @param {InstanaSharedMetricsOptions} opts
+ */
 function findNativeModulePath(opts) {
   try {
     // Let's first check if there is at least a module directory in node_modules:
@@ -275,11 +318,14 @@ function findNativeModulePath(opts) {
   }
 }
 
+/**
+ * @param {InstanaSharedMetricsOptions} opts
+ */
 function createNativeModulePath(opts) {
   // The module cannot be found at all in node_modules. This can happen for example if npm install --no-optional was
   // used but also if building the native add-on with node-gyp failed. We will try to reconstruct a path that makes
   // sense.
-  if (!exports.selfNodeModulesPath) {
+  if (!loadNativeAddOn.selfNodeModulesPath) {
     const selfPath = path.join(__dirname, '..', '..');
     const idx = selfPath.lastIndexOf('node_modules');
     if (idx < 0) {
@@ -291,16 +337,22 @@ function createNativeModulePath(opts) {
 
     // cut off everything after module path
     const selfPathNormalized = selfPath.substring(0, idx + 'node_modules'.length + __dirname.length + 2);
-    exports.selfNodeModulesPath = path.join(selfPathNormalized, '..', '..');
+    loadNativeAddOn.selfNodeModulesPath = path.join(selfPathNormalized, '..', '..');
   }
   // Find nearest ancestor node_modules directory. Since we use a scoped module (@instana/something) as the reference
   // we need to go up two directory levels.
-  opts.nativeModuleParentPath = exports.selfNodeModulesPath;
-  opts.nativeModulePath = path.join(exports.selfNodeModulesPath, opts.nativeModuleName);
+  opts.nativeModuleParentPath = loadNativeAddOn.selfNodeModulesPath;
+  opts.nativeModulePath = path.join(loadNativeAddOn.selfNodeModulesPath, opts.nativeModuleName);
 }
 
-module.exports = exports = loadNativeAddOn;
+loadNativeAddOn.setLogger = setLogger;
+loadNativeAddOn.selfNodeModulesPath = '';
 
-exports.setLogger = function setLogger(_logger) {
+/**
+ * @param {import('@instana/core/src/logger').GenericLogger} _logger
+ */
+function setLogger(_logger) {
   logger = _logger;
-};
+}
+
+module.exports = loadNativeAddOn;

package/src/version.js

@@ -5,14 +5,18 @@
 
 'use strict';
 
-const applicationUnderMonitoring = require('@instana/core').util.applicationUnderMonitoring;
+const { applicationUnderMonitoring } = require('@instana/core').util;
 
 let logger = require('@instana/core').logger.getLogger('metrics');
+/**
+ * @param {import('@instana/core/src/logger').GenericLogger} _logger
+ */
 exports.setLogger = function setLogger(_logger) {
   logger = _logger;
 };
 
 exports.payloadPrefix = 'version';
+// @ts-ignore
 exports.currentPayload = undefined;
 
 const MAX_ATTEMPTS = 20;
@@ -21,7 +25,7 @@ let attempts = 0;
 
 exports.activate = function activate() {
   attempts++;
-  applicationUnderMonitoring.getMainPackageJson((err, packageJson) => {
+  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) {
@@ -32,6 +36,7 @@ exports.activate = function activate() {
       return;
     }
 
+    // @ts-ignore
     exports.currentPayload = packageJson.version;
   });
 };