newrelic 8.3.0 → 8.4.0

package/lib/instrumentation/promise.js

@@ -5,9 +5,9 @@
 
 'use strict'
 
-var util = require('util')
-var properties = require('../util/properties')
-var shimmer = require('../shimmer')
+const util = require('util')
+const properties = require('../util/properties')
+const shimmer = require('../shimmer')
 
 /**
  * @namespace Library.Spec
@@ -92,7 +92,7 @@ module.exports = function initialize(agent, library, spec) {
   wrapStaticMethods(library, spec.name, spec.$library)
 
   // Wrap prototype methods.
-  var Promise = library[spec.constructor]
+  const Promise = library[spec.constructor]
   wrapPrototype(Promise.prototype)
   wrapStaticMethods(Promise, spec.constructor, spec.$static)
 
@@ -114,7 +114,7 @@ module.exports = function initialize(agent, library, spec) {
       })
     }
 
-    var passThrough = spec.$static && spec.$static.$passThrough
+    const passThrough = spec.$static && spec.$static.$passThrough
     if (passThrough) {
       passThrough.forEach(function assignProxy(proxyProp) {
         if (!properties.hasOwn(wrappedPromise, proxyProp)) {
@@ -144,8 +144,8 @@ module.exports = function initialize(agent, library, spec) {
       return Promise(executor) // eslint-disable-line new-cap
     }
 
-    var parent = agent.tracer.segment
-    var promise = null
+    const parent = agent.tracer.segment
+    let promise = null
     if (
       !parent ||
       !parent.transaction.isActive() ||
@@ -155,19 +155,19 @@ module.exports = function initialize(agent, library, spec) {
       // We are expecting one function argument for executor, anything else is
       // non-standard, do not attempt to wrap. Also do not attempt to wrap if we
       // are not in a transaction.
-      var cnstrctArgs = agent.tracer.slice(arguments)
+      const cnstrctArgs = agent.tracer.slice(arguments)
       cnstrctArgs.unshift(Promise) // `unshift` === `push_front`
       promise = new (Promise.bind.apply(Promise, cnstrctArgs))()
     } else {
-      var segmentName = 'Promise ' + (executor.name || '<anonymous>')
-      var context = {
+      const segmentName = 'Promise ' + (executor.name || '<anonymous>')
+      const context = {
         promise: null,
         self: null,
         args: null
       }
       promise = new Promise(wrapExecutorContext(context))
       context.promise = promise
-      var segment = _createSegment(segmentName)
+      const segment = _createSegment(segmentName)
       Contextualizer.link(null, promise, segment, spec.useFinally)
 
       agent.tracer.segment = segment
@@ -221,24 +221,24 @@ module.exports = function initialize(agent, library, spec) {
 
   function wrapExecutorCaller(caller) {
     return function wrappedExecutorCaller(executor) {
-      var parent = agent.tracer.getSegment()
+      const parent = agent.tracer.getSegment()
       if (!(this instanceof Promise) || !parent || !parent.transaction.isActive()) {
         return caller.apply(this, arguments)
       }
 
-      var context = {
+      const context = {
         promise: this,
         self: null,
         args: null
       }
       if (!this.__NR_context) {
-        var segmentName = 'Promise ' + executor.name || '<anonymous>'
-        var segment = _createSegment(segmentName)
+        const segmentName = 'Promise ' + executor.name || '<anonymous>'
+        const segment = _createSegment(segmentName)
         Contextualizer.link(null, this, segment, spec.useFinally)
       }
-      var args = [].slice.call(arguments)
+      const args = [].slice.call(arguments)
       args[0] = wrapExecutorContext(context, this.__NR_context.getSegment())
-      var ret = caller.apply(this, args)
+      const ret = caller.apply(this, args)
 
       // Bluebird catches executor errors and auto-rejects when it catches them,
       // thus we need to do so as well.
@@ -274,7 +274,7 @@ module.exports = function initialize(agent, library, spec) {
 
   function wrapResolver(context, fn) {
     return function wrappedResolveReject(val) {
-      var promise = context.promise
+      const promise = context.promise
       if (promise && promise.__NR_context) {
         promise.__NR_context.getSegment().touch()
       }
@@ -323,14 +323,14 @@ module.exports = function initialize(agent, library, spec) {
         return then.apply(this, arguments)
       }
 
-      var segmentNamePrefix = 'Promise#' + name + ' '
-      var thenSegment = agent.tracer.getSegment()
-      var promise = this
+      const segmentNamePrefix = 'Promise#' + name + ' '
+      const thenSegment = agent.tracer.getSegment()
+      const promise = this
 
       // Wrap up the arguments and execute the real then.
-      var isWrapped = false
-      var args = [].map.call(arguments, wrapHandler)
-      var next = then.apply(this, args)
+      let isWrapped = false
+      const args = [].map.call(arguments, wrapHandler)
+      const next = then.apply(this, args)
 
       // If we got a promise (which we should have), link the parent's context.
       if (!isWrapped && next instanceof Promise && next !== promise) {
@@ -353,15 +353,15 @@ module.exports = function initialize(agent, library, spec) {
             return fn.apply(this, arguments)
           }
 
-          var promSegment = next.__NR_context.getSegment()
-          var segmentName = segmentNamePrefix + (fn.name || '<anonymous>')
-          var segment = _createSegment(segmentName, promSegment)
+          let promSegment = next.__NR_context.getSegment()
+          const segmentName = segmentNamePrefix + (fn.name || '<anonymous>')
+          const segment = _createSegment(segmentName, promSegment)
           if (segment && segment !== promSegment) {
             next.__NR_context.setSegment(segment)
             promSegment = segment
           }
 
-          var ret = null
+          let ret = null
           try {
             ret = agent.tracer.bindFunction(fn, promSegment, true).apply(this, arguments)
           } finally {
@@ -383,10 +383,10 @@ module.exports = function initialize(agent, library, spec) {
       return cast
     }
 
-    var CAST_SEGMENT_NAME = 'Promise.' + name
+    const CAST_SEGMENT_NAME = 'Promise.' + name
     return function __NR_wrappedCast() {
-      var segment = _createSegment(CAST_SEGMENT_NAME)
-      var prom = cast.apply(this, arguments)
+      const segment = _createSegment(CAST_SEGMENT_NAME)
+      const prom = cast.apply(this, arguments)
       if (segment) {
         Contextualizer.link(null, prom, segment, spec.useFinally)
       }
@@ -399,9 +399,9 @@ module.exports = function initialize(agent, library, spec) {
       return promisify
     }
 
-    var WRAP_SEGMENT_NAME = 'Promise.' + name
+    const WRAP_SEGMENT_NAME = 'Promise.' + name
     return function __NR_wrappedPromisify() {
-      var promisified = promisify.apply(this, arguments)
+      const promisified = promisify.apply(this, arguments)
       if (typeof promisified !== 'function') {
         return promisified
       }
@@ -412,8 +412,8 @@ module.exports = function initialize(agent, library, spec) {
 
       return __NR_wrappedPromisified
       function __NR_wrappedPromisified() {
-        var segment = _createSegment(WRAP_SEGMENT_NAME)
-        var prom = agent.tracer.bindFunction(promisified, segment, true).apply(this, arguments)
+        const segment = _createSegment(WRAP_SEGMENT_NAME)
+        const prom = agent.tracer.bindFunction(promisified, segment, true).apply(this, arguments)
 
         if (segment) {
           Contextualizer.link(null, prom, segment, spec.useFinally)
@@ -466,7 +466,7 @@ function Contextualizer(idx, context, useFinally) {
 module.exports.Contextualizer = Contextualizer
 
 Contextualizer.link = function link(prev, next, segment, useFinally) {
-  var ctxlzr = prev && prev.__NR_context
+  let ctxlzr = prev && prev.__NR_context
   if (ctxlzr && !ctxlzr.isActive()) {
     ctxlzr = prev.__NR_context = null
   }
@@ -489,9 +489,9 @@ Contextualizer.link = function link(prev, next, segment, useFinally) {
       //
       // Note: This does not account for branches of branches. That may result
       // in improperly parented segments.
-      var parent = ctxlzr
-      var child = ctxlzr.child
-      var branchIdx = ctxlzr.context.branch()
+      let parent = ctxlzr
+      let child = ctxlzr.child
+      const branchIdx = ctxlzr.context.branch()
       do {
         child.parentIdx = parent.idx
         child.idx = branchIdx
@@ -507,7 +507,7 @@ Contextualizer.link = function link(prev, next, segment, useFinally) {
 
     // If this is a branching link then create a new branch for the next promise.
     // Otherwise, we can just piggy-back on the previous link's spot.
-    var idx = ctxlzr.child === false ? ctxlzr.context.branch() : ctxlzr.idx
+    const idx = ctxlzr.child === false ? ctxlzr.context.branch() : ctxlzr.idx
 
     // Create a new context for this next promise.
     next.__NR_context = new Contextualizer(idx, ctxlzr.context, ctxlzr.useFinally)
@@ -527,14 +527,14 @@ Contextualizer.link = function link(prev, next, segment, useFinally) {
 Contextualizer.prototype = Object.create(null)
 
 Contextualizer.prototype.isActive = function isActive() {
-  var segments = this.context.segments
-  var segment = segments[this.idx] || segments[this.parentIdx] || segments[0]
+  const segments = this.context.segments
+  const segment = segments[this.idx] || segments[this.parentIdx] || segments[0]
   return segment && segment.transaction.isActive()
 }
 
 Contextualizer.prototype.getSegment = function getSegment() {
-  var segments = this.context.segments
-  var segment = segments[this.idx]
+  const segments = this.context.segments
+  let segment = segments[this.idx]
   if (segment == null) {
     segment = segments[this.idx] = segments[this.parentIdx] || segments[0]
   }
@@ -550,8 +550,8 @@ Contextualizer.prototype.toJSON = function toJSON() {
 }
 
 Contextualizer.prototype.continue = function continueContext(prom) {
-  var self = this
-  var nextContext = prom.__NR_context
+  const self = this
+  const nextContext = prom.__NR_context
   if (!nextContext) {
     return prom
   }

package/lib/instrumentation/q.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var wrap = require('../shimmer').wrapMethod
+const wrap = require('../shimmer').wrapMethod
 
 module.exports = initialize
 
@@ -17,7 +17,7 @@ function initialize(agent, Q) {
   if (Q.nextTick) {
     // The wrap() call for nextTick wipes the sub-function.  Save a reference
     // now so it can be restored later
-    var savedRunAfter = Q.nextTick.runAfter
+    const savedRunAfter = Q.nextTick.runAfter
 
     wrap(Q, 'Q', 'nextTick', wrapUninstrumented)
 

package/lib/instrumentation/redis.js

@@ -5,11 +5,11 @@
 
 'use strict'
 
-var hasOwnProperty = require('../util/properties').hasOwn
-var stringify = require('json-stringify-safe')
+const hasOwnProperty = require('../util/properties').hasOwn
+const stringify = require('json-stringify-safe')
 
 module.exports = function initialize(agent, redis, moduleName, shim) {
-  var proto = redis && redis.RedisClient && redis.RedisClient.prototype
+  const proto = redis && redis.RedisClient && redis.RedisClient.prototype
   if (!proto) {
     return false
   }
@@ -20,9 +20,9 @@ module.exports = function initialize(agent, redis, moduleName, shim) {
       proto,
       'internal_send_command',
       function wrapInternalSendCommand(shim, _, __, args) {
-        var commandObject = args[0]
-        var keys = commandObject.args
-        var parameters = getInstanceParameters(this)
+        const commandObject = args[0]
+        const keys = commandObject.args
+        const parameters = getInstanceParameters(this)
 
         if (keys && keys.length > 0) {
           try {
@@ -40,7 +40,7 @@ module.exports = function initialize(agent, redis, moduleName, shim) {
             if (shim.isFunction(commandObject.callback)) {
               shim.bindCallbackSegment(commandObject, 'callback', segment)
             } else {
-              var self = this
+              const self = this
               commandObject.callback = shim.bindSegment(
                 function NRCallback(err) {
                   if (err && self.emit instanceof Function) {
@@ -58,8 +58,8 @@ module.exports = function initialize(agent, redis, moduleName, shim) {
   } else {
     // For redis versions <2.6.1
     shim.recordOperation(proto, 'send_command', function wrapSendCommand(shim, _, __, args) {
-      var keys = args[1]
-      var parameters = getInstanceParameters(this)
+      const keys = args[1]
+      const parameters = getInstanceParameters(this)
 
       if (keys && !shim.isFunction(keys)) {
         try {
@@ -74,7 +74,7 @@ module.exports = function initialize(agent, redis, moduleName, shim) {
         name: args[0] || 'other',
         parameters: parameters,
         callback: function bindCallback(shim, _f, _n, segment) {
-          var last = args[args.length - 1]
+          const last = args[args.length - 1]
           if (shim.isFunction(last)) {
             shim.bindCallbackSegment(args, shim.LAST, segment)
           } else if (shim.isArray(last) && shim.isFunction(last[last.length - 1])) {
@@ -108,7 +108,7 @@ module.exports = function initialize(agent, redis, moduleName, shim) {
     }
 
     function doCapture(opts) {
-      var db = (hasOwnProperty(client, 'selected_db') ? client.selected_db : opts.db) || 0
+      const db = (hasOwnProperty(client, 'selected_db') ? client.selected_db : opts.db) || 0
 
       return {
         host: opts.host || 'localhost',

package/lib/instrumentation/restify.js

@@ -47,7 +47,7 @@ module.exports = function initialize(agent, restify, moduleName, shim) {
 
   function wrapServer(serverProto) {
     // These are all the methods for mounting routed middleware.
-    var routings = ['del', 'get', 'head', 'opts', 'post', 'put', 'patch']
+    const routings = ['del', 'get', 'head', 'opts', 'post', 'put', 'patch']
     shim.wrapMiddlewareMounter(serverProto, routings, {
       route: shim.FIRST,
       endpoint: shim.LAST,

package/lib/instrumentation/vision.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-var semver = require('semver')
+const semver = require('semver')
 
 module.exports = function initialize(agent, vision, moduleName, shim) {
-  var plugin = vision.plugin
+  const plugin = vision.plugin
 
   if (!plugin || !plugin.pkg || semver.lt(plugin.pkg.version, '5.0.0')) {
     shim.logger.debug('Vision instrumentation requires v5 or greater, not instrumenting')
@@ -22,7 +22,7 @@ module.exports = function initialize(agent, vision, moduleName, shim) {
     return function wrappedRegister(server) {
       shim.wrap(server, 'decorate', wrapDecorate)
 
-      var ret = register.apply(this, arguments)
+      const ret = register.apply(this, arguments)
 
       shim.unwrapOnce(server, 'decorate')
 
@@ -37,7 +37,7 @@ function wrapDecorate(shim, decorate) {
       return decorate.apply(this, arguments)
     }
 
-    var args = shim.argsToArray.apply(shim, arguments)
+    const args = shim.argsToArray.apply(shim, arguments)
     args[2] = shim.recordRender(handler, { promise: true })
 
     return decorate.apply(this, args)

package/lib/instrumentation/when.js

@@ -5,9 +5,9 @@
 
 'use strict'
 
-var promInit = require('./promise')
+const promInit = require('./promise')
 
-var STATIC_PROMISE_METHODS = [
+const STATIC_PROMISE_METHODS = [
   'reject',
   'resolve',
   'all',
@@ -19,7 +19,7 @@ var STATIC_PROMISE_METHODS = [
   'reduceRight'
 ]
 
-var WHEN_SPEC = {
+const WHEN_SPEC = {
   name: 'when',
   constructor: 'Promise',
   executor: true,

package/lib/instrumentations.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var MODULE_TYPE = require('./shim/constants').MODULE_TYPE
+const MODULE_TYPE = require('./shim/constants').MODULE_TYPE
 
 // Return a new copy of this array every time we're called
 module.exports = function instrumentations() {

package/lib/logger.js

@@ -5,8 +5,8 @@
 
 'use strict'
 
-var Logger = require('./util/logger')
-var fs = require('./util/unwrapped-core').fs
+const Logger = require('./util/logger')
+const fs = require('./util/unwrapped-core').fs
 
 // create bootstrapping logger
 module.exports = new Logger({
@@ -20,9 +20,9 @@ module.exports = new Logger({
  * module, and if it gets loaded too early, module.exports will have no
  * value.
  */
