fix: skip thread stream

Author: aryamohanan

packages/collector/src/index.js

@@ -33,22 +33,6 @@ if (isNodeJsTooOld()) {
   // @ts-ignore TS1108 (return can only be used within a function body)
   return;
 }
-const skipPinoWorker = require('./util/skipPinoWorker');
-// Skip Instana instrumentation in Pino thread-stream workers.
-// Pino uses internal worker threads for its "thread-stream" transport.
-// These threads are not part of the main application logic and should
-// not be instrumented.
-//
-// This prevents errors when the collector is loaded via NODE_OPTIONS in worker threads.
-if (skipPinoWorker()) {
-  // eslint-disable-next-line no-console
-  console.warn('[Instana] Skipping instrumentation in Pino thread-stream worker.');
-  module.exports = function noOp() {};
-  module.exports.default = function noOp() {};
-  // @ts-ignore
-  return;
-}
-
 let isMainThread = true;
 try {
   isMainThread = require('worker_threads').isMainThread;

packages/collector/src/util/skipPinoWorker.js

@@ -13,13 +13,50 @@
 // no value and also creates confusing log output, so we exclude them here explicitly.
 const excludePattern = /^.*\/(?:npm(?:\.js)?|npm-cli(?:\.js)?|yarn(?:\.js)?|yarn\/lib\/cli(?:\.js)?)$/i;
 
+/**
+ * Check if the current process is a Pino thread-stream worker thread
+ * @returns {boolean}
+ */
+function isPinoThreadStreamWorker() {
+  try {
+    const { isMainThread, workerData } = require('worker_threads');
+    if (isMainThread) return false;
+
+    if (workerData && typeof workerData === 'object') {
+      const nested = workerData.workerData;
+      const isPinoWorker =
+        typeof workerData.filename === 'string' &&
+        nested &&
+        nested.$context &&
+        typeof nested.$context.threadStreamVersion === 'string';
+
+      if (isPinoWorker) {
+        return true;
+      }
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
+
 /**
  * @type {Function}
  * @returns {boolean}
  */
 module.exports = exports = function isExcludedFromInstrumentation() {
   const mainModule = process.argv[1];
-  const excludedFromInstrumentation = typeof mainModule === 'string' && excludePattern.test(mainModule);
+  let excludedFromInstrumentation = typeof mainModule === 'string' && excludePattern.test(mainModule);
+  let exclusionReason = 'npm or yarn';
+
+  // Skip Instana instrumentation in Pino thread-stream workers.
+  // Pino uses internal worker threads for its "thread-stream" transport.
+  // These threads are not part of the main application logic and should
+  // not be instrumented.
+  if (!excludedFromInstrumentation && isPinoThreadStreamWorker()) {
+    excludedFromInstrumentation = true;
+    exclusionReason = 'Pino thread-stream worker';
+  }
 
   if (excludedFromInstrumentation) {
     const logLevelIsDebugOrInfo =
@@ -32,7 +69,8 @@ module.exports = exports = function isExcludedFromInstrumentation() {
       // eslint-disable-next-line no-console
       console.log(
         `[Instana] INFO: Not instrumenting process ${process.pid}: ${process.argv[0]} ${mainModule}` +
-          ' - this Node.js process seems to be npm or yarn. A child process started via "npm start" or "yarn start" ' +
+          // eslint-disable-next-line max-len
+          ` - this Node.js process seems to be ${exclusionReason}. A child process started via "npm start" or "yarn start" ` +
           '_will_ be instrumented, but not npm or yarn itself.'
       );
     }