newrelic 8.3.0 → 8.5.2

package/lib/instrumentation/cassandra-driver.js

@@ -6,10 +6,14 @@
 'use strict'
 
 module.exports = function initialize(agent, cassandra, moduleName, shim) {
-  var proto = cassandra.Client.prototype
+  const proto = cassandra.Client.prototype
   shim.setDatastore(shim.CASSANDRA)
   shim.recordOperation(proto, ['connect', 'shutdown'], { callback: shim.LAST })
-  shim.recordQuery(proto, '_innerExecute', { query: shim.FIRST, callback: shim.LAST })
+  if (proto._innerExecute) {
+    shim.recordQuery(proto, '_innerExecute', { query: shim.FIRST, callback: shim.LAST })
+  } else {
+    shim.recordQuery(proto, '_execute', { query: shim.FIRST, callback: shim.LAST })
+  }
   shim.recordBatchQuery(proto, 'batch', {
     query: findBatchQueryArg,
     callback: shim.LAST
@@ -23,6 +27,6 @@ module.exports = function initialize(agent, cassandra, moduleName, shim) {
  * @return {string} The query for this batch request.
  */
 function findBatchQueryArg(shim, batch, fnName, args) {
-  var sql = (args[0] && args[0][0]) || ''
+  const sql = (args[0] && args[0][0]) || ''
   return sql.query || sql
 }

package/lib/instrumentation/connect.js

@@ -17,7 +17,7 @@ module.exports = function initialize(agent, connect, moduleName, shim) {
     return route
   })
 
-  var proto =
+  const proto =
     (connect && connect.HTTPServer && connect.HTTPServer.prototype) || // v1
     (connect && connect.proto) // v2
 
@@ -31,7 +31,7 @@ module.exports = function initialize(agent, connect, moduleName, shim) {
 }
 
 function wrapMiddleware(shim, middleware, name, route) {
-  var spec = {
+  const spec = {
     matchArity: true,
     route: route,
     type: shim.MIDDLEWARE,
@@ -56,9 +56,9 @@ function wrapMiddleware(shim, middleware, name, route) {
 
 function wrapConnectExport(shim, connect, v3) {
   shim.wrapExport(connect, function wrapExport(shim, fn) {
-    var wrapper = shim.wrap(fn, function wrapConnect(shim, _fn) {
+    const wrapper = shim.wrap(fn, function wrapConnect(shim, _fn) {
       return function wrappedConnect() {
-        var res = _fn.apply(this, arguments)
+        const res = _fn.apply(this, arguments)
         if (v3) {
           shim.wrapMiddlewareMounter(res, 'use', {
             route: shim.FIRST,

package/lib/instrumentation/core/async_hooks.js

@@ -5,16 +5,16 @@
 
 'use strict'
 
-var logger = require('../../logger').child({ component: 'async_hooks' })
-var promInit = require('../promise')
+const logger = require('../../logger').child({ component: 'async_hooks' })
+const promInit = require('../promise')
 
 module.exports = initialize
 
 /**
  * The spec for the native `Promise` class.
  */
-var STATIC_PROMISE_METHODS = ['accept', 'all', 'defer', 'race', 'reject', 'resolve']
-var NATIVE_PROMISE_SPEC = {
+const STATIC_PROMISE_METHODS = ['accept', 'all', 'defer', 'race', 'reject', 'resolve']
+const NATIVE_PROMISE_SPEC = {
   name: 'global',
   constructor: 'Promise',
   executor: true,
@@ -30,7 +30,7 @@ var NATIVE_PROMISE_SPEC = {
 }
 
 function initialize(agent, shim) {
-  var enableHooks = agent.config.checkAsyncHookStatus()
+  const enableHooks = agent.config.checkAsyncHookStatus()
   if (enableHooks && tryAsyncHooks(agent, shim)) {
     logger.debug('Using async_hooks.')
   } else {
@@ -134,7 +134,7 @@ function getPromiseResolveStyleHooks(segmentMap, agent, shim) {
         return
       }
 
-      let parentSegment = segmentMap.get(triggerId)
+      const parentSegment = segmentMap.get(triggerId)
 
       if (parentSegment && !parentSegment.transaction.isActive()) {
         // Stop propagating if the transaction was ended.

package/lib/instrumentation/core/domain.js

@@ -8,12 +8,12 @@
 module.exports = initialize
 
 function initialize(agent, domain, name, shim) {
-  var proto = domain.Domain.prototype
+  const proto = domain.Domain.prototype
   shim.wrap(proto, 'emit', wrapEmit)
 
   function wrapEmit(shim, original) {
     return function wrappedEmit(ev) {
-      var shouldRestoreContext =
+      const shouldRestoreContext =
         ev === 'error' && shim.getActiveSegment() === null && shim.getSegment(this)
 
       if (!shouldRestoreContext) {

package/lib/instrumentation/core/globals.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var asyncHooks = require('./async_hooks')
+const asyncHooks = require('./async_hooks')
 
 module.exports = initialize
 

package/lib/instrumentation/core/http-outbound.js

@@ -5,13 +5,13 @@
 
 'use strict'
 
-var recordExternal = require('../../metrics/recorders/http_external')
-var urltils = require('../../util/urltils')
-var hashes = require('../../util/hashes')
-var logger = require('../../logger').child({ component: 'outbound' })
-var shimmer = require('../../shimmer')
-var url = require('url')
-var copy = require('../../util/copy')
+const recordExternal = require('../../metrics/recorders/http_external')
+const cat = require('../../util/cat')
+const urltils = require('../../util/urltils')
+const logger = require('../../logger').child({ component: 'outbound' })
+const shimmer = require('../../shimmer')
+const url = require('url')
+const copy = require('../../util/copy')
 
 const NAMES = require('../../metrics/names')
 const SHIM_SYMBOLS = require('../../shim/constants').SYMBOLS
@@ -20,8 +20,6 @@ const DEFAULT_HOST = 'localhost'
 const DEFAULT_PORT = 80
 const DEFAULT_SSL_PORT = 443
 
-const NEWRELIC_ID_HEADER = 'x-newrelic-id'
-const NEWRELIC_TRANSACTION_HEADER = 'x-newrelic-transaction'
 const NEWRELIC_SYNTHETICS_HEADER = 'x-newrelic-synthetics'
 
 /**
@@ -96,13 +94,9 @@ module.exports = function instrumentOutbound(agent, opts, makeRequest) {
         transaction.insertDistributedTraceHeaders(outboundHeaders)
       }
     } else if (agent.config.cross_application_tracer.enabled) {
-      if (agent.config.encoding_key) {
-        _addCATHeaders(agent, transaction, outboundHeaders)
-      } else {
-        logger.trace('No encoding key found, not adding CAT headers')
-      }
+      cat.addCatHeaders(agent.config, transaction, outboundHeaders)
     } else {
-      logger.trace('CAT disabled, not adding headers!')
+      logger.trace('Both DT and CAT are disabled, not adding headers!')
     }
 
     if (Array.isArray(opts.headers)) {
@@ -129,7 +123,7 @@ module.exports = function instrumentOutbound(agent, opts, makeRequest) {
     if (parsed.parameters) {
       // Scrub and parse returns on object with a null prototype.
       // eslint-disable-next-line guard-for-in
-      for (let key in parsed.parameters) {
+      for (const key in parsed.parameters) {
         segment.addSpanAttribute(`request.parameters.${key}`, parsed.parameters[key])
       }
     }
@@ -196,12 +190,14 @@ function handleResponse(segment, hostname, req, res) {
   // If CAT is enabled, grab those headers!
   const agent = segment.transaction.agent
   if (agent.config.cross_application_tracer.enabled && !agent.config.distributed_tracing.enabled) {
-    pullCatHeaders(agent.config, segment, hostname, res.headers['x-newrelic-app-data'])
+    const { appData } = cat.extractCatHeaders(res.headers)
+    const decodedAppData = cat.parseAppData(agent.config, appData)
+    cat.assignCatToSegment(decodedAppData, segment, hostname)
   }
 
   // Again a custom emit wrapper because we want to watch for the `end` event.
   shimmer.wrapMethod(res, 'response', 'emit', function wrapEmit(emit) {
-    var boundEmit = agent.tracer.bindFunction(emit, segment)
+    const boundEmit = agent.tracer.bindFunction(emit, segment)
     return function wrappedResponseEmit(evnt) {
       if (evnt === 'end') {
         segment.end()
@@ -212,77 +208,12 @@ function handleResponse(segment, hostname, req, res) {
   _makeNonEnumerable(res, 'emit')
 }
 
-function pullCatHeaders(config, segment, host, obfAppData) {
-  if (!config.encoding_key) {
-    logger.trace('config.encoding_key is not set - not parsing response CAT headers')
-    return
-  }
-
-  if (!config.trusted_account_ids) {
-    logger.trace('config.trusted_account_ids is not set - not parsing response CAT headers')
-    return
-  }
-
-  // is our downstream request CAT-aware?
-  if (!obfAppData) {
-    logger.trace('Got no CAT app data in response header x-newrelic-app-data')
-  } else {
-    var appData = null
-    try {
-      appData = JSON.parse(hashes.deobfuscateNameUsingKey(obfAppData, config.encoding_key))
-    } catch (e) {
-      logger.warn('Got an unparsable CAT header x-newrelic-app-data: %s', obfAppData)
-      return
-    }
-    // Make sure it is a trusted account
-    if (appData.length && typeof appData[0] === 'string') {
-      var accountId = appData[0].split('#')[0]
-      accountId = parseInt(accountId, 10)
-      if (config.trusted_account_ids.indexOf(accountId) === -1) {
-        logger.trace('Response from untrusted CAT header account id: %s', accountId)
-      } else {
-        segment.catId = appData[0]
-        segment.catTransaction = appData[1]
-        segment.name =
-          NAMES.EXTERNAL.TRANSACTION + host + '/' + segment.catId + '/' + segment.catTransaction
-        if (appData.length >= 6) {
-          segment.addAttribute('transaction_guid', appData[5])
-        }
-        logger.trace('Got inbound response CAT headers in transaction %s', segment.transaction.id)
-      }
-    }
-  }
-}
-
 function _makeNonEnumerable(obj, prop) {
   try {
-    var desc = Object.getOwnPropertyDescriptor(obj, prop)
+    const desc = Object.getOwnPropertyDescriptor(obj, prop)
     desc.enumerable = false
     Object.defineProperty(obj, prop, desc)
   } catch (e) {
     logger.debug(e, 'Failed to make %s non enumerable.', prop)
   }
 }
-
-function _addCATHeaders(agent, tx, outboundHeaders) {
-  if (agent.config.obfuscatedId) {
-    outboundHeaders[NEWRELIC_ID_HEADER] = agent.config.obfuscatedId
-  }
-
-  var pathHash = hashes.calculatePathHash(
-    agent.config.applications()[0],
-    tx.getFullName() || '',
-    tx.referringPathHash
-  )
-  tx.pushPathHash(pathHash)
-
-  try {
-    let txData = JSON.stringify([tx.id, false, tx.tripId || tx.id, pathHash])
-    txData = hashes.obfuscateNameUsingKey(txData, agent.config.encoding_key)
-    outboundHeaders[NEWRELIC_TRANSACTION_HEADER] = txData
-
-    logger.trace('Added outbound request CAT headers in transaction %s', tx.id)
-  } catch (err) {
-    logger.trace(err, 'Failed to create CAT payload')
-  }
-}

package/lib/instrumentation/core/http.js

@@ -26,9 +26,6 @@ const DESTS = require('../../config/attribute-filter').DESTINATIONS
  *
  */
 const NR_CONNECTION_PROP = '__NR__connection'
-const NEWRELIC_ID_HEADER = 'x-newrelic-id'
-const NEWRELIC_APP_DATA_HEADER = 'x-newrelic-app-data'
-const NEWRELIC_TRANSACTION_HEADER = 'x-newrelic-transaction'
 const NEWRELIC_SYNTHETICS_HEADER = 'x-newrelic-synthetics'
 const TRANSACTION_INFO_KEY = '__NR_transactionInfo'
 
@@ -47,7 +44,7 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
   let serverPort = null
 
   return tracer.transactionProxy(function wrappedHandler(evnt, request, response) {
-    var transaction = tracer.getTransaction()
+    const transaction = tracer.getTransaction()
     if (!transaction) {
       return emit.apply(this, arguments)
     }
@@ -108,7 +105,7 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
 
     // store the port on which this transaction runs
     if (this.address instanceof Function) {
-      var address = this.address()
+      const address = this.address()
       if (address) {
         serverPort = address.port
       }
@@ -142,15 +139,13 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
       // Node http headers are automatically lowercase
       transaction.acceptDistributedTraceHeaders(transport, request.headers)
     } else if (agent.config.cross_application_tracer.enabled) {
-      const incomingCatId = request.headers[NEWRELIC_ID_HEADER]
-      const obfTransaction = request.headers[NEWRELIC_TRANSACTION_HEADER]
-
-      if (agent.config.encoding_key) {
-        cat.handleCatHeaders(incomingCatId, obfTransaction, agent.config.encoding_key, transaction)
-        if (transaction.incomingCatId) {
-          logger.trace('Got inbound request CAT headers in transaction %s', transaction.id)
-        }
-      }
+      const { id, transactionId } = cat.extractCatHeaders(request.headers)
+      const { externalId, externalTransaction } = cat.parseCatData(
+        id,
+        transactionId,
+        agent.config.encoding_key
+      )
+      cat.assignCatToTransaction(externalId, externalTransaction, transaction)
     }
 
     function instrumentedFinish() {
@@ -164,7 +159,7 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
 
       if (response) {
         if (response.statusCode != null) {
-          var responseCode = String(response.statusCode)
+          const responseCode = String(response.statusCode)
 
           if (/^\d+$/.test(responseCode)) {
             transaction.trace.attributes.addAttribute(
@@ -187,7 +182,7 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
           segment.addSpanAttribute('http.statusText', response.statusMessage)
         }
 
-        var headers = response.getHeaders()
+        const headers = response.getHeaders()
         if (headers) {
           headerAttributes.collectResponseHeaders(headers, transaction)
         }
@@ -209,9 +204,9 @@ function storeTxInfo(transaction, request, response) {
     logger.debug('Missing request or response object! Not storing transaction info.')
     return
   }
-  var hideInternal = transaction.agent.config.transaction_tracer.hide_internals
+  const hideInternal = transaction.agent.config.transaction_tracer.hide_internals
 
-  var txInfo = {
+  const txInfo = {
     transaction: transaction,
     segmentStack: [],
     errorHandled: false,
@@ -239,7 +234,7 @@ function initializeRequest(transaction, request) {
 }
 
 function wrapResponseEnd(agent, proto) {
-  var tracer = agent.tracer
+  const tracer = agent.tracer
 
   // On end, we must freeze the current name state to maintain the route that
   // responded and also end the current segment (otherwise it may become truncated).
@@ -250,7 +245,7 @@ function wrapResponseEnd(agent, proto) {
     }
 
     return function wrappedResEnd() {
-      var txInfo = this && this[TRANSACTION_INFO_KEY]
+      const txInfo = this && this[TRANSACTION_INFO_KEY]
       if (!txInfo) {
         return end.apply(this, arguments)
       }
@@ -268,10 +263,10 @@ function wrapResponseEnd(agent, proto) {
       }
 
       // End all the segments leading up to and including this one.
-      for (var i = txInfo.segmentStack.length - 1; i >= 0; --i) {
+      for (let i = txInfo.segmentStack.length - 1; i >= 0; --i) {
         txInfo.segmentStack[i].end()
       }
-      var segment = tracer.getSegment()
+      const segment = tracer.getSegment()
       if (segment) {
         segment.end()
       }
@@ -288,7 +283,7 @@ function wrapResponseEnd(agent, proto) {
 // the shimmer stuff if you'd like to verify.
 function wrapWriteHead(agent, writeHead) {
   return function wrappedWriteHead() {
-    var transaction = agent.tracer.getTransaction()
+    const transaction = agent.tracer.getTransaction()
     if (!transaction) {
       logger.trace('No transaction - not adding response CAT headers')
       return writeHead.apply(this, arguments)
@@ -307,13 +302,7 @@ function wrapWriteHead(agent, writeHead) {
       return writeHead.apply(this, arguments)
     }
 
-    var accountId = transaction.incomingCatId.split('#')[0]
-    accountId = parseInt(accountId, 10)
-    if (agent.config.trusted_account_ids.indexOf(accountId) === -1) {
-      logger.trace(
-        'Request from untrusted account id: %s - not adding response CAT headers',
-        accountId
-      )
+    if (!cat.isTrustedAccountId(transaction.incomingCatId, agent.config.trusted_account_ids)) {
       return writeHead.apply(this, arguments)
     }
 
@@ -332,8 +321,8 @@ function wrapWriteHead(agent, writeHead) {
 
     // -1 means no content length header was sent. We should only send this
     // value in the appData if the header is set.
-    var contentLength = -1
-    var newHeaders = arguments[arguments.length - 1]
+    let contentLength = -1
+    const newHeaders = arguments[arguments.length - 1]
 
     if (typeof newHeaders === 'object') {
       contentLength = headerProcessing.getContentLengthFromHeaders(newHeaders)
@@ -347,33 +336,11 @@ function wrapWriteHead(agent, writeHead) {
     // actual duration.
     transaction.catResponseTime = transaction.timer.getDurationInMillis()
 
-    var appData = null
-    var txName = transaction.getFullName() || ''
-
-    try {
-      appData = JSON.stringify([
-        agent.config.cross_process_id, // cross_process_id
-        txName, // transaction name
-        transaction.queueTime / 1000, // queue time (s)
-        transaction.catResponseTime / 1000, // response time (s)
-        contentLength, // content length (if content-length header is also being sent)
-        transaction.id, // TransactionGuid
-        false // force a transaction trace to be recorded
-      ])
-    } catch (err) {
-      logger.trace(
-        err,
-        'Failed to serialize transaction: %s - not adding CAT response headers',
-        txName
-      )
-      return writeHead.apply(this, arguments)
+    const { key, data } = cat.encodeAppData(agent.config, transaction, contentLength)
+    if (key && data) {
+      this.setHeader(key, data)
+      logger.trace('Added outbound response CAT headers in transaction %s', transaction.id)
     }
-
-    var encKey = agent.config.encoding_key
-    var obfAppData = hashes.obfuscateNameUsingKey(appData, encKey)
-    this.setHeader(NEWRELIC_APP_DATA_HEADER, obfAppData)
-    logger.trace('Added outbound response CAT headers in transaction %s', transaction.id)
-
     return writeHead.apply(this, arguments)
   }
 }
@@ -423,7 +390,7 @@ function wrapRequest(agent, request) {
       options = Object.assign(input || {}, options)
     }
 
-    let reqArgs = [options, cb]
+    const reqArgs = [options, cb]
 
     // Don't pollute metrics and calls with NR connections
     const internalOnly = options && options[NR_CONNECTION_PROP]
@@ -480,7 +447,7 @@ module.exports = function initialize(agent, http, moduleName) {
     'http.Server.prototype',
     'emit',
     function wrapEmit(emit) {
-      var txStarter = wrapEmitWithTransaction(agent, emit, IS_HTTPS)
+      const txStarter = wrapEmitWithTransaction(agent, emit, IS_HTTPS)
       return function wrappedEmit(evnt) {
         if (evnt === 'request') {
           return txStarter.apply(this, arguments)
@@ -502,7 +469,7 @@ module.exports = function initialize(agent, http, moduleName) {
     )
   }
 
-  var agentProto = http && http.Agent && http.Agent.prototype
+  const agentProto = http && http.Agent && http.Agent.prototype
 
   shimmer.wrapMethod(http, 'http', 'request', wrapRequest.bind(null, agent))
 
@@ -518,14 +485,14 @@ module.exports = function initialize(agent, http, moduleName) {
           return original.apply(this, arguments)
         }
 
-        var segment = agent.tracer.createSegment('http.Agent#createConnection')
+        const segment = agent.tracer.createSegment('http.Agent#createConnection')
 
-        var args = agent.tracer.slice(arguments)
+        const args = agent.tracer.slice(arguments)
         if (typeof args[1] === 'function') {
           args[1] = agent.tracer.bindFunction(args[1], segment, true)
         }
 
-        var sock = agent.tracer.bindFunction(original, segment, true).apply(this, args)
+        const sock = agent.tracer.bindFunction(original, segment, true).apply(this, args)
         return sock
       }
     }
@@ -543,7 +510,7 @@ module.exports = function initialize(agent, http, moduleName) {
  * @param {Transaction} transaction - Where the synthetics data is attached to.
  */
 function handleSyntheticsHeader(header, encKey, trustedIds, transaction) {
-  var synthData = parseSyntheticsHeader(header, encKey, trustedIds)
+  const synthData = parseSyntheticsHeader(header, encKey, trustedIds)
   if (!synthData) {
     return
   }
@@ -565,14 +532,14 @@ function handleSyntheticsHeader(header, encKey, trustedIds, transaction) {
 function parseSyntheticsHeader(header, encKey, trustedIds) {
   // Eagerly declare this object because we know what it should look like and
   // can use that for header verification.
-  var parsedData = {
+  const parsedData = {
     version: null,
     accountId: null,
     resourceId: null,
     jobId: null,
     monitorId: null
   }
-  var synthData = null
+  let synthData = null
   try {
     synthData = JSON.parse(hashes.deobfuscateNameUsingKey(header, encKey))
   } catch (e) {

package/lib/instrumentation/core/inspector.js

@@ -8,14 +8,14 @@
 module.exports = initialize
 
 function initialize(agent, inspector, name, shim) {
-  var sessionProto = inspector && inspector.Session && inspector.Session.prototype
+  const sessionProto = inspector && inspector.Session && inspector.Session.prototype
   if (!sessionProto) {
     return false
   }
 
   shim.wrap(sessionProto, 'post', function wrapPost(shim, fn) {
     return function wrappedPost() {
-      var args = shim.argsToArray.apply(shim, arguments)
+      const args = shim.argsToArray.apply(shim, arguments)
       shim.bindCallbackSegment(args, shim.LAST)
       return fn.apply(this, args)
     }

package/lib/instrumentation/core/timers.js

@@ -18,9 +18,9 @@ function initialize(agent, timers, moduleName, shim) {
       }
 
       // Manual copy because helper methods add significant overhead in some usages
-      var len = arguments.length
-      var args = new Array(len)
-      for (var i = 0; i < len; ++i) {
+      const len = arguments.length
+      const args = new Array(len)
+      for (let i = 0; i < len; ++i) {
         args[i] = arguments[i]
       }
 
@@ -70,7 +70,7 @@ function initialize(agent, timers, moduleName, shim) {
     return function wrappedClearTimeout(timer) {
       if (timer && timer._onTimeout) {
         const segment = timer._onTimeout.__NR_segment
-        if (segment) {
+        if (segment && !segment.opaque) {
           segment.ignore = true
         }
       }
@@ -85,9 +85,9 @@ function initialize(agent, timers, moduleName, shim) {
 }
 
 function makeWrappedPromisifyCompatible(shim, timers) {
-  const originalSetTimout = shim.getOriginal(timers.setTimeout)
-  Object.getOwnPropertySymbols(originalSetTimout).forEach((symbol) => {
-    timers.setTimeout[symbol] = originalSetTimout[symbol]
+  const originalSetTimeout = shim.getOriginal(timers.setTimeout)
+  Object.getOwnPropertySymbols(originalSetTimeout).forEach((symbol) => {
+    timers.setTimeout[symbol] = originalSetTimeout[symbol]
   })
 
   const originalSetInterval = shim.getOriginal(timers.setInterval)

package/lib/instrumentation/core/zlib.js

@@ -9,13 +9,13 @@ const recorder = require('../../metrics/recorders/generic')
 
 module.exports = initialize
 
-var methods = ['deflate', 'deflateRaw', 'gzip', 'gunzip', 'inflate', 'inflateRaw', 'unzip']
+const methods = ['deflate', 'deflateRaw', 'gzip', 'gunzip', 'inflate', 'inflateRaw', 'unzip']
 
 function initialize(agent, zlib, moduleName, shim) {
   shim.record(zlib, methods, recordZLib)
 
   if (zlib.Deflate && zlib.Deflate.prototype) {
-    var proto = Object.getPrototypeOf(zlib.Deflate.prototype)
+    const proto = Object.getPrototypeOf(zlib.Deflate.prototype)
     if (proto._transform) {
       // streams2
       shim.wrap(proto, '_transform', wrapNoSegment)

package/lib/instrumentation/director.js

@@ -12,8 +12,8 @@ module.exports = function initialize(agent, director, moduleName, shim) {
     return route instanceof Array ? route.join('/') : route
   })
 
-  var methods = ['on', 'route']
-  var proto = director.Router.prototype
+  const methods = ['on', 'route']
+  const proto = director.Router.prototype
   shim.wrapMiddlewareMounter(proto, methods, {
     route: shim.SECOND,
     wrapper: function wrapMiddleware(shim, middleware, name, path) {
@@ -32,7 +32,7 @@ module.exports = function initialize(agent, director, moduleName, shim) {
 
   shim.wrap(proto, 'mount', function wrapMount(shim, mount) {
     return function wrappedMount(routes, path) {
-      var isAsync = this.async
+      const isAsync = this.async
       shim.wrap(routes, director.http.methods, function wrapRoute(shim, route) {
         return shim.recordMiddleware(route, {
           route: path.join('/'),
@@ -45,7 +45,7 @@ module.exports = function initialize(agent, director, moduleName, shim) {
           next: isAsync ? shim.LAST : null
         })
       })
-      var args = [routes, path]
+      const args = [routes, path]
       return mount.apply(this, args)
     }
   })

package/lib/instrumentation/express.js

@@ -48,7 +48,7 @@ function wrapExpress4(shim, express) {
     }
 
     return function wrappedRoute() {
-      var route = fn.apply(this, arguments)
+      const route = fn.apply(this, arguments)
 
       // Express should create a new route and layer every time Router#route is
       // called, but just to be on the safe side, make sure we haven't wrapped
@@ -56,7 +56,7 @@ function wrapExpress4(shim, express) {
       if (!shim.isWrapped(route, 'get')) {
         wrapRouteMethods(shim, route, '')
 
-        var layer = this.stack[this.stack.length - 1]
+        const layer = this.stack[this.stack.length - 1]
 
         // This wraps a 'done' function but not a traditional 'next' function. This allows
         // the route to stay on the stack for middleware nesting after the router.
@@ -120,7 +120,7 @@ function wrapExpress3(shim, express) {
 }
 
 function wrapRouteMethods(shim, route, path) {
-  var methods = ['all', 'delete', 'get', 'head', 'opts', 'post', 'put', 'patch']
+  const methods = ['all', 'delete', 'get', 'head', 'opts', 'post', 'put', 'patch']
   shim.wrapMiddlewareMounter(route, methods, { route: path, wrapper: wrapMiddleware })
 }
 
@@ -128,13 +128,13 @@ function wrapResponse(shim, response) {
   shim.recordRender(response, 'render', {
     view: shim.FIRST,
     callback: function bindCallback(shim, render, name, segment, args) {
-      var cbIdx = shim.normalizeIndex(args.length, shim.LAST)
+      let cbIdx = shim.normalizeIndex(args.length, shim.LAST)
       if (cbIdx === null) {
         return
       }
 
-      var res = this
-      var cb = args[cbIdx]
+      const res = this
+      let cb = args[cbIdx]
       if (!shim.isFunction(cb)) {
         ++cbIdx
         cb = function defaultRenderCB(err, str) {
@@ -152,8 +152,8 @@ function wrapResponse(shim, response) {
 }
 
 function wrapMiddleware(shim, middleware, name, route) {
-  var method = null
-  var spec = {
+  let method = null
+  const spec = {
     route: route,
     type: shim.MIDDLEWARE,
     matchArity: true,