@instana/shared-metrics 1.116.0 → 1.117.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instana/shared-metrics",
-  "version": "1.116.0",
+  "version": "1.117.3",
   "description": "Internal metrics plug-in package for Node.js monitoring with Instana",
   "author": {
     "name": "Bastian Krol",
@@ -55,7 +55,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@instana/core": "1.116.0",
+    "@instana/core": "1.117.3",
     "detect-libc": "^1.0.3",
     "event-loop-lag": "^1.4.0",
     "recursive-copy": "^2.0.11",
@@ -74,5 +74,5 @@
     "gcstats.js": "1.0.0",
     "node-gyp": "^7.1.0"
   },
-  "gitHead": "d47a972ab41d4066e854a728dc97b545fdd12ac7"
+  "gitHead": "fe7898c0944605c3b428f143b36cb05d65c888a7"
 }

package/src/gc.js

@@ -16,6 +16,10 @@ const incrementalMarkingsWindow = slidingWindow.create(windowOpts);
 const processWeakCallbacksWindow = slidingWindow.create(windowOpts);
 const gcPauseWindow = slidingWindow.create(windowOpts);
 
+let gcStats;
+let activateHasBeenCalled = false;
+let hasBeenActivated = false;
+
 exports.payloadPrefix = 'gc';
 exports.currentPayload = {
   minorGcs: 0,
@@ -25,6 +29,13 @@ exports.currentPayload = {
   gcPause: 0
 };
 
+exports.activate = function activate() {
+  activateHasBeenCalled = true;
+  if (gcStats) {
+    actuallyActivate();
+  }
+};
+
 const nativeModuleLoader = require('./util/nativeModuleRetry')({
   nativeModuleName: 'gcstats.js',
   moduleRoot: path.join(__dirname, '..'),
@@ -37,37 +48,46 @@ const nativeModuleLoader = require('./util/nativeModuleRetry')({
 
 let senseIntervalHandle;
 
-exports.activate = function activate() {
-  nativeModuleLoader.on('loaded', gcStats => {
-    exports.currentPayload.statsSupported = true;
-    gcStats.on('stats', stats => {
-      // gcstats exposes start and end in nanoseconds
-      const pause = (stats.end - stats.start) / 1000000;
-      gcPauseWindow.addPoint(pause);
-      const type = stats.gctype;
-      if (type === 1) {
-        minorGcWindow.addPoint(1);
-      } else if (type === 2) {
-        majorGcWindow.addPoint(1);
-      } else if (type === 4) {
-        incrementalMarkingsWindow.addPoint(1);
-      } else if (type === 8) {
-        processWeakCallbacksWindow.addPoint(1);
-      } else if (type === 15) {
-        minorGcWindow.addPoint(1);
-        majorGcWindow.addPoint(1);
-        incrementalMarkingsWindow.addPoint(1);
-        processWeakCallbacksWindow.addPoint(1);
-      }
-      exports.currentPayload.usedHeapSizeAfterGc = stats.after.usedHeapSize;
-    });
-    startSensing();
-  });
+nativeModuleLoader.once('loaded', gcStats_ => {
+  gcStats = gcStats_;
+  exports.currentPayload.statsSupported = true;
+  if (activateHasBeenCalled) {
+    actuallyActivate();
+  }
+});
+
+nativeModuleLoader.once('failed', () => {
+  exports.currentPayload.statsSupported = false;
+});
 
-  nativeModuleLoader.on('failed', () => {
-    exports.currentPayload.statsSupported = false;
+function actuallyActivate() {
+  if (hasBeenActivated) {
+    return;
+  }
+  hasBeenActivated = true;
+  gcStats.on('stats', stats => {
+    // gcstats exposes start and end in nanoseconds
+    const pause = (stats.end - stats.start) / 1000000;
+    gcPauseWindow.addPoint(pause);
+    const type = stats.gctype;
+    if (type === 1) {
+      minorGcWindow.addPoint(1);
+    } else if (type === 2) {
+      majorGcWindow.addPoint(1);
+    } else if (type === 4) {
+      incrementalMarkingsWindow.addPoint(1);
+    } else if (type === 8) {
+      processWeakCallbacksWindow.addPoint(1);
+    } else if (type === 15) {
+      minorGcWindow.addPoint(1);
+      majorGcWindow.addPoint(1);
+      incrementalMarkingsWindow.addPoint(1);
+      processWeakCallbacksWindow.addPoint(1);
+    }
+    exports.currentPayload.usedHeapSizeAfterGc = stats.after.usedHeapSize;
   });
-};
+  startSensing();
+}
 
 function startSensing() {
   senseIntervalHandle = setInterval(() => {
@@ -84,4 +104,6 @@ exports.deactivate = function deactivate() {
   if (senseIntervalHandle) {
     clearInterval(senseIntervalHandle);
   }
+  activateHasBeenCalled = false;
+  hasBeenActivated = false;
 };

package/src/libuv.js

@@ -25,11 +25,11 @@ const nativeModuleLoader = require('./util/nativeModuleRetry')({
     'https://www.instana.com/docs/ecosystem/node-js/installation/#native-addons'
 });
 
-nativeModuleLoader.on('loaded', eventLoopStats_ => {
+nativeModuleLoader.once('loaded', eventLoopStats_ => {
   eventLoopStats = eventLoopStats_;
 });
 
-nativeModuleLoader.on('failed', () => {
+nativeModuleLoader.once('failed', () => {
   exports.currentPayload.statsSupported = false;
 });
 

package/src/util/nativeModuleRetry.js

@@ -50,6 +50,17 @@ function loadNativeAddOn(opts) {
 }
 
 function loadNativeAddOnInternal(opts, loaderEmitter, retryIndex, skipAttempt) {
+  try {
+    const { isMainThread } = require('worker_threads');
+    if (!isMainThread) {
+      logger.warn(opts.message + ' (Native addons are currently not loaded in worker threads)');
+      loaderEmitter.emit('failed');
+      return;
+    }
+  } catch (err) {
+    // worker threads are not available, so we know that this is the main thread
+  }
+
   if (skipAttempt) {
     // The logic of the previous retry mechanism figured out that it cannot complete successfully, so there is no reason
     // to try to require the module again. Skip directly to the next retry.