newrelic 8.3.0 → 8.5.2

package/lib/shim/shim.js

@@ -40,8 +40,8 @@ function Shim(agent, moduleName, resolvedName) {
   this.defineProperty(this, 'moduleName', moduleName)
 
   // Determine the root directory of the module.
-  var moduleRoot = null
-  var next = resolvedName || '/'
+  let moduleRoot = null
+  let next = resolvedName || '/'
   do {
     moduleRoot = next
     next = path.dirname(moduleRoot)
@@ -611,14 +611,14 @@ function wrap(nodule, properties, spec, args) {
   this.logger.trace('Wrapping %d properties on nodule.', properties.length)
   properties.forEach(function wrapEachProperty(prop) {
     // Skip nonexistent properties.
-    var original = nodule[prop]
+    const original = nodule[prop]
     if (!original) {
       this.logger.debug('Not wrapping missing property "%s"', prop)
       return
     }
 
     // Wrap up the property and add a special unwrapper.
-    var wrapped = _wrap(this, original, prop, spec, args)
+    const wrapped = _wrap(this, original, prop, spec, args)
     if (wrapped && wrapped !== original) {
       this.logger.trace('Replacing "%s" with wrapped version', prop)
 
@@ -812,7 +812,7 @@ function wrapClass(nodule, properties, spec, args) {
 
     // When es6 classes are being wrapped, we need to use an es6 class due to
     // the fact our es5 wrapper depends on calling the constructor without `new`.
-    var wrapper = spec.es6 || /^class /.test(Base.toString()) ? _es6WrapClass : _es5WrapClass
+    const wrapper = spec.es6 || /^class /.test(Base.toString()) ? _es6WrapClass : _es5WrapClass
 
     return wrapper(shim, Base, fnName, spec, args)
   })
@@ -925,8 +925,8 @@ function record(nodule, properties, recordNamer) {
 
     return function wrapper() {
       // Create the segment that will be recorded.
-      var args = argsToArray.apply(shim, arguments)
-      var segDesc = recordNamer.call(this, shim, fn, name, args)
+      const args = argsToArray.apply(shim, arguments)
+      let segDesc = recordNamer.call(this, shim, fn, name, args)
       if (!segDesc) {
         shim.logger.trace('No segment descriptor for "%s", not recording.', name)
         return fnApply.call(fn, this, args)
@@ -934,7 +934,7 @@ function record(nodule, properties, recordNamer) {
       segDesc = new specs.RecorderSpec(segDesc)
 
       // See if we're in an active transaction.
-      var parent
+      let parent
       if (segDesc.parent) {
         // We only want to continue recording in a transaction if the
         // transaction is active.
@@ -955,12 +955,12 @@ function record(nodule, properties, recordNamer) {
       // Only create a segment if:
       //  - We are _not_ making an internal segment.
       //  - OR the parent segment is either not internal or not from this shim.
-      var shouldCreateSegment = !(
+      const shouldCreateSegment = !(
         parent.opaque ||
         (segDesc.internal && parent.internal && shim === parent.shim)
       )
 
-      var segment = shouldCreateSegment ? _rawCreateSegment(shim, segDesc) : parent
+      const segment = shouldCreateSegment ? _rawCreateSegment(shim, segDesc) : parent
 
       return _doRecord.call(this, segment, args, segDesc, shouldCreateSegment)
     }
@@ -991,7 +991,7 @@ function record(nodule, properties, recordNamer) {
       // The reason there is no check for `segment` is because it should
       // be guaranteed by the parent and active transaction check
       // at the beginning of this function.
-      var ret = _applyRecorderSegment(segment, this, args, segDesc)
+      let ret = _applyRecorderSegment(segment, this, args, segDesc)
       if (ret) {
         if (segDesc.stream) {
           shim.logger.trace('Binding return value as stream.')
@@ -1008,9 +1008,9 @@ function record(nodule, properties, recordNamer) {
     }
 
     function _applyRecorderSegment(segment, ctx, args, segDesc) {
-      var error = null
-      var promised = false
-      var ret
+      let error = null
+      let promised = false
+      let ret
       try {
         ret = shim.applySegment(fn, segment, true, ctx, args, segDesc.inContext)
         if (segDesc.after && segDesc.promise && shim.isPromise(ret)) {
@@ -1074,7 +1074,7 @@ function unwrap(nodule, properties) {
   }
 
   this.logger.trace('Unwrapping %s', properties || '<nodule>')
-  var original = properties ? nodule[properties] : nodule
+  let original = properties ? nodule[properties] : nodule
   while (original && original.__NR_original) {
     original = this.isFunction(original.__NR_unwrap)
       ? original.__NR_unwrap()
@@ -1116,7 +1116,7 @@ function unwrapOnce(nodule, properties) {
   }
 
   this.logger.trace('Unwrapping %s', properties || '<nodule>')
-  var original = properties ? nodule[properties] : nodule
+  let original = properties ? nodule[properties] : nodule
   if (original && original.__NR_original) {
     original = this.isFunction(original.__NR_unwrap)
       ? original.__NR_unwrap()
@@ -1146,7 +1146,7 @@ function getOriginal(nodule, property) {
     return nodule
   }
 
-  var original = property ? nodule[property] : nodule
+  let original = property ? nodule[property] : nodule
   while (original && original.__NR_original) {
     original = original.__NR_original
   }
@@ -1202,7 +1202,7 @@ function bindSegment(nodule, property, segment, full) {
     return nodule
   }
 
-  var wrapped = this.wrap(nodule, property, function wrapFunc(shim, func) {
+  const wrapped = this.wrap(nodule, property, function wrapFunc(shim, func) {
     if (!shim.isFunction(func)) {
       return func
     }
@@ -1213,7 +1213,7 @@ function bindSegment(nodule, property, segment, full) {
       return func
     }
 
-    var binder = _makeBindWrapper(shim, func, segment, full || false)
+    const binder = _makeBindWrapper(shim, func, segment, full || false)
     shim.storeSegment(binder, segment)
     return binder
   })
@@ -1248,7 +1248,7 @@ function bindCallbackSegment(args, cbIdx, parentSegment) {
   }
 
   if (this.isNumber(cbIdx)) {
-    var normalizedCBIdx = normalizeIndex(args.length, cbIdx)
+    const normalizedCBIdx = normalizeIndex(args.length, cbIdx)
     if (normalizedCBIdx === null) {
       // Bad index.
       this.logger.debug(
@@ -1262,16 +1262,16 @@ function bindCallbackSegment(args, cbIdx, parentSegment) {
   }
 
   // Pull out the callback and make sure it is a function.
-  var cb = args[cbIdx]
+  const cb = args[cbIdx]
   if (this.isFunction(cb)) {
-    var shim = this
-    var realParent = parentSegment || shim.getSegment()
+    const shim = this
+    const realParent = parentSegment || shim.getSegment()
     args[cbIdx] = shim.wrap(cb, null, function callbackWrapper(shim, fn, name) {
       return function wrappedCallback() {
         if (realParent) {
           realParent.opaque = false
         }
-        var segment = _rawCreateSegment(
+        const segment = _rawCreateSegment(
           shim,
           new specs.SegmentSpec({
             name: 'Callback: ' + name,
@@ -1331,7 +1331,7 @@ function getSegment(obj) {
  *  associated with the object.
  */
 function getActiveSegment(obj) {
-  var segment = this.getSegment(obj)
+  const segment = this.getSegment(obj)
   if (segment && segment.transaction && segment.transaction.isActive()) {
     return segment
   }
@@ -1414,8 +1414,8 @@ function applySegment(func, segment, full, context, args, inContextCB) {
   this.logger.trace('Applying segment %s', segment.name)
 
   // Set this segment as the current one on the tracer.
-  var tracer = this.tracer
-  var prevSegment = tracer.segment
+  const tracer = this.tracer
+  const prevSegment = tracer.segment
   tracer.segment = segment
   if (full) {
     segment.start()
@@ -1466,7 +1466,7 @@ function applySegment(func, segment, full, context, args, inContextCB) {
  *  `null` is returned.
  */
 function createSegment(name, recorder, parent) {
-  var opts = null
+  let opts = null
   if (this.isString(name)) {
     // createSegment(name [, recorder] [, parent])
     opts = new specs.SegmentSpec({ name })
@@ -1500,7 +1500,7 @@ function _rawCreateSegment(shim, opts) {
     return opts.parent
   }
 
-  var segment = shim.tracer.createSegment(opts.name, opts.recorder, opts.parent)
+  const segment = shim.tracer.createSegment(opts.name, opts.recorder, opts.parent)
   if (segment) {
     segment.internal = opts.internal
     segment.opaque = opts.opaque
@@ -1645,9 +1645,9 @@ function isNull(val) {
  *  array-like.
  */
 function toArray(obj) {
-  var len = obj.length
-  var arr = new Array(len)
-  for (var i = 0; i < len; ++i) {
+  const len = obj.length
+  const arr = new Array(len)
+  for (let i = 0; i < len; ++i) {
     arr[i] = obj[i]
   }
   return arr
@@ -1667,9 +1667,9 @@ function toArray(obj) {
  * @see https://github.com/petkaantonov/bluebird/wiki/Optimization-killers
  */
 function argsToArray() {
-  var len = arguments.length
-  var arr = new Array(len)
-  for (var i = 0; i < len; ++i) {
+  const len = arguments.length
+  const arr = new Array(len)
+  for (let i = 0; i < len; ++i) {
     arr[i] = arguments[i]
   }
   return arr
@@ -1705,7 +1705,7 @@ function normalizeIndex(arrayLength, idx) {
  * @return {function} A function which will execute `fn` at most once.
  */
 function once(fn) {
-  var called = false
+  let called = false
   return function onceCaller() {
     if (!called) {
       called = true
@@ -1773,7 +1773,7 @@ function _slowSetInternalProperty(obj, name, val) {
  */
 function defineProperty(obj, name, value) {
   // We have define property! Use that.
-  var prop = {
+  const prop = {
     enumerable: true,
     configurable: true
   }
@@ -1797,9 +1797,9 @@ function defineProperty(obj, name, value) {
  * @see Shim#defineProperty
  */
 function defineProperties(obj, props) {
-  var keys = Object.keys(props)
-  for (var i = 0; i < keys.length; ++i) {
-    var key = keys[i]
+  const keys = Object.keys(props)
+  for (let i = 0; i < keys.length; ++i) {
+    const key = keys[i]
     defineProperty(obj, key, props[key])
   }
 }
@@ -1821,10 +1821,10 @@ function setDefaults(obj, defaults) {
   if (!obj) {
     obj = Object.create(null)
   }
-  var keys = Object.keys(defaults)
+  const keys = Object.keys(defaults)
 
-  for (var i = 0; i < keys.length; ++i) {
-    var key = keys[i]
+  for (let i = 0; i < keys.length; ++i) {
+    const key = keys[i]
     if (!hasOwnProperty(obj, key)) {
       obj[key] = defaults[key]
     }
@@ -1946,7 +1946,7 @@ function bindPromise(promise, segment) {
  * @param {object}        parameters  - The parameters to copy.
  */
 function copySegmentParameters(segment, parameters) {
-  for (var key in parameters) {
+  for (const key in parameters) {
     if (hasOwnProperty(parameters, key)) {
       segment.addAttribute(key, parameters[key])
     }
@@ -2030,13 +2030,13 @@ function _specToFunction(spec) {
  */
 function _wrap(shim, original, name, spec, args) {
   // Assemble the spec's arguments.
-  var specArgs = [shim, original, name]
+  const specArgs = [shim, original, name]
   if (args && args.length) {
     specArgs.push.apply(specArgs, args)
   }
 
   // Apply the spec and see if it returned a wrapped version of the property.
-  var wrapped = spec.wrapper.apply(null, specArgs)
+  let wrapped = spec.wrapper.apply(null, specArgs)
   if (wrapped && wrapped !== original) {
     if (spec.matchArity && shim.isFunction(wrapped)) {
       wrapped = arity.fixArity(original, wrapped)
@@ -2140,7 +2140,7 @@ function _bindAllCallbacks(shim, fn, name, args, spec) {
       callback.call(context, shim, fn, name, spec.segment, args)
     } else if (shim.isNumber(callback)) {
       shim.logger.trace('Binding callback %d segment: %j', callback, !!spec.segment)
-      var cbIdx = normalizeIndex(args.length, callback)
+      const cbIdx = normalizeIndex(args.length, callback)
       if (cbIdx !== null) {
         if (spec.shouldCreateSegment) {
           binder.call(shim, args, cbIdx, spec.segment)
@@ -2191,25 +2191,25 @@ function _bindStream(shim, stream, segment, spec) {
 
   // We have a segment and an emit function, pull out the relevant parts of the
   // spec and prepare to create an event segment.
-  var specEvent = (spec && spec.event) || null
-  var shouldCreateSegment = (spec && spec.shouldCreateSegment) || false
-  var segmentName = 'Event callback: ' + specEvent
+  const specEvent = (spec && spec.event) || null
+  const shouldCreateSegment = (spec && spec.shouldCreateSegment) || false
+  const segmentName = 'Event callback: ' + specEvent
 
   // Wrap emit such that each event handler is executed within context of this
   // segment or the event-specific segment.
   shim.wrap(stream, 'emit', function wrapStreamEmit(shim, emit) {
-    var tx = segment.transaction
-    var streamBoundEmit = shim.bindSegment(emit, segment, true)
-    var eventSegment = null
-    var eventBoundEmit = null
-    var emitCount = 0
+    const tx = segment.transaction
+    const streamBoundEmit = shim.bindSegment(emit, segment, true)
+    let eventSegment = null
+    let eventBoundEmit = null
+    let emitCount = 0
 
     if (!shouldCreateSegment) {
       return streamBoundEmit
     }
 
     return function wrappedEmit(evnt) {
-      var emitToCall = streamBoundEmit
+      let emitToCall = streamBoundEmit
       if (evnt === specEvent && tx.isActive()) {
         if (!eventBoundEmit) {
           eventSegment = shim.createSegment(segmentName, segment)
@@ -2235,7 +2235,7 @@ function _bindStream(shim, stream, segment, spec) {
 
     return function wrappedOn(onEvent) {
       if (onEvent !== specEvent && (onEvent === 'end' || onEvent === 'error')) {
-        var args = argsToArray.apply(shim, arguments)
+        const args = argsToArray.apply(shim, arguments)
         shim.bindCallbackSegment(args, shim.LAST, segment)
         return fn.apply(this, args)
       }
@@ -2271,9 +2271,9 @@ function _bindStream(shim, stream, segment, spec) {
 function _es6WrapClass(shim, Base, fnName, spec, args) {
   return class WrappedClass extends Base {
     constructor() {
-      var cnstrctArgs = shim.argsToArray.apply(shim, arguments)
+      const cnstrctArgs = shim.argsToArray.apply(shim, arguments)
       // Assemble the arguments to hand to the spec.
-      var _args = [shim, Base, fnName, cnstrctArgs]
+      const _args = [shim, Base, fnName, cnstrctArgs]
       if (args.length > 0) {
         _args.push.apply(_args, args)
       }
@@ -2313,7 +2313,7 @@ function _es6WrapClass(shim, Base, fnName, spec, args) {
  */
 function _es5WrapClass(shim, Base, fnName, spec, args) {
   function WrappedClass() {
-    var cnstrctArgs = argsToArray.apply(shim, arguments)
+    const cnstrctArgs = argsToArray.apply(shim, arguments)
     if (!(this instanceof WrappedClass)) {
       // Some libraries support calling constructors without the `new` keyword.
       // In order to support this we must apply the super constructor if `this`
@@ -2324,7 +2324,7 @@ function _es5WrapClass(shim, Base, fnName, spec, args) {
     }
 
     // Assemble the arguments to hand to the spec.
-    var _args = [shim, Base, fnName, cnstrctArgs]
+    const _args = [shim, Base, fnName, cnstrctArgs]
     if (args.length > 0) {
       _args.push.apply(_args, args)
     }

package/lib/shim/specs/index.js

@@ -5,8 +5,8 @@
 
 'use strict'
 
-var hasOwnProperty = require('../../util/properties').hasOwn
-var util = require('util')
+const hasOwnProperty = require('../../util/properties').hasOwn
+const util = require('util')
 
 /**
  * Enumeration of argument indexes.
@@ -21,7 +21,7 @@ var util = require('util')
  * @memberof Shim.prototype
  * @enum {number}
  */
-var ARG_INDEXES = {
+const ARG_INDEXES = {
   FIRST: 0,
   SECOND: 1,
   THIRD: 2,