newrelic 8.3.0 → 8.5.2

package/lib/shim/transaction-shim.js

@@ -6,31 +6,11 @@
 'use strict'
 
 const cat = require('../util/cat')
-const hashes = require('../util/hashes')
 const logger = require('../logger').child({ component: 'TransactionShim' })
 const Shim = require('./shim')
 const Transaction = require('../transaction')
 const util = require('util')
 
-const HTTP_CAT_ID_HEADER = 'X-NewRelic-Id'
-const MQ_CAT_ID_HEADER = 'NewRelicID'
-const MATCH_CAT_ID_HEADER = new RegExp(
-  '^(?:' + HTTP_CAT_ID_HEADER + '|' + MQ_CAT_ID_HEADER + ')$',
-  'i'
-)
-const HTTP_CAT_TRANSACTION_HEADER = 'X-NewRelic-Transaction'
-const MQ_CAT_TRANSACTION_HEADER = 'NewRelicTransaction'
-const MATCH_CAT_TRANSACTION_HEADER = new RegExp(
-  '^(?:' + HTTP_CAT_TRANSACTION_HEADER + '|' + MQ_CAT_TRANSACTION_HEADER + ')$',
-  'i'
-)
-const HTTP_CAT_APP_DATA_HEADER = 'X-NewRelic-App-Data'
-const MQ_CAT_APP_DATA_HEADER = 'NewRelicAppData'
-const MATCH_CAT_APP_DATA_HEADER = new RegExp(
-  '^(?:' + HTTP_CAT_APP_DATA_HEADER + '|' + MQ_CAT_APP_DATA_HEADER + ')$',
-  'i'
-)
-
 const TRANSACTION_TYPES_SET = Transaction.TYPES_SET
 
 /**
@@ -88,8 +68,8 @@ TransactionShim.prototype.pushTransactionName = pushTransactionName
 TransactionShim.prototype.popTransactionName = popTransactionName
 TransactionShim.prototype.setTransactionName = setTransactionName
 TransactionShim.prototype.handleCATHeaders = handleCATHeaders
-TransactionShim.prototype.insertCATRequestHeaders = insertCATRequestHeaders
 TransactionShim.prototype.insertCATReplyHeader = insertCATReplyHeader
+TransactionShim.prototype.insertCATRequestHeaders = insertCATRequestHeaders
 
 // -------------------------------------------------------------------------- //
 
@@ -166,7 +146,7 @@ function bindCreateTransaction(nodule, property, spec) {
 
     // Is this transaction supposed to be nested? Pick the right wrapper for the
     // job.
-    var makeWrapper = spec.nest ? _makeNestedTransWrapper : _makeTransWrapper
+    const makeWrapper = spec.nest ? _makeNestedTransWrapper : _makeTransWrapper
     return makeWrapper(shim, fn, name, spec)
   })
 }
@@ -188,7 +168,7 @@ function bindCreateTransaction(nodule, property, spec) {
  * @param {string} pathSegment - The path segment to add to the naming stack.
  */
 function pushTransactionName(pathSegment) {
-  var tx = this.tracer.getTransaction()
+  const tx = this.tracer.getTransaction()
   if (tx && tx.nameState) {
     tx.nameState.appendPath(pathSegment)
   }
@@ -209,7 +189,7 @@ function pushTransactionName(pathSegment) {
  *  `pathSegment` is removed.
  */
 function popTransactionName(pathSegment) {
-  var tx = this.tracer.getTransaction()
+  const tx = this.tracer.getTransaction()
   if (tx && tx.nameState) {
     tx.nameState.popPath(pathSegment)
   }
@@ -227,7 +207,7 @@ function popTransactionName(pathSegment) {
  * @param {string} name - The name to use for the transaction.
  */
 function setTransactionName(name) {
-  var tx = this.tracer.getTransaction()
+  const tx = this.tracer.getTransaction()
   if (tx) {
     tx.setPartialName(name)
   }
@@ -254,66 +234,46 @@ function setTransactionName(name) {
  *  The transport type that brought the headers. Usually `HTTP` or `HTTPS`.
  */
 function handleCATHeaders(headers, segment, transportType) {
-  // Is CAT enabled?
-  if (!this.agent.config.cross_application_tracer.enabled) {
-    this.logger.trace('CAT disabled, not extracting header.')
+  // TODO: rename function or replace functionality when CAT fully removed.
+
+  if (!headers) {
+    this.logger.debug('No headers for CAT or DT processing.')
     return
   }
-  if (!this.agent.config.encoding_key) {
-    this.logger.warn('Missing encoding key, not extracting CAT headers!')
-    return
-  } else if (!headers) {
-    this.logger.debug('No headers to search for CAT within')
+
+  const config = this.agent.config
+
+  if (!config.cross_application_tracer.enabled && !config.distributed_tracing.enabled) {
+    this.logger.trace('CAT and DT disabled, not extracting headers.')
     return
   }
 
   // Check that we're in an active transaction.
-  segment = segment || this.getSegment()
-  if (!segment || !segment.transaction.isActive()) {
-    this.logger.trace('Not adding CAT reply header, not in an active transaction.')
+  const currentSegment = segment || this.getSegment()
+  if (!currentSegment || !currentSegment.transaction.isActive()) {
+    this.logger.trace('Not processing headers for CAT or DT, not in an active transaction.')
     return
   }
 
-  const transaction = segment.transaction
+  const transaction = currentSegment.transaction
 
-  if (this.agent.config.distributed_tracing.enabled) {
+  if (config.distributed_tracing.enabled) {
     transaction.acceptDistributedTraceHeaders(transportType, headers)
     return
   }
 
-  // Hunt down the CAT headers.
-  var catId = null
-  var transactionData = null
-  var appData = null
-  // eslint-disable-next-line guard-for-in
-  for (var key in headers) {
-    if (MATCH_CAT_ID_HEADER.test(key)) {
-      catId = headers[key]
-    } else if (MATCH_CAT_TRANSACTION_HEADER.test(key)) {
-      transactionData = headers[key]
-    } else if (MATCH_CAT_APP_DATA_HEADER.test(key)) {
-      appData = headers[key]
-    }
-    if (catId && transactionData && appData) {
-      break
-    }
-  }
-
-  if (catId && transactionData) {
-    cat.handleCatHeaders(catId, transactionData, this.agent.config.encoding_key, transaction)
-    if (transaction.incomingCatId) {
-      this.logger.trace(
-        'Got inbound CAT headers in transaction %s from %s',
-        transaction.id,
-        transaction.incomingCatId
-      )
-    }
-  }
-
-  if (appData) {
-    _handleCATReplyHeader(this, segment, appData)
-    // TODO: Handle adding ExternalTransaction metrics for this segment.
-  }
+  // Not DT so processing CAT.
+  // TODO: Below will be removed when CAT removed.
+  const { appData, id, transactionId } = cat.extractCatHeaders(headers)
+  const { externalId, externalTransaction } = cat.parseCatData(
+    id,
+    transactionId,
+    config.encoding_key
+  )
+  cat.assignCatToTransaction(externalId, externalTransaction, transaction)
+  const decodedAppData = cat.parseAppData(config, appData)
+  cat.assignCatToSegment(decodedAppData, currentSegment)
+  // TODO: Handle adding ExternalTransaction metrics for this segment.
 }
 
 /**
@@ -357,46 +317,7 @@ function insertCATRequestHeaders(headers, useAlternateHeaderNames) {
     // TODO: Official testing and support.
     tx.insertDistributedTraceHeaders(headers)
   } else {
-    if (!this.agent.config.encoding_key) {
-      this.logger.warn('Missing encoding key, not adding CAT headers!')
-      return
-    }
-
-    // Determine the names of the headers we'll add.
-    let transHeader = HTTP_CAT_TRANSACTION_HEADER
-    let idHeader = HTTP_CAT_ID_HEADER
-    if (useAlternateHeaderNames) {
-      idHeader = MQ_CAT_ID_HEADER
-      transHeader = MQ_CAT_TRANSACTION_HEADER
-    }
-
-    // Add in the application ID.
-    if (this.agent.config.obfuscatedId) {
-      headers[idHeader] = this.agent.config.obfuscatedId
-    }
-
-    // Generate an application path hash. This is essentially a snapshot of what
-    // the transaction would be named if it ended right now.
-    const pathHash = hashes.calculatePathHash(
-      this.agent.config.applications()[0],
-      tx.getFullName(),
-      tx.referringPathHash
-    )
-
-    tx.pushPathHash(pathHash)
-
-    try {
-      const catData = hashes.obfuscateNameUsingKey(
-        JSON.stringify([tx.id, false, tx.tripId || tx.id, pathHash]),
-        this.agent.config.encoding_key
-      )
-      if (catData) {
-        headers[transHeader] = catData
-        this.logger.trace('Added CAT headers for transaction %s', tx.id)
-      }
-    } catch (e) {
-      this.logger.warn({ error: e.stack }, 'Failed to serialize CAT header!')
-    }
+    cat.addCatHeaders(this.agent.config, tx, headers, useAlternateHeaderNames)
   }
 }
 
@@ -417,7 +338,7 @@ function insertCATRequestHeaders(headers, useAlternateHeaderNames) {
  */
 function insertCATReplyHeader(headers, useAlternateHeaderNames) {
   // Is CAT enabled?
-  var config = this.agent.config
+  const config = this.agent.config
   if (!config.cross_application_tracer.enabled) {
     this.logger.trace('CAT disabled, not adding CAT reply header.')
     return
@@ -433,100 +354,31 @@ function insertCATReplyHeader(headers, useAlternateHeaderNames) {
   }
 
   // Are we in a transaction?
-  var segment = this.getSegment()
+  const segment = this.getSegment()
   if (!segment || !segment.transaction.isActive()) {
     this.logger.trace('Not adding CAT reply header, not in an active transaction.')
     return
   }
-  var tx = segment.transaction
+  const tx = segment.transaction
 
   // Hunt down the content length.
   // NOTE: In AMQP, content-type and content-encoding are guaranteed fields, but
   // there is no content-length field or header. For that, content length will
   // always be -1.
-  var contentLength = -1
-  for (var key in headers) {
+  let contentLength = -1
+  for (const key in headers) {
     if (key.toLowerCase() === 'content-length') {
       contentLength = headers[key]
       break
     }
   }
 
-  // Compose the obfuscated app data value.
-  var appData = null
-  var txName = tx.getFullName()
-  try {
-    appData = hashes.obfuscateNameUsingKey(
-      JSON.stringify([
-        config.cross_process_id,
-        txName,
-        tx.queueTime / 1000,
-        tx.catResponseTime / 1000,
-        contentLength,
-        tx.id,
-        false
-      ]),
-      config.encoding_key
-    )
-  } catch (e) {
-    this.logger.warn({ error: e.stack }, 'Failed to serialize CAT data for %s', txName)
-  }
-
+  const { key, data } = cat.encodeAppData(config, tx, contentLength, useAlternateHeaderNames)
   // Add the header.
-  headers[useAlternateHeaderNames ? MQ_CAT_APP_DATA_HEADER : HTTP_CAT_APP_DATA_HEADER] = appData
-  this.logger.trace('Added outbound response CAT headers for transaction %s', tx.id)
-}
-
-/**
- * Parses the given CAT response app-data and links the transaction to it.
- *
- * - `_handleCATReplyHeader(shim, segment, appData)`
- *
- * @private
- *
- * @param {TransactionShim} shim
- *  The shim to use in the process of extracting the app data.
- *
- * @param {!TraceSegment} segment
- *  The segment to attach the CAT data to.
- *
- * @param {string} appData
- *  The application data to parse and use.
- */
-function _handleCATReplyHeader(shim, segment, appData) {
-  // Attempt to parse the app data header.
-  var config = shim.agent.config
-  try {
-    appData = JSON.parse(hashes.deobfuscateNameUsingKey(appData, config.encoding_key))
-  } catch (e) {
-    shim.logger.warn('Unparsable CAT application data header: %s', appData)
-    return
-  }
-
-  // Make sure the app data is of the expected format and that we trust the
-  // origin application.
-  if (!appData.length || !shim.isString(appData[0])) {
-    shim.logger.trace('Unknown format for CAT application data header.')
-    return
-  }
-  var accountId = parseInt(appData[0].split('#')[0], 10)
-  var trustedIds = config.trusted_account_ids
-  if (trustedIds && trustedIds.indexOf(accountId) === -1) {
-    shim.logger.trace('CAT headers from untrusted application %s', accountId)
-    return
+  if (key && data) {
+    headers[key] = data
+    this.logger.trace('Added outbound response CAT headers for transaction %s', tx.id)
   }
-
-  // It's good! Pull out the data we care about.
-  segment.catId = appData[0]
-  segment.catTransaction = appData[1]
-  if (appData.length >= 6) {
-    segment.addAttribute('transaction_guid', appData[5])
-  }
-  shim.logger.trace(
-    'Got inbound response CAT headers for transaction %s from %s',
-    segment.transaction.id,
-    appData[5]
-  )
 }
 
 /**
@@ -559,8 +411,8 @@ function _makeNestedTransWrapper(shim, fn, name, spec) {
     }
 
     // Reuse existing transactions only if the type matches.
-    var transaction = shim.tracer.getTransaction()
-    var segment = shim.tracer.segment
+    let transaction = shim.tracer.getTransaction()
+    let segment = shim.tracer.segment
 
     // Only create a new transaction if we either do not have a current
     // transaction _or_ the current transaction is not of the type we want.
@@ -606,7 +458,7 @@ function _makeTransWrapper(shim, fn, name, spec) {
     }
 
     shim.logger.trace('Creating new %s transaction for %s', spec.type, name)
-    var transaction = new Transaction(shim.agent)
+    const transaction = new Transaction(shim.agent)
     transaction.type = spec.type
     return shim.applySegment(fn, transaction.trace.root, false, this, arguments)
   }

package/lib/shim/webframework-shim.js

@@ -5,14 +5,14 @@
 
 'use strict'
 
-var genericRecorder = require('../metrics/recorders/generic')
-var logger = require('../logger.js').child({ component: 'WebFrameworkShim' })
-var metrics = require('../metrics/names')
-var TransactionShim = require('./transaction-shim')
-var Shim = require('./shim')
-var specs = require('./specs')
-var urltils = require('../util/urltils')
-var util = require('util')
+const genericRecorder = require('../metrics/recorders/generic')
+const logger = require('../logger.js').child({ component: 'WebFrameworkShim' })
+const metrics = require('../metrics/names')
+const TransactionShim = require('./transaction-shim')
+const Shim = require('./shim')
+const specs = require('./specs')
+const urltils = require('../util/urltils')
+const util = require('util')
 
 /**
  * An enumeration of well-known web frameworks so that new instrumentations can
@@ -25,7 +25,7 @@ var util = require('util')
  * @memberof WebFrameworkShim
  * @enum {string}
  */
-var FRAMEWORK_NAMES = {
+const FRAMEWORK_NAMES = {
   CONNECT: 'Connect',
   DIRECTOR: 'Director',
   EXPRESS: 'Expressjs',
@@ -35,7 +35,7 @@ var FRAMEWORK_NAMES = {
   FASTIFY: 'Fastify'
 }
 
-var MIDDLEWARE_TYPE_DETAILS = {
+const MIDDLEWARE_TYPE_DETAILS = {
   APPLICATION: { name: 'Mounted App: ', path: true, record: false },
   ERRORWARE: { name: '', path: false, record: true },
   MIDDLEWARE: { name: '', path: false, record: true },
@@ -44,7 +44,7 @@ var MIDDLEWARE_TYPE_DETAILS = {
   ROUTER: { name: 'Router: ', path: true, record: false }
 }
 
-var MIDDLEWARE_TYPE_NAMES = {
+const MIDDLEWARE_TYPE_NAMES = {
   APPLICATION: 'APPLICATION',
   ERRORWARE: 'ERRORWARE',
   MIDDLEWARE: 'MIDDLEWARE',
@@ -58,7 +58,7 @@ var MIDDLEWARE_TYPE_NAMES = {
  *
  * @private
  */
-var TRANSACTION_INFO_KEY = '__NR_transactionInfo'
+const TRANSACTION_INFO_KEY = '__NR_transactionInfo'
 
 /**
  * Constructs a shim associated with the given agent instance, specialized for
@@ -336,7 +336,7 @@ function setFramework(framework) {
  * @param {string} uri - The URI path to use for the transaction.
  */
 function setTransactionUri(uri) {
-  var tx = this.tracer.getTransaction()
+  const tx = this.tracer.getTransaction()
   if (!tx) {
     return
   }
@@ -379,7 +379,7 @@ function recordRender(nodule, properties, spec) {
   })
 
   return this.record(nodule, properties, function renderRecorder(shim, fn, name, args) {
-    var viewIdx = shim.normalizeIndex(args.length, spec.view)
+    const viewIdx = shim.normalizeIndex(args.length, spec.view)
     if (viewIdx === null) {
       shim.logger.debug('Invalid spec.view (%d vs %d), not recording.', spec.view, args.length)
       return null
@@ -439,18 +439,18 @@ function wrapMiddlewareMounter(nodule, properties, spec) {
     endpoint: null
   })
 
-  var wrapSpec = {
+  const wrapSpec = {
     wrapper: function wrapMounter(shim, fn, fnName) {
       if (!shim.isFunction(fn)) {
         return fn
       }
 
       return function wrappedMounter() {
-        var args = shim.argsToArray.apply(shim, arguments)
+        const args = shim.argsToArray.apply(shim, arguments)
 
         // Normalize the route index and pull out the route argument if provided.
-        var routeIdx = null
-        var route = null
+        let routeIdx = null
+        let route = null
         if (shim.isNumber(spec.route)) {
           routeIdx = shim.normalizeIndex(args.length, spec.route)
           route = routeIdx === null ? null : args[routeIdx]
@@ -479,7 +479,7 @@ function wrapMiddlewareMounter(nodule, properties, spec) {
 
             // Some platforms accept an arbitrarily nested array of middlewares,
             // so if this argument is an array we must recurse into it.
-            var middleware = middlewares[i]
+            const middleware = middlewares[i]
             if (middleware instanceof Array) {
               _wrapMiddlewares(null, middleware)
               continue
@@ -536,8 +536,8 @@ function recordMiddleware(nodule, properties, spec) {
   }
   spec = spec || Object.create(null)
 
-  var mwSpec = new specs.MiddlewareSpec(spec)
-  var wrapSpec = new specs.WrapSpec(function wrapMiddleware(shim, middleware) {
+  const mwSpec = new specs.MiddlewareSpec(spec)
+  const wrapSpec = new specs.WrapSpec(function wrapMiddleware(shim, middleware) {
     return _recordMiddleware(shim, middleware, mwSpec)
   })
 
@@ -582,7 +582,7 @@ function recordParamware(nodule, properties, spec) {
   }
   spec = spec || Object.create(null)
 
-  var mwSpec = new specs.MiddlewareSpec(spec)
+  const mwSpec = new specs.MiddlewareSpec(spec)
   if (spec && this.isString(spec.name)) {
     mwSpec.route = '[param handler :' + spec.name + ']'
   } else {
@@ -590,7 +590,7 @@ function recordParamware(nodule, properties, spec) {
   }
   mwSpec.type = MIDDLEWARE_TYPE_NAMES.PARAMWARE
 
-  var wrapSpec = new specs.WrapSpec(function wrapParamware(shim, middleware, name) {
+  const wrapSpec = new specs.WrapSpec(function wrapParamware(shim, middleware, name) {
     mwSpec.name = name
     return _recordMiddleware(shim, middleware, mwSpec)
   })
@@ -618,7 +618,7 @@ function recordParamware(nodule, properties, spec) {
  * @see WebFrameworkShim#setErrorPredicate
  */
 function noticeError(req, err) {
-  var txInfo = _getTransactionInfo(this, req)
+  const txInfo = _getTransactionInfo(this, req)
   if (txInfo && _isError(this, err)) {
     _noticeError(this, txInfo, err)
   }
@@ -636,7 +636,7 @@ function noticeError(req, err) {
  * @see WebFrameworkShim#setErrorPredicate
  */
 function errorHandled(req, err) {
-  var txInfo = _getTransactionInfo(this, req)
+  const txInfo = _getTransactionInfo(this, req)
   if (txInfo && txInfo.error === err) {
     txInfo.errorHandled = true
   }
@@ -667,7 +667,7 @@ function setErrorPredicate(pred) {
  * @param {Request} req - The request which caused the error.
  */
 function savePossibleTransactionName(req) {
-  var txInfo = _getTransactionInfo(this, req)
+  const txInfo = _getTransactionInfo(this, req)
   if (txInfo && txInfo.transaction) {
     txInfo.transaction.nameState.markPath()
   }
@@ -696,7 +696,7 @@ function setResponsePredicate(pred) {
  *  An object with key-value pairs.
  */
 function captureUrlParams(params) {
-  var segment = this.getSegment()
+  const segment = this.getSegment()
   if (segment && !this.agent.config.high_security) {
     urltils.copyParameters(params, segment.parameters)
   }
@@ -808,8 +808,8 @@ function _recordMiddleware(shim, middleware, spec) {
     return segmentName
   }
 
-  var isErrorWare = spec.type === MIDDLEWARE_TYPE_NAMES.ERRORWARE
-  var getReq = shim.isFunction(spec.req) ? spec.req : _makeGetReq(shim, spec.req)
+  const isErrorWare = spec.type === MIDDLEWARE_TYPE_NAMES.ERRORWARE
+  const getReq = shim.isFunction(spec.req) ? spec.req : _makeGetReq(shim, spec.req)
 
   return shim.record(
     middleware,
@@ -821,10 +821,10 @@ function _recordMiddleware(shim, middleware, spec) {
     const route = getRoute()
 
     // Pull out the request object.
-    var req = getReq.call(this, shim, fn, fnName, args)
+    const req = getReq.call(this, shim, fn, fnName, args)
 
     // Fetch the transaction information from that request.
-    var txInfo = _getTransactionInfo(shim, req)
+    const txInfo = _getTransactionInfo(shim, req)
     if (!txInfo || !txInfo.transaction) {
       shim.logger.debug(
         { txInfo: txInfo },
@@ -838,14 +838,14 @@ function _recordMiddleware(shim, middleware, spec) {
     txInfo.errorHandled |= isErrorWare
 
     // Copy over route parameters onto the transaction root.
-    var params = shim.agent.config.high_security
+    const params = shim.agent.config.high_security
       ? null
       : spec.params.call(this, shim, fn, fnName, args, req)
 
     // Wrap up `next` and push on our name state if we find it. We only want to
     // push the name state if there is a next so that we can safely remove it
     // if context leaves this middleware.
-    var nextWrapper = null
+    let nextWrapper = null
     if (shim.isFunction(spec.next)) {
       const nextDetails = {
         route,
@@ -857,7 +857,7 @@ function _recordMiddleware(shim, middleware, spec) {
 
       nextWrapper = _makeNextBinder(nextDetails, txInfo)
     } else {
-      var nextIdx = shim.normalizeIndex(args.length, spec.next)
+      const nextIdx = shim.normalizeIndex(args.length, spec.next)
       if (nextIdx !== null && args[nextIdx] instanceof Function) {
         const nextDetails = {
           route,
@@ -880,9 +880,9 @@ function _recordMiddleware(shim, middleware, spec) {
     }
 
     // ...and possibly construct a recorder
-    var recorder = null
+    let recorder = null
     if (typeDetails.record) {
-      var stackPath = txInfo.transaction.nameState.getPath() || ''
+      const stackPath = txInfo.transaction.nameState.getPath() || ''
       recorder = _makeMiddlewareRecorder(shim, metricName + '/' + stackPath)
     }
 
@@ -896,7 +896,7 @@ function _recordMiddleware(shim, middleware, spec) {
       recorder: recorder,
       parameters: params,
       after: function afterExec(shim, _fn, _name, err) {
-        var errIsError = _isError(shim, err)
+        const errIsError = _isError(shim, err)
         if (errIsError) {
           _noticeError(shim, txInfo, err)
         } else if (!nextWrapper && !isErrorWare && spec.appendPath) {
@@ -913,10 +913,10 @@ function _recordMiddleware(shim, middleware, spec) {
     const route = getRoute()
 
     // Pull out the request object.
-    var req = getReq.call(this, shim, fn, fnName, args)
+    const req = getReq.call(this, shim, fn, fnName, args)
 
     // Fetch the transaction information from that request.
-    var txInfo = _getTransactionInfo(shim, req)
+    const txInfo = _getTransactionInfo(shim, req)
     if (!txInfo || !txInfo.transaction) {
       shim.logger.debug(
         { txInfo: txInfo },
@@ -930,7 +930,7 @@ function _recordMiddleware(shim, middleware, spec) {
     txInfo.errorHandled |= isErrorWare
 
     // Copy over route parameters onto the transaction root.
-    var params = shim.agent.config.high_security
+    const params = shim.agent.config.high_security
       ? null
       : spec.params.call(this, shim, fn, fnName, args, req)
 
@@ -938,9 +938,9 @@ function _recordMiddleware(shim, middleware, spec) {
     if (spec.appendPath) {
       txInfo.transaction.nameState.appendPath(route, params)
     }
-    var recorder = null
+    let recorder = null
     if (typeDetails.record) {
-      var stackPath = txInfo.transaction.nameState.getPath() || ''
+      const stackPath = txInfo.transaction.nameState.getPath() || ''
       recorder = _makeMiddlewareRecorder(shim, metricName + '/' + stackPath)
     }
 
@@ -949,7 +949,7 @@ function _recordMiddleware(shim, middleware, spec) {
     // path for the current executing middleware, then readd it once the
     // next callback is done (either asynchronously or after the
     // returned promise is resolved).
-    var nextWrapper = function pushSegment(shim, _fn, _name, segment) {
+    let nextWrapper = function pushSegment(shim, _fn, _name, segment) {
       txInfo.segmentStack.push(segment)
     }
     if (shim.isFunction(spec.next)) {
@@ -962,7 +962,7 @@ function _recordMiddleware(shim, middleware, spec) {
       }
       nextWrapper = _makeNextBinder(nextDetails, txInfo)
     } else {
-      var nextIdx = shim.normalizeIndex(args.length, spec.next)
+      const nextIdx = shim.normalizeIndex(args.length, spec.next)
       if (nextIdx !== null && args[nextIdx] instanceof Function) {
         const nextDetails = {
           route,
@@ -1009,7 +1009,7 @@ function _recordMiddleware(shim, middleware, spec) {
 
 function _makeGetReq(shim, req) {
   return function getReqFromArgs(shim, fn, name, args) {
-    var reqIdx = shim.normalizeIndex(args.length, req)
+    const reqIdx = shim.normalizeIndex(args.length, req)
     if (reqIdx === null || !args[reqIdx]) {
       shim.logger.debug('Can not find request parameter, not recording.')
       return null
@@ -1048,7 +1048,7 @@ function _makeNextBinder(nextDetails, txInfo) {
             txInfo.segmentStack.pop()
             segment.end()
           }
-          var ret = original.apply(this, arguments)
+          const ret = original.apply(this, arguments)
 
           if (nextDetails.isPromise && shim.isPromise(ret)) {
             // After the next call has resolved, we should reinstate the
@@ -1104,9 +1104,9 @@ function _getTransactionInfo(shim, req) {
  */
 function _makeMiddlewareRecorder(shim, metricName) {
   return function middlewareMetricRecorder(segment, scope) {
-    var duration = segment.getDurationInMillis()
-    var exclusive = segment.getExclusiveDurationInMillis()
-    var transaction = segment.transaction
+    const duration = segment.getDurationInMillis()
+    const exclusive = segment.getExclusiveDurationInMillis()
+    const transaction = segment.transaction
 
     if (scope) {
       transaction.measure(metricName, scope, duration, exclusive)
@@ -1163,10 +1163,10 @@ function _isError(shim, err) {
  *   The spec object the values are coming from
  */
 function _copyExpectedSpecParameters(destination, source) {
-  var keys = ['matchArity']
+  const keys = ['matchArity']
 
-  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 (source[key] != null) {
       destination[key] = source[key]
     }