diff --git a/packages/opentelemetry-instrumentation/src/platform/node/old/PluginLoader.ts b/packages/opentelemetry-instrumentation/src/platform/node/old/PluginLoader.ts index 06b8068ac9..97f32582bc 100644 --- a/packages/opentelemetry-instrumentation/src/platform/node/old/PluginLoader.ts +++ b/packages/opentelemetry-instrumentation/src/platform/node/old/PluginLoader.ts @@ -107,17 +107,14 @@ export class PluginLoader { return this; } - const alreadyRequiredModules = Object.keys(require.cache); - const requiredModulesToHook = modulesToHook.filter( - name => - alreadyRequiredModules.find(cached => { - try { - return require.resolve(name) === cached; - } catch (err) { - return false; - } - }) !== undefined - ); + const requiredModulesToHook = modulesToHook.filter((name: string) => { + try { + const moduleResolvedFilename = require.resolve(name); + return moduleResolvedFilename in require.cache; + } catch { + return false; + } + }); if (requiredModulesToHook.length > 0) { this.logger.warn( `Some modules (${requiredModulesToHook.join( diff --git a/packages/opentelemetry-node/src/instrumentation/PluginLoader.ts b/packages/opentelemetry-node/src/instrumentation/PluginLoader.ts index e8ea58d879..00378e66c8 100644 --- a/packages/opentelemetry-node/src/instrumentation/PluginLoader.ts +++ b/packages/opentelemetry-node/src/instrumentation/PluginLoader.ts @@ -103,17 +103,14 @@ export class PluginLoader { return this; } - const alreadyRequiredModules = Object.keys(require.cache); - const requiredModulesToHook = modulesToHook.filter( - name => - alreadyRequiredModules.find(cached => { - try { - return require.resolve(name) === cached; - } catch (err) { - return false; - } - }) !== undefined - ); + const requiredModulesToHook = modulesToHook.filter((name: string) => { + try { + const moduleResolvedFilename = require.resolve(name); + return moduleResolvedFilename in require.cache; + } catch { + return false; + } + }); if (requiredModulesToHook.length > 0) { this.logger.warn( `Some modules (${requiredModulesToHook.join(