newrelic 7.5.2 → 8.3.0

package/lib/environment.js

@@ -9,21 +9,20 @@ var a = require('async')
 var path = require('path')
 var fs = require('./util/unwrapped-core').fs
 var os = require('os')
-var logger = require('./logger').child({component: 'environment'})
+var logger = require('./logger').child({ component: 'environment' })
 var stringify = require('json-stringify-safe')
 
-
 // As of 1.7.0 you can no longer dynamically link v8
 // https://github.com/nodejs/io.js/commit/d726a177ed
 var remapping = {
-  node_install_npm: "npm installed?",
-  node_install_waf: "WAF build system installed?",
-  node_use_openssl: "OpenSSL support?",
-  node_shared_openssl: "Dynamically linked to OpenSSL?",
-  node_shared_v8: "Dynamically linked to V8?",
-  node_shared_zlib: "Dynamically linked to Zlib?",
-  node_use_dtrace: "DTrace support?",
-  node_use_etw: "Event Tracing for Windows (ETW) support?"
+  node_install_npm: 'npm installed?',
+  node_install_waf: 'WAF build system installed?',
+  node_use_openssl: 'OpenSSL support?',
+  node_shared_openssl: 'Dynamically linked to OpenSSL?',
+  node_shared_v8: 'Dynamically linked to V8?',
+  node_shared_zlib: 'Dynamically linked to Zlib?',
+  node_use_dtrace: 'DTrace support?',
+  node_use_etw: 'Event Tracing for Windows (ETW) support?'
 }
 
 var settings = Object.create(null)
@@ -80,19 +79,22 @@ function listPackages(root, packages, callback) {
   }
   _log('Listing packages in %s', root)
 
