fix(instrumentation): filter modules that had errors while loading

Author: dszakallas

lib/instrumentations/index.js

@@ -6,40 +6,36 @@ var format = require('util').format
 
 var shimmer = require('../utils/shimmer')
 
-// TODO[NODE-18]: unify INSTRUMENTED_LIBS and CORE_LIBS
-
-var INSTRUMENTED_LIBS = [
-  // from npm
-  'mongoose',
-  'mongodb',
-  'bluebird',
-  'redis',
-  'ioredis',
-  'mysql',
-  'when',
-  'q',
-  'koa',
-  'express',
-  'pg',
-  'amqplib'
-]
-
-var CORE_LIBS = [
-  'http',
-  'https'
-]
+var INSTRUMENTED_LIBS = {
+  'http': './core/http',
+  'https': './core/https',
+  'mongoose': './mongoose',
+  'mongodb': './mongodb',
+  'bluebird': './bluebird',
+  'redis': './redis',
+  'ioredis': './ioredis',
+  'mysql': './mysql',
+  'when': './when',
+  'q': './q',
+  'koa': './koa',
+  'express': './express',
+  'pg': './pg',
+  'amqplib': './amqplib'
+}
 
-function loadInstrumentationsForTarget (name, prefix) {
-  prefix = prefix || ''
-  var instrumentationsPath = path.resolve(__dirname, prefix, name)
+function loadInstrumentationsForTarget (name, path) {
   var instrumentations
   try {
-    instrumentations = require(instrumentationsPath)
+    instrumentations = require(path)
   } catch (err) {
     debug('#loadInstrumentationsForTarget',
-      format('[Warning] instrumentation group `%s` not found on path `%s`. Skipping',
-        name, instrumentationsPath)
+      format('[Warning] instrumentation failed for `%s`. Could not load `%s`. Reason: %s',
+        name, path, err)
     )
+    debug(err)
+  }
+  if (!instrumentations) {
+    return
   }
   if (typeof instrumentations === 'function') {
     return {
@@ -139,27 +135,16 @@ module.exports.create = function (options) {
   var config = options.config || { }
   var disableInstrumentations = config.disableInstrumentations || []
 
-  // TODO[NODE-18]: unify INSTRUMENTED_LIBS and CORE_LIBS
-
-  var coreTargets = CORE_LIBS
-    .filter(function (tgt) {
-      return disableInstrumentations.indexOf(tgt) === -1
-    })
-    .map(function (tgt) {
-      return loadInstrumentationsForTarget(tgt, 'core')
-    })
-    .filter(function (tgt) { return !!tgt })
-
-  var libraryTargets = INSTRUMENTED_LIBS
+  var libraryTargets = Object.keys(INSTRUMENTED_LIBS)
     .filter(function (tgt) {
       return disableInstrumentations.indexOf(tgt) === -1
     })
     .map(function (tgt) {
-      return loadInstrumentationsForTarget(tgt)
+      return loadInstrumentationsForTarget(tgt, INSTRUMENTED_LIBS[tgt])
     })
     .filter(function (tgt) { return !!tgt })
 
-  var instrumentationLookup = buildInstrumentationLookup(coreTargets.concat(libraryTargets))
+  var instrumentationLookup = buildInstrumentationLookup(libraryTargets)
 
   shimmer.wrap(Module, '_load', function (load) {
     return function (file, parent) {
@@ -193,8 +178,9 @@ module.exports.create = function (options) {
     }
   })
 
-  loadTargetsEagerly(coreTargets)
+  loadTargetsEagerly(libraryTargets.filter(function (lib) {
+    return lib.type === 'core'
+  }))
 }
 
 module.exports.INSTRUMENTED_LIBS = INSTRUMENTED_LIBS
-module.exports.CORE_LIBS = CORE_LIBS