perf(opentelemetry-node): plugin loader search required cache (#1807)

Co-authored-by: Bartlomiej Obecny <bobecny@gmail.com>
open-telemetry · Jan 12, 2021 · 7db3d2a · 7db3d2a
1 parent 5862bc0
commit 7db3d2a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git 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
@@ -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(