-  a.waterfall([
-    a.apply(fs.readdir, root),
-    function iterateDirs(dirs, cb) {
-      a.eachLimit(dirs, 2, forEachDir, cb)
-    }
-  ], function onAllDirsRead(err) {
-    _log('Done listing packages in %s', root)
-    if (err) {
-      logger.trace(err, 'Could not list packages in %s (probably not an error)', root)
-      return callback()
+  a.waterfall(
+    [
+      a.apply(fs.readdir, root),
+      function iterateDirs(dirs, cb) {
+        a.eachLimit(dirs, 2, forEachDir, cb)
+      }
+    ],
+    function onAllDirsRead(err) {
+      _log('Done listing packages in %s', root)
+      if (err) {
+        logger.trace(err, 'Could not list packages in %s (probably not an error)', root)
+        return callback()
+      }
+      callback(null, packages)
     }
-    callback(null, packages)
-  })
+  )
 
   function forEachDir(dir, cb) {
     _log('Checking package %s in %s', dir, root)
@@ -164,19 +166,22 @@ function listDependencies(root, children, visited, callback) {
   }
   _log('Listing dependencies in %s', root)
 
-  a.waterfall([
-    a.apply(fs.readdir, root),
-    function iterateDirs(dirs, cb) {
-      a.eachLimit(dirs, 2, forEachEntry, cb)
-    }
-  ], function onAllDirsRead(err) {
-    _log('Done listing dependencies in %s', root)
-    if (err) {
-      logger.trace(err, 'Could not read directories in %s (probably not an error)', root)
-      return callback()
+  a.waterfall(
+    [
+      a.apply(fs.readdir, root),
+      function iterateDirs(dirs, cb) {
+        a.eachLimit(dirs, 2, forEachEntry, cb)
+      }
+    ],
+    function onAllDirsRead(err) {
+      _log('Done listing dependencies in %s', root)
+      if (err) {
+        logger.trace(err, 'Could not read directories in %s (probably not an error)', root)
+        return callback()
+      }
+      callback(null, children)
     }
-    callback(null, children)
-  })
+  )
 
   function forEachEntry(entry, cb) {
     _log('Checking dependencies in %s (%s)', entry, root)
@@ -201,16 +206,19 @@ function listDependencies(root, children, visited, callback) {
       visited[realCandidate] = true
 
       // Load the packages and dependencies for this directory.
-      a.series([
-        a.apply(listPackages, realCandidate, children),
-        a.apply(listDependencies, realCandidate, children, visited)
-      ], function onRecurseListComplete(loadErr) {
-        _log('Done with dependencies in %s', realCandidate)
-        if (loadErr) {
-          logger.debug(loadErr, 'Failed to list dependencies in %s', realCandidate)
+      a.series(
+        [
+          a.apply(listPackages, realCandidate, children),
+          a.apply(listDependencies, realCandidate, children, visited)
+        ],
+        function onRecurseListComplete(loadErr) {
+          _log('Done with dependencies in %s', realCandidate)
+          if (loadErr) {
+            logger.debug(loadErr, 'Failed to list dependencies in %s', realCandidate)
+          }
+          cb()
         }
-        cb()
-      })
+      )
     })
   }
 }
@@ -228,31 +236,38 @@ function getLocalPackages(callback) {
   var visited = Object.create(null)
   _log('Getting local packages')
 
-  a.whilst(function checkCandidate(cb) {
-    return cb(null, candidate)
-  }, function iterate(cb) {
-    _log('Checking for local packages in %s', candidate)
-    var root = path.resolve(candidate, 'node_modules')
-    a.series([
-      a.apply(listPackages, root, packages),
-      a.apply(listDependencies, root, dependencies, visited)
-    ], function onListComplete(err) {
-      _log('Done checking for local packages in %s', candidate)
-      var last = candidate
-      candidate = path.dirname(candidate)
-      if (last === candidate) {
-        candidate = null
+  a.whilst(
+    function checkCandidate(cb) {
+      return cb(null, candidate)
+    },
+    function iterate(cb) {
+      _log('Checking for local packages in %s', candidate)
+      var root = path.resolve(candidate, 'node_modules')
+      a.series(
+        [
+          a.apply(listPackages, root, packages),
+          a.apply(listDependencies, root, dependencies, visited)
+        ],
+        function onListComplete(err) {
+          _log('Done checking for local packages in %s', candidate)
+          var last = candidate
+          candidate = path.dirname(candidate)
+          if (last === candidate) {
+            candidate = null
+          }
+          cb(err)
+        }
+      )
+    },
+    function whileComplete(err) {
+      _log('Done getting local packages')
+      if (err) {
+        callback(err)
+      } else {
+        callback(null, { packages: packages, dependencies: dependencies })
       }
-      cb(err)
-    })
-  }, function whileComplete(err) {
-    _log('Done getting local packages')
-    if (err) {
-      callback(err)
-    } else {
-      callback(null, {packages: packages, dependencies: dependencies})
     }
-  })
+  )
 }
 
 /**
@@ -269,17 +284,17 @@ function getPackages(root, cb) {
   var dependencies = []
   _log('Getting packages from %s', root)
 
-  a.series([
-    a.apply(listPackages, root, packages),
-    a.apply(listDependencies, root, dependencies)
-  ], function onListComplete(err) {
-    _log('Done getting packages from %s', root)
-    if (err) {
-      cb(err)
-    } else {
-      cb(null, {packages: packages, dependencies: dependencies})
+  a.series(
+    [a.apply(listPackages, root, packages), a.apply(listDependencies, root, dependencies)],
+    function onListComplete(err) {
+      _log('Done getting packages from %s', root)
+      if (err) {
+        cb(err)
+      } else {
+        cb(null, { packages: packages, dependencies: dependencies })
+      }
     }
-  })
+  )
 }
 
 /**
@@ -301,7 +316,7 @@ function getGlobalPackages(cb) {
   }
 
   _log('No global packages to get')
-  setImmediate(cb, null, {packages: [], dependencies: []})
+  setImmediate(cb, null, { packages: [], dependencies: [] })
 }
 
 /**
@@ -314,23 +329,23 @@ function getGlobalPackages(cb) {
  */
 function flattenVersions(packages) {
   var info = Object.create(null)
-  packages.forEach(function cb_forEach(pair) {
+  packages.forEach((pair) => {
     var p = pair[0]
     var v = pair[1]
 
     if (info[p]) {
-      if (info[p].indexOf(v) < 0) info[p].push(v)
+      if (info[p].indexOf(v) < 0) {
+        info[p].push(v)
+      }
     } else {
       info[p] = [v]
     }
   })
 
   return Object.keys(info)
-    .map(function cb_map(key) {
-      return [key, info[key].join(', ')]
-    })
+    .map((key) => [key, info[key].join(', ')])
     .sort()
-    .map(function cb_map(pair) {
+    .map((pair) => {
       try {
         return stringify(pair)
       } catch (err) {
@@ -351,12 +366,16 @@ function flattenVersions(packages) {
 function remapConfigSettings() {
   if (process.config && process.config.variables) {
     var variables = process.config.variables
-    Object.keys(variables).forEach(function cb_forEach(key) {
+    Object.keys(variables).forEach((key) => {
       if (remapping[key]) {
         var value = variables[key]
 
-        if (value === true || value === 1) value = 'yes'
-        if (value === false || value === 0) value = 'no'
+        if (value === true || value === 1) {
+          value = 'yes'
+        }
+        if (value === false || value === 0) {
+          value = 'no'
+        }
 
         addSetting(remapping[key], value)
       }
@@ -366,35 +385,43 @@ function remapConfigSettings() {
 
 function getOtherPackages(callback) {
   _log('Getting other packages')
-  var other = {packages: [], dependencies: []}
+  var other = { packages: [], dependencies: [] }
 
   if (!process.env.NODE_PATH) {
     return callback(null, other)
   }
 
   var paths
-  if (process.platform === 'win32') { // why. WHY.
+  if (process.platform === 'win32') {
+    // why. WHY.
     paths = process.env.NODE_PATH.split(';')
   } else {
     paths = process.env.NODE_PATH.split(':')
   }
   _log('Looking for other packages in %j', paths)
 
-  a.eachLimit(paths, 2, function listEachOtherPackage(nodePath, cb) {
-    if (nodePath[0] !== '/') nodePath = path.resolve(process.cwd(), nodePath)
-    _log('Getting other packages from %s', nodePath)
-    getPackages(nodePath, function onGetPackageFinish(err, nextSet) {
-      _log('Done getting other packages from %s', nodePath)
-      if (!err && nextSet) {
-        other.packages.push.apply(other.packages, nextSet.packages)
-        other.dependencies.push.apply(other.dependencies, nextSet.dependencies)
+  a.eachLimit(
+    paths,
+    2,
+    function listEachOtherPackage(nodePath, cb) {
+      if (nodePath[0] !== '/') {
+        nodePath = path.resolve(process.cwd(), nodePath)
       }
-      cb(err)
-    })
-  }, function onOtherFinish(err) {
-    _log('Done getting other packages')
-    callback(err, other)
-  })
+      _log('Getting other packages from %s', nodePath)
+      getPackages(nodePath, function onGetPackageFinish(err, nextSet) {
+        _log('Done getting other packages from %s', nodePath)
+        if (!err && nextSet) {
+          other.packages.push.apply(other.packages, nextSet.packages)
+          other.dependencies.push.apply(other.dependencies, nextSet.dependencies)
+        }
+        cb(err)
+      })
+    },
+    function onOtherFinish(err) {
+      _log('Done getting other packages')
+      callback(err, other)
+    }
+  )
 }
 
 function getHomePackages(cb) {
@@ -412,13 +439,17 @@ function getHomePackages(cb) {
     return cb(null, null)
   }
 
-  a.mapSeries({
-    home: path.resolve(homeDir, '.node_modules'),
-    homeOld: path.resolve(homeDir, '.node_libraries')
-  }, getPackages, function onHomeFinish(err, packages) {
-    _log('Done getting home packages from %s', homeDir)
-    cb(err, packages)
-  })
+  a.mapSeries(
+    {
+      home: path.resolve(homeDir, '.node_modules'),
+      homeOld: path.resolve(homeDir, '.node_libraries')
+    },
+    getPackages,
+    function onHomeFinish(err, packages) {
+      _log('Done getting home packages from %s', homeDir)
+      cb(err, packages)
+    }
+  )
 }
 
 /**
@@ -432,40 +463,44 @@ function getHomePackages(cb) {
  */
 function findPackages(cb) {
   _log('Finding all packages')
-  a.parallelLimit({
-    local: time(getLocalPackages),
-    global: time(getGlobalPackages),
-    other: time(getOtherPackages),
-    home: time(getHomePackages)
-  }, 2, function onPackageComplete(err, data) {
-    _log('Done finding all packages')
-    if (err) {
-      return cb(err)
-    }
+  a.parallelLimit(
+    {
+      local: time(getLocalPackages),
+      global: time(getGlobalPackages),
+      other: time(getOtherPackages),
+      home: time(getHomePackages)
+    },
+    2,
+    function onPackageComplete(err, data) {
+      _log('Done finding all packages')
+      if (err) {
+        return cb(err)
+      }
 
-    var packages = data.local.packages
-    packages.push.apply(packages, data.global.packages)
-    packages.push.apply(packages, data.other.packages)
+      var packages = data.local.packages
+      packages.push.apply(packages, data.global.packages)
+      packages.push.apply(packages, data.other.packages)
 
-    var dependencies = data.local.dependencies
-    dependencies.push.apply(dependencies, data.global.dependencies)
-    dependencies.push.apply(dependencies, data.other.dependencies)
+      var dependencies = data.local.dependencies
+      dependencies.push.apply(dependencies, data.global.dependencies)
+      dependencies.push.apply(dependencies, data.other.dependencies)
 
-    if (data.home) {
-      if (data.home.home) {
-        packages.unshift.apply(packages, data.home.home.packages)
-        dependencies.unshift.apply(dependencies, data.home.home.dependencies)
-      }
-      if (data.home.homeOld) {
-        packages.unshift.apply(packages, data.home.homeOld.packages)
-        dependencies.unshift.apply(dependencies, data.home.homeOld.dependencies)
+      if (data.home) {
+        if (data.home.home) {
+          packages.unshift.apply(packages, data.home.home.packages)
+          dependencies.unshift.apply(dependencies, data.home.home.dependencies)
+        }
+        if (data.home.homeOld) {
+          packages.unshift.apply(packages, data.home.homeOld.packages)
+          dependencies.unshift.apply(dependencies, data.home.homeOld.dependencies)
+        }
       }
-    }
 
-    addSetting('Packages', flattenVersions(packages))
-    addSetting('Dependencies', flattenVersions(dependencies))
-    cb()
-  })
+      addSetting('Packages', flattenVersions(packages))
+      addSetting('Dependencies', flattenVersions(dependencies))
+      cb()
+    }
+  )
 }
 
 function time(fn) {

package/lib/errors/error-collector.js

@@ -7,7 +7,7 @@
 
 const errorsModule = require('./index')
 
-const logger = require('../logger').child({component: 'error_tracer'})
+const logger = require('../logger').child({ component: 'error_tracer' })
 const urltils = require('../util/urltils')
 const Exception = require('../errors').Exception
 const errorHelper = require('./helper')
@@ -34,10 +34,7 @@ class ErrorCollector {
     this.seenObjectsByTransaction = Object.create(null)
     this.seenStringsByTransaction = Object.create(null)
 
-    this.traceAggregator.on(
-      'starting error_data data send.',
-      this._onSendErrorTrace.bind(this)
-    )
+    this.traceAggregator.on('starting error_data data send.', this._onSendErrorTrace.bind(this))
   }
 
   _onSendErrorTrace() {
@@ -48,8 +45,7 @@ class ErrorCollector {
   start() {
     // TODO: Log? Return true/false?
 
-    const errorCollectorEnabled =
-      this.config.error_collector && this.config.error_collector.enabled
+    const errorCollectorEnabled = this.config.error_collector && this.config.error_collector.enabled
 
     if (!errorCollectorEnabled) {
       return
@@ -95,7 +91,8 @@ class ErrorCollector {
       // of marking the exception as seen when we're just testing for if we've
       // seen it!
       seenObjects.add(exception)
-    } else { // typeof exception !== 'object'
+    } else {
+      // typeof exception !== 'object'
       if (!this.seenStringsByTransaction[txId]) {
         this.seenStringsByTransaction[txId] = Object.create(null)
       }
@@ -119,7 +116,9 @@ class ErrorCollector {
    * @return {number} The number of unexpected errors
    */
   onTransactionFinished(transaction) {
-    if (!transaction) throw new Error('Error collector got a blank transaction.')
+    if (!transaction) {
+      throw new Error('Error collector got a blank transaction.')
+    }
     if (transaction.ignore) {
       return
     }
@@ -142,15 +141,9 @@ class ErrorCollector {
     }
 
     const isErroredTransaction = urltils.isError(this.config, transaction.statusCode)
-    const isIgnoredErrorStatusCode = urltils.isIgnoredError(
-      this.config,
-      transaction.statusCode
-    )
+    const isIgnoredErrorStatusCode = urltils.isIgnoredError(this.config, transaction.statusCode)
 
-    const isExpectedErrorStatusCode = urltils.isExpectedError(
-      this.config,
-      transaction.statusCode
-    )
+    const isExpectedErrorStatusCode = urltils.isExpectedError(this.config, transaction.statusCode)
 
     // collect other exceptions only if status code is not ignored
     if (transaction.exceptions.length && !isIgnoredErrorStatusCode) {
@@ -159,13 +152,9 @@ class ErrorCollector {
         if (this.collect(transaction, exception)) {
           ++collectedErrors
           // if we could collect it, then check if expected
-          if (isExpectedErrorStatusCode ||
-            errorHelper.isExpectedException(
-              transaction,
-              exception.error,
-              this.config,
-              urltils
-            )
+          if (
+            isExpectedErrorStatusCode ||
+            errorHelper.isExpectedException(transaction, exception.error, this.config, urltils)
           ) {
             ++expectedErrors
           }
@@ -215,7 +204,7 @@ class ErrorCollector {
     }
 
     const timestamp = Date.now()
-    const exception = new Exception({error, timestamp, customAttributes})
+    const exception = new Exception({ error, timestamp, customAttributes })
 
     if (transaction) {
       transaction.addException(exception)
@@ -250,7 +239,7 @@ class ErrorCollector {
     }
 
     const timestamp = Date.now()
-    const exception = new Exception({error, timestamp, customAttributes})
+    const exception = new Exception({ error, timestamp, customAttributes })
 
     if (transaction) {
       transaction.addUserError(exception)
@@ -322,7 +311,7 @@ class ErrorCollector {
     }
 
     if (this.config.error_collector.capture_events === true) {
-      const priority = transaction && transaction.priority || Math.random()
+      const priority = (transaction && transaction.priority) || Math.random()
       const event = createEvent(transaction, errorTrace, exception.timestamp, this.config)
       this.eventAggregator.add(event, priority)
     }
@@ -344,8 +333,7 @@ class ErrorCollector {
   }
 
   _shouldCollectErrors() {
-    const errorCollectorEnabled =
-      this.config.error_collector && this.config.error_collector.enabled
+    const errorCollectorEnabled = this.config.error_collector && this.config.error_collector.enabled
 
     const shouldCaptureTraceOrEvent =
       this.config.collect_errors || // are traces enabled
@@ -360,8 +348,7 @@ class ErrorCollector {
     this.traceAggregator.reconfigure(config)
     this.eventAggregator.reconfigure(config)
 
-    const errorCollectorEnabled =
-      this.config.error_collector && this.config.error_collector.enabled
+    const errorCollectorEnabled = this.config.error_collector && this.config.error_collector.enabled
 
     if (!errorCollectorEnabled) {
       this.stop()

package/lib/errors/error-event-aggregator.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const logger = require('../logger').child({component: 'error_tracer'})
+const logger = require('../logger').child({ component: 'error_tracer' })
 const EventAggregator = require('../aggregators/event-aggregator')
 
 const NAMES = require('../metrics/names')

package/lib/errors/error-trace-aggregator.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const logger = require('../logger').child({component: 'error_tracer'})
+const logger = require('../logger').child({ component: 'error_tracer' })
 const TraceAggregator = require('../aggregators/trace-aggregator')
 
 // TODO: do traces ever have differing algorithms or
@@ -26,8 +26,7 @@ class ErrorTraceAggregator extends TraceAggregator {
       logger.debug(error, 'Error to be sent to collector.')
       this.errors.push(error)
     } else {
-      logger.debug(
-        'Already have %d errors to send to collector, not keeping.', this.limit)
+      logger.debug('Already have %d errors to send to collector, not keeping.', this.limit)
     }
   }