chore: try/catch require.resolve

open-telemetry · Feb 8, 2020 · 29e07e6 · 29e07e6
1 parent 2934a79
commit 29e07e6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/opentelemetry-node/src/instrumentation/PluginLoader.ts b/packages/opentelemetry-node/src/instrumentation/PluginLoader.ts
@@ -86,9 +86,13 @@ export class PluginLoader {
       const alreadyRequiredModules = Object.keys(require.cache);
       const requiredModulesToHook = modulesToHook.filter(
         name =>
-          alreadyRequiredModules.find(
-            cached => require.resolve(name) === cached
-          ) !== undefined
+          alreadyRequiredModules.find(cached => {
+            try {
+              return require.resolve(name) === cached;
+            } catch (err) {
+              return false;
+            }
+          }) !== undefined
       );
       if (requiredModulesToHook.length > 0) {
         this.logger.warn(

diff --git a/packages/opentelemetry-node/test/instrumentation/PluginLoader.test.ts b/packages/opentelemetry-node/test/instrumentation/PluginLoader.test.ts
@@ -239,7 +239,7 @@ describe('PluginLoader', () => {
         },
       };
       require('already-require-module');
-      const pluginLoader = new PluginLoader(registry, verifyWarnLogger);
+      const pluginLoader = new PluginLoader(provider, verifyWarnLogger);
       pluginLoader.load(alreadyRequiredPlugins);
       pluginLoader.unload();
     });