newrelic 7.5.2 → 8.3.0

package/lib/util/deep-equal.js

@@ -11,7 +11,9 @@ function isArguments(object) {
 
 function slice(args) {
   // Array.prototype.slice on arguments array-like is expensive
-  var l = args.length, a = [], i
+  var l = args.length
+  var a = []
+  var i
   for (i = 0; i < l; i++) {
     a[i] = args[i]
   }
@@ -71,45 +73,73 @@ function deeper(a, b, ca, cb) {
   } else if (a === null || b === null) {
     return false
   } else if (Buffer.isBuffer(a) && Buffer.isBuffer(b)) {
-    if (a.length !== b.length) return false
+    if (a.length !== b.length) {
+      return false
+    }
 
     // potentially incredibly expensive
-    for (var i = 0; i < a.length; i++) if (a[i] !== b[i]) return false
+    for (var i = 0; i < a.length; i++) {
+      if (a[i] !== b[i]) {
+        return false
+      }
+    }
 
     return true
   } else if (a instanceof Date && b instanceof Date) {
     return a.getTime() === b.getTime()
   } else if (a instanceof RegExp && b instanceof RegExp) {
-    return a.source === b.source &&
-           a.global === b.global &&
-           a.multiline === b.multiline &&
-           a.lastIndex === b.lastIndex &&
-           a.ignoreCase === b.ignoreCase
+    return (
+      a.source === b.source &&
+      a.global === b.global &&
+      a.multiline === b.multiline &&
+      a.lastIndex === b.lastIndex &&
+      a.ignoreCase === b.ignoreCase
+    )
   } else if (isArguments(a) || isArguments(b)) {
-    if (!(isArguments(a) && isArguments(b))) return false
+    if (!(isArguments(a) && isArguments(b))) {
+      return false
+    }
 
     return deeper(slice(a), slice(b), ca, cb)
   }
 
-  if (a.constructor !== b.constructor) return false
+  if (a.constructor !== b.constructor) {
+    return false
+  }
 
-  var ka = Object.keys(a), kb = Object.keys(b)
-  if (ka.length !== kb.length) return false
+  var ka = Object.keys(a)
+  var kb = Object.keys(b)
+  if (ka.length !== kb.length) {
+    return false
+  }
 
   var cal = ca.length
-  while (cal--) if (ca[cal] === a) return cb[cal] === b
-  ca.push(a); cb.push(b)
+  while (cal--) {
+    if (ca[cal] === a) {
+      return cb[cal] === b
+    }
+  }
+  ca.push(a)
+  cb.push(b)
 
-  ka.sort(); kb.sort()
-  for (var j = ka.length - 1; j >= 0; j--) if (ka[j] !== kb[j]) return false
+  ka.sort()
+  kb.sort()
+  for (var j = ka.length - 1; j >= 0; j--) {
+    if (ka[j] !== kb[j]) {
+      return false
+    }
+  }
 
   var key
   for (var k = ka.length - 1; k >= 0; k--) {
     key = ka[k]
-    if (!deeper(a[key], b[key], ca, cb)) return false
+    if (!deeper(a[key], b[key], ca, cb)) {
+      return false
+    }
   }
 
-  ca.pop(); cb.pop()
+  ca.pop()
+  cb.pop()
 
   return true
 }

package/lib/util/flatten.js

@@ -30,8 +30,11 @@ function flatten(result, prefix, obj, seen) {
       continue
     }
 
-    if (obj[key] instanceof Object) flatten(result, prefix + key + '.', obj[key], seen)
-    else result[prefix + key] = obj[key]
+    if (obj[key] instanceof Object) {
+      flatten(result, prefix + key + '.', obj[key], seen)
+    } else {
+      result[prefix + key] = obj[key]
+    }
   }
 
   return result

package/lib/util/hashes.js