-var config = require('./config').getOrCreateInstance()
+const config = require('./config').getOrCreateInstance()
 if (config) {
-  var options = {
+  const options = {
     name: 'newrelic',
     level: config.logging.level,
     enabled: config.logging.enabled
@@ -32,7 +32,7 @@ if (config) {
   module.exports = new Logger(options)
 
   if (config.logging.enabled) {
-    var stream
+    let stream
     switch (config.logging.filepath) {
       case 'stdout':
         stream = process.stdout

package/lib/metrics/index.js

@@ -82,7 +82,7 @@ function Metrics(apdexT, mapper, normalizer) {
 Metrics.prototype.measureMilliseconds = measureMilliseconds
 
 function measureMilliseconds(name, scope, duration, exclusive) {
-  var stats = this.getOrCreateMetric(name, scope)
+  const stats = this.getOrCreateMetric(name, scope)
   stats.recordValueInMillis(duration, exclusive)
   return stats
 }
@@ -96,7 +96,7 @@ function measureMilliseconds(name, scope, duration, exclusive) {
  * @return {Stats} The aggregated data related to this metric.
  */
 Metrics.prototype.measureBytes = function measureBytes(name, size) {
-  var stats = this.getOrCreateMetric(name)
+  const stats = this.getOrCreateMetric(name)
   stats.recordValueInBytes(size)
   return stats
 }
@@ -110,8 +110,8 @@ Metrics.prototype.measureBytes = function measureBytes(name, size) {
  * @return {Stats} The aggregated data for that name.
  */
 Metrics.prototype.getOrCreateMetric = function getOrCreateMetric(name, scope) {
-  var resolved = this._resolve(scope)
-  var stats = resolved[name]
+  const resolved = this._resolve(scope)
+  let stats = resolved[name]
   if (!stats) {
     this.empty = false
     stats = resolved[name] = new Stats()
@@ -141,14 +141,14 @@ function getOrCreateApdexMetric(name, scope, overrideApdex) {
     throw new Error('Metrics must be named')
   }
 
-  var resolved = this._resolve(scope)
+  const resolved = this._resolve(scope)
 
   if (!resolved[name]) {
     this.empty = false
 
     // Only use the given override to create the metric if this is not the
     // global apdex AND we have a valid value.
-    var apdexT =
+    const apdexT =
       name !== NAMES.APDEX && overrideApdex > 0 ? overrideApdex * FROM_MILLIS : this.apdexT
     resolved[name] = new ApdexStats(apdexT)
   }
@@ -209,12 +209,12 @@ Metrics.prototype.merge = function merge(other, adjustStartTime) {
   // Loop through all scopes and merge them. Since we know `.scoped` has a `null`
   // prototype we don't need to worry about own property checks.
   // eslint-disable-next-line guard-for-in
-  for (var scope in other.scoped) {
+  for (const scope in other.scoped) {
     _merge(this._resolve(scope), other.scoped[scope])
   }
 }
 function _merge(a, b) {
-  for (var name in b) {
+  for (const name in b) {
     if (a[name]) {
       a[name].merge(b[name])
     } else {
@@ -232,7 +232,7 @@ function _merge(a, b) {
  *                  un-scoped metrics if the scope isn't set.
  */
 Metrics.prototype._resolve = function _resolve(scope) {
-  var resolved = this.unscoped
+  let resolved = this.unscoped
 
   if (scope) {
     resolved = this.scoped[scope]
@@ -255,7 +255,7 @@ Metrics.prototype._getUnscopedData = function _getUnscopedData(name) {
     return
   }
 
-  var normalized = this.normalizer.normalize(name)
+  const normalized = this.normalizer.normalize(name)
   if (normalized.ignore || !normalized.value) {
     return
   }
@@ -274,7 +274,7 @@ Metrics.prototype._getScopedData = function _getScopedData(name, scope) {
     return
   }
 
-  var normalized = this.normalizer.normalize(name)
+  const normalized = this.normalizer.normalize(name)
   if (normalized.ignore || !normalized.value) {
     return
   }
@@ -287,10 +287,10 @@ Metrics.prototype._getScopedData = function _getScopedData(name, scope) {
  *                  for use by toJSON.
  */
 Metrics.prototype._toUnscopedData = function _toUnscopedData() {
-  var metricData = []
+  const metricData = []
 
   Object.keys(this.unscoped).forEach((name) => {
-    var data = this._getUnscopedData(name)
+    const data = this._getUnscopedData(name)
     if (data) {
       metricData.push(data)
     }
@@ -304,11 +304,11 @@ Metrics.prototype._toUnscopedData = function _toUnscopedData() {
  *                  use by toJSON.
  */
 Metrics.prototype._toScopedData = function _toScopedData() {
-  var metricData = []
+  const metricData = []
 
   Object.keys(this.scoped).forEach(function forEachScope(scope) {
     Object.keys(this.scoped[scope]).forEach(function forEachMetric(name) {
-      var data = this._getScopedData(name, scope)
+      const data = this._getScopedData(name, scope)
       if (data) {
         metricData.push(data)
       }

package/lib/metrics/mapper.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var logger = require('../logger').child({ component: 'mapper' })
+const logger = require('../logger').child({ component: 'mapper' })
 
 /**
  * To tighten up the metrics JSON, the collector will maintain a list of
@@ -41,12 +41,12 @@ MetricMapper.prototype.load = function load(raw) {
     return
   }
 
-  for (var i = 0; i < raw.length; i++) {
-    var spec = raw[i][0]
-    var scope = spec.scope
-    var name = spec.name
-    var id = raw[i][1]
-    var resolved
+  for (let i = 0; i < raw.length; i++) {
+    const spec = raw[i][0]
+    const scope = spec.scope
+    const name = spec.name
+    const id = raw[i][1]
+    let resolved
 
     if (scope) {
       if (!this.scoped[scope]) {

package/lib/metrics/normalizer/rule.js

@@ -5,12 +5,12 @@
 
 'use strict'
 
-var logger = require('../../logger').child({ component: 'normalizer_rule' })
+const logger = require('../../logger').child({ component: 'normalizer_rule' })
 
 /**
  * JavaScript just has to do things slightly differently.
  */
-var replaceReplacer = function replaceReplacer(input) {
+const replaceReplacer = function replaceReplacer(input) {
   return input.replace(/\\/g, '$')
 }
 
@@ -37,7 +37,7 @@ function NormalizerRule(json) {
   this.ignore = json.ignore || false
   this.matched = false
 
-  var modifiers = 'i'
+  let modifiers = 'i'
   if (this.replaceAll) {
     modifiers += 'g'
   }
@@ -78,9 +78,9 @@ NormalizerRule.prototype.getSegments = function getSegments(input) {
  * @return {bool} - True if this rule matches the given input, otherwise false.
  */
 NormalizerRule.prototype.matches = function matches(input) {
-  var segments = this.getSegments(input)
+  const segments = this.getSegments(input)
 
-  for (var i = 0; i < segments.length; ++i) {
+  for (let i = 0; i < segments.length; ++i) {
     if (this.pattern.test(segments[i])) {
       return true
     }
@@ -118,7 +118,7 @@ NormalizerRule.prototype.apply = function apply(input) {
   }
 
   this.matched = false
-  var result = this.getSegments(input)
+  const result = this.getSegments(input)
     .map(function applyMap(segment) {
       // Discussion of why we use `lastIndex` in function documentation to
       // prevent de-opt due to long function.
@@ -154,9 +154,9 @@ NormalizerRule.prototype.toJSON = function toJSON() {
  * @return {RegExp} - A regular expression with all the given flags added.
  */
 function _addRegExpFlags(re, flags) {
-  var foundMissing = false
-  var reFlags = re.flags
-  for (var i = 0; i < flags.length; ++i) {
+  let foundMissing = false
+  let reFlags = re.flags
+  for (let i = 0; i < flags.length; ++i) {
     if (reFlags.indexOf(flags[i]) === -1) {
       foundMissing = true
       reFlags += flags[i]