@@ -28,7 +28,7 @@ function deobfuscateNameUsingKey(name, key) {
   var bytes = Buffer.from(name, 'base64')
   var keyBytes = Buffer.from(key)
 
-  return encode(bytes, keyBytes).toString("utf-8")
+  return encode(bytes, keyBytes).toString('utf-8')
 }
 
 function calculatePathHash(appName, pathName, referingPathHash) {
@@ -98,7 +98,7 @@ function makeId(length = 16) {
       // This could "overflow" since we're iterating over the number of ints, which could
       // be more data than needed. But out-of-bound index assignment on typed arrays are
       // discarded
-      randBytes[(i * 4) + j] = bytes[j]
+      randBytes[i * 4 + j] = bytes[j]
     }
   }
 

package/lib/util/label-parser.js

@@ -9,10 +9,9 @@ module.exports = parse
 module.exports.fromString = fromString
 module.exports.fromMap = fromMap
 
-
 // this creates a copy of trim that can be used with map
 var trim = Function.prototype.call.bind(String.prototype.trim)
-var logger = require('../logger').child({component: 'label-parser'})
+var logger = require('../logger').child({ component: 'label-parser' })
 var stringify = require('json-stringify-safe')
 
 function parse(labels) {
@@ -37,13 +36,12 @@ function fromString(raw) {
   var map = Object.create(null)
 
   if (!raw) {
-    return {labels: [], warnings: []}
+    return { labels: [], warnings: [] }
   }
 
   var pairs = raw.split(';').map(trim)
   var parts
 
-
   while (!pairs[pairs.length - 1]) {
     pairs.pop()
   }
@@ -69,10 +67,7 @@ function fromString(raw) {
   return fromMap(map)
 
   function warn(message) {
-    return {labels: [], warnings: [
-      'Invalid Label String: ' + raw,
-      message
-    ]}
+    return { labels: [], warnings: ['Invalid Label String: ' + raw, message] }
   }
 }
 
@@ -85,8 +80,7 @@ function fromMap(map) {
 
     if (!map[key] || typeof map[key] !== 'string') {
       return warnings.push(
-        'Label value for ' + type +
-        'should be a string with a length between 1 and 255 characters'
+        'Label value for ' + type + 'should be a string with a length between 1 and 255 characters'
       )
     }
 
@@ -100,7 +94,7 @@ function fromMap(map) {
       warnings.push('Label value too long: ' + value)
     }
 
-    labels.push({label_type: type, label_value: value})
+    labels.push({ label_type: type, label_value: value })
   })
 
   if (labels.length > 64) {
@@ -116,7 +110,7 @@ function fromMap(map) {
     }
   }
 
-  return {labels: labels, warnings: warnings}
+  return { labels: labels, warnings: warnings }
 }
 
 function truncate(str, max) {
@@ -124,7 +118,7 @@ function truncate(str, max) {
   var chr
   for (var i = 0, l = str.length; i < l; ++i) {
     chr = str.charCodeAt(i)
-    if (chr >= 0xD800 && chr <= 0xDBFF && i !== l) {
+    if (chr >= 0xd800 && chr <= 0xdbff && i !== l) {
       i += 1
     }
 

package/lib/util/logger.js

@@ -56,8 +56,12 @@ Logger.MAX_LOG_BUFFER = MAX_LOG_BUFFER
 Logger.prototype.coerce = function coerce(value) {
   if (!isNaN(parseInt(value, 10)) && isFinite(value)) {
     // value is numeric
-    if (value < 10) value = 10
-    if (value > 60) value = 60
+    if (value < 10) {
+      value = 10
+    }
+    if (value > 60) {
+      value = 60
+    }
 
     return value
   }
@@ -70,12 +74,16 @@ Object.keys(LEVELS).forEach(function buildLevel(_level) {
   var level = Logger.prototype.coerce(LEVELS[_level])
 
   function log(extra) {
-    if (!this.options.enabled) return false
-    if (level < this.options._level) return false
+    if (!this.options.enabled) {
+      return false
+    }
+    if (level < this.options._level) {
+      return false
+    }
 
-    var has_extra = typeof extra === 'object'
-    var args = Array.prototype.slice.call(arguments, has_extra ? 1 : 0)
-    return this.write(level, args, has_extra ? extra : null)
+    var hasExtra = typeof extra === 'object'
+    var args = Array.prototype.slice.call(arguments, hasExtra ? 1 : 0)
+    return this.write(level, args, hasExtra ? extra : null)
   }
 
   loggingFunctions[_level] = function checkLevel() {
@@ -89,8 +97,12 @@ Object.keys(LEVELS).forEach(function buildLevel(_level) {
       return
     }
 
-    if (!this.options.enabled) return false
-    if (level < this.options._level) return false
+    if (!this.options.enabled) {
+      return false
+    }
+    if (level < this.options._level) {
+      return false
+    }
 
     if (seenMessages[key] !== true) {
       var args = Array.prototype.slice.call(arguments, 1)
@@ -109,8 +121,12 @@ Object.keys(LEVELS).forEach(function buildLevel(_level) {
       return
     }
 
-    if (!this.options.enabled) return false
-    if (level < this.options._level) return false
+    if (!this.options.enabled) {
+      return false
+    }
+    if (level < this.options._level) {
+      return false
+    }
 
     if (seenPerInterval[key] !== true) {
       var args = Array.prototype.slice.call(arguments, 2)
@@ -193,7 +209,8 @@ Logger.prototype.write = function write(level, args, extra) {
     } else if (typeof args[i] === 'object') {
       try {
         args[i] = stringify(args[i])
-      } catch (err) { // eslint-disable-line no-unused-vars
+      } catch (err) {
+        // eslint-disable-line no-unused-vars
         this.debug('Failed to stringfy object for log')
         args[i] = '[UNPARSABLE OBJECT]'
       }
@@ -207,7 +224,8 @@ Logger.prototype.write = function write(level, args, extra) {
   var data = ''
   try {
     data = stringify(entry) + '\n'
-  } catch (err) { // eslint-disable-line no-unused-vars
+  } catch (err) {
+    // eslint-disable-line no-unused-vars
     this.debug('Unabled to stringify log message')
   }
 

package/lib/util/process-version.js

@@ -46,7 +46,7 @@ function prerelease() {
 
 function _logWarn() {
   if (!logger) {
-    logger = require('../logger').child({component: 'util-process-version'})
+    logger = require('../logger').child({ component: 'util-process-version' })
   }
   logger.warn.apply(logger, arguments)
 }

package/lib/util/properties.js

@@ -10,7 +10,7 @@ var hasOwnProperty = Object.hasOwnProperty
 // The logger needs to be lazy-loaded to get around ordering issues with config.
 var _logger = null
 var getLogger = function makeLogger() {
-  _logger = require('../logger').child({component: 'util-properties'})
+  _logger = require('../logger').child({ component: 'util-properties' })
   getLogger = function reallyGetLogger() {
     return _logger
   }

package/lib/util/sql/obfuscate.js

@@ -18,37 +18,27 @@ var hex = /0x[0-9a-f]+/
 var boolean = /true|false|null/
 var number = /\b-?(?:[0-9]+\.)?[0-9]+([eE][+-]?[0-9]+)?/
 
-var dialects = obfuscate.dialects = Object.create(null)
+var dialects = (obfuscate.dialects = Object.create(null))
 
 dialects.mysql = [
-  replacer(join(
-    [doubleQuote, singleQuote, comment, multilineComment, hex, boolean, number],
-    'gi'
-  )),
+  replacer(join([doubleQuote, singleQuote, comment, multilineComment, hex, boolean, number], 'gi')),
   unmatchedPairs(/'|"|\/\*|\*\//)
 ]
 
 dialects.postgres = [
-  replacer(join(
-    [dollarQuote, singleQuote, comment, multilineComment, uuid, boolean, number],
-    'gi'
-  )),
+  replacer(
+    join([dollarQuote, singleQuote, comment, multilineComment, uuid, boolean, number], 'gi')
+  ),
   unmatchedPairs(/'|\/\*|\*\/|(?:\$(?!\?))/)
 ]
 
 dialects.cassandra = [
-  replacer(join(
-    [singleQuote, comment, multilineComment, uuid, hex, boolean, number],
-    'gi'
-  )),
+  replacer(join([singleQuote, comment, multilineComment, uuid, hex, boolean, number], 'gi')),
   unmatchedPairs(/'|\/\*|\*\//)
 ]
 
 dialects.oracle = [
-  replacer(join(
-    [oracleQuote, singleQuote, comment, multilineComment, number],
-    'gi'
-  )),
+  replacer(join([oracleQuote, singleQuote, comment, multilineComment, number], 'gi')),
   unmatchedPairs(/'|\/\*|\*\//)
 ]
 

package/lib/util/stream-sink.js

@@ -8,7 +8,6 @@
 var EventEmitter = require('events').EventEmitter
 var util = require('util')
 
-
 /**
  * Pipe a readable stream into this sink that fulfills the Writable Stream
  * contract and the callback will be fired when the stream has been completely
@@ -22,7 +21,7 @@ function StreamSink(callback) {
   this.writable = true
 
   var sink = this
-  this.on('error', function handle_error(error) {
+  this.on('error', function handleError(error) {
     sink.writable = false
     callback(error)
   })
@@ -31,7 +30,7 @@ util.inherits(StreamSink, EventEmitter)
 
 StreamSink.prototype.write = function write(string) {
   if (!this.writable) {
-    this.emit('error', new Error("Sink no longer writable!"))
+    this.emit('error', new Error('Sink no longer writable!'))
     return false
   }
 

package/lib/util/urltils.js

@@ -8,13 +8,13 @@
 var url = require('url')
 
 var LOCALHOST_NAMES = {
-  "localhost": true,
-  "127.0.0.1": true,
-  "0.0.0.0": true,
-  "0:0:0:0:0:0:0:1": true,
-  "::1": true,
-  "0:0:0:0:0:0:0:0": true,
-  "::": true
+  'localhost': true,
+  '127.0.0.1': true,
+  '0.0.0.0': true,
+  '0:0:0:0:0:0:0:1': true,
+  '::1': true,
+  '0:0:0:0:0:0:0:0': true,
+  '::': true
 }
 
 /**
@@ -208,9 +208,7 @@ module.exports = {
 
 function isIgnoredStatusCodeForErrors(config, code) {
   var codes = []
-  if (config &&
-      config.error_collector &&
-      config.error_collector.ignore_status_codes) {
+  if (config && config.error_collector && config.error_collector.ignore_status_codes) {
     codes = config.error_collector.ignore_status_codes
   }
   return codes.indexOf(parseInt(code, 10)) >= 0
@@ -218,9 +216,7 @@ function isIgnoredStatusCodeForErrors(config, code) {
 
 function isExpectedStatusCodeForErrors(config, code) {
   var codes = []
-  if (config &&
-      config.error_collector &&
-      config.error_collector.expected_status_codes) {
+  if (config && config.error_collector && config.error_collector.expected_status_codes) {
     codes = config.error_collector.expected_status_codes
   }
   return codes.indexOf(parseInt(code, 10)) >= 0

package/lib/utilization/aws-info.js

@@ -5,17 +5,16 @@
 
 'use strict'
 
-var logger = require('../logger.js').child({component: 'aws-info'})
+var logger = require('../logger.js').child({ component: 'aws-info' })
 var common = require('./common')
 var NAMES = require('../metrics/names.js')
+let results = null
 
 module.exports = fetchAWSInfo
 module.exports.clearCache = function clearAWSCache() {
   results = null
 }
 
-var results = null
-
 function fetchAWSInfo(agent, callback) {
   if (!agent.config.utilization || !agent.config.utilization.detect_aws) {
     return setImmediate(callback, null)

package/lib/utilization/azure-info.js

@@ -6,17 +6,15 @@
 'use strict'
 
 var common = require('./common')
-var logger = require('../logger.js').child({component: 'azure-info'})
+var logger = require('../logger.js').child({ component: 'azure-info' })
 var NAMES = require('../metrics/names.js')
-
+let results = null
 
 module.exports = fetchAzureInfo
 module.exports.clearCache = function clearAzureCache() {
   results = null
 }
 
-var results = null
-
 function fetchAzureInfo(agent, callback) {
   if (!agent.config.utilization || !agent.config.utilization.detect_azure) {
     return setImmediate(callback, null, null)
@@ -29,31 +27,35 @@ function fetchAzureInfo(agent, callback) {
   var instanceHost = '169.254.169.254'
   var apiVersion = '2017-03-01'
   var endpoint = '/metadata/instance/compute'
-  common.request({
-    host: instanceHost,
-    path: endpoint + '?api-version=' + apiVersion,
-    headers: {Metadata: 'true'}
-  }, agent, function getMetadata(err, data) {
-    if (err) {
-      return callback(err)
-    }
-
-    // Hopefully the data is parsable as JSON.
-    try {
-      data = JSON.parse(data)
-    } catch (e) {
-      logger.debug(e, 'Failed to parse Azure metadata.')
-      data = null
+  common.request(
+    {
+      host: instanceHost,
+      path: endpoint + '?api-version=' + apiVersion,
+      headers: { Metadata: 'true' }
+    },
+    agent,
+    function getMetadata(err, data) {
+      if (err) {
+        return callback(err)
+      }
+
+      // Hopefully the data is parsable as JSON.
+      try {
+        data = JSON.parse(data)
+      } catch (e) {
+        logger.debug(e, 'Failed to parse Azure metadata.')
+        data = null
+      }
+
+      // Get out just the keys we care about.
+      results = common.getKeys(data, ['location', 'name', 'vmId', 'vmSize'])
+      if (results == null) {
+        logger.debug('Azure metadata was invalid.')
+        agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.AZURE_ERROR).incrementCallCount()
+      }
+
+      // Call back!
+      callback(null, results)
     }
-
-    // Get out just the keys we care about.
-    results = common.getKeys(data, ['location', 'name', 'vmId', 'vmSize'])
-    if (results == null) {
-      logger.debug('Azure metadata was invalid.')
-      agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.AZURE_ERROR).incrementCallCount()
-    }
-
-    // Call back!
-    callback(null, results)
-  })
+  )
 }

package/lib/utilization/common.js

@@ -7,12 +7,11 @@
 
 var concat = require('concat-stream')
 var http = require('http')
-var logger = require('../logger').child({component: 'utilization-request'})
+var logger = require('../logger').child({ component: 'utilization-request' })
 var fs = require('../util/unwrapped-core').fs
 var properties = require('../util/properties')
 const url = require('url')
 
-
 exports.checkValueString = checkValueString
 function checkValueString(str) {
   if (!str || !str.length || Buffer.byteLength(str) > 255) {
@@ -72,11 +71,13 @@ exports.request = function request(opts, agent, cb) {
       agent.removeListener('errored', abortRequest)
       agent.removeListener('stopped', abortRequest)
       agent.removeListener('disconnected', abortRequest)
-      
+
       if (res.statusCode !== 200) {
         logger.debug(
           'Got %d %s from metadata request %j',
-          res.statusCode, res.statusMessage || '<n/a>', opts
+          res.statusCode,
+          res.statusMessage || '<n/a>',
+          opts
         )
         return cb(new Error('Request for metadata failed.'))
       } else if (!data) {

package/lib/utilization/docker-info.js

@@ -5,10 +5,11 @@
 
 'use strict'
 
-var logger = require('../logger').child({component: 'docker-info'})
+var logger = require('../logger').child({ component: 'docker-info' })
 var common = require('./common')
 var NAMES = require('../metrics/names')
 var os = require('os')
+let vendorInfo = null
 
 module.exports.getVendorInfo = fetchDockerVendorInfo
 module.exports.clearVendorCache = function clearDockerVendorCache() {
@@ -46,13 +47,10 @@ module.exports.getBootId = function getBootId(agent, callback) {
   })
 
   function bootIdError() {
-    agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.BOOT_ID_ERROR)
-      .incrementCallCount()
+    agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.BOOT_ID_ERROR).incrementCallCount()
   }
 }
 
-var vendorInfo = null
-
 function fetchDockerVendorInfo(agent, callback) {
   if (!agent.config.utilization || !agent.config.utilization.detect_docker) {
     return callback(null, null)
@@ -84,7 +82,7 @@ function fetchDockerVendorInfo(agent, callback) {
     })
 
     if (id) {
-      vendorInfo = {id: id}
+      vendorInfo = { id: id }
       callback(null, vendorInfo)
     } else {
       logger.debug('No matching cpu group found.')