newrelic 8.3.0 → 8.5.2

package/lib/instrumentation/mongodb/common.js

@@ -47,9 +47,11 @@ common.instrumentCollection = function instrumentCollection(shim, Collection) {
  * Instruments all methods from constants.DB_OPS on
  * the Db class.
  *
- * @param {Object} params
+ * @param {object} params
  * @param {Shim} params.shim
  * @param {Db} params.Db
+ * @param shim
+ * @param Db
  */
 common.instrumentDb = function instrumentDb(shim, Db) {
   if (Db && Db.prototype) {
@@ -62,6 +64,7 @@ common.instrumentDb = function instrumentDb(shim, Db) {
 
 /**
  * Sets up the desc for all instrumented query methods
+ *
  * @param {Shim} shim
  * @param {string} methodName
  */
@@ -123,7 +126,7 @@ common.captureAttributesOnStarted = function captureAttributesOnStarted(shim, in
  * @param {Shim} shim
  * @param {string} connStr
  * @param {string} db database name
- * @param {Object} client mongo client instance
+ * @param {object} client mongo client instance
  */
 function setHostPort(shim, connStr, db, client) {
   const parts = connStr.split(':')
@@ -153,6 +156,9 @@ function setHostPort(shim, connStr, db, client) {
  * for the query segment. v4 refactored where the toplogy is stored.
  * You can now get the details via the client obj that's deeply nested
  * See: https://github.com/mongodb/node-mongodb-native/pull/2594/files#diff-1d214e57ddda9095d296e5700ebce701333bfefcf417e234c584d14091b2f50dR168
+ *
+ * @param shim
+ * @param obj
  */
 function getInstanceAttributeParameters(shim, obj) {
   if (obj.s && obj.s.db && obj.s.topology) {
@@ -173,7 +179,10 @@ function getInstanceAttributeParameters(shim, obj) {
     obj.s.db.s.client.s.options.hosts.length
   ) {
     // hosts is an array but we will always pull the first for consistency
-    let [{ host, port, socketPath }] = obj.s.db.s.client.s.options.hosts
+    const hosts = obj.s.db.s.client.s.options.hosts
+    let host = hosts[0].host
+    let port = hosts[0].port
+    const socketPath = hosts[0].socketPath
 
     if (socketPath) {
       port = socketPath
@@ -194,8 +203,10 @@ function getInstanceAttributeParameters(shim, obj) {
   }
 
   function doCapture(conf, database) {
-    let host = null
-    let port = null
+    // in older versions of 3.x the host/port
+    // lived directly on the topology.s.options
+    let host = conf.host
+    let port = conf.port
 
     // servers is an array but we will always pull the first for consistency
     if (conf.servers && conf.servers.length) {

package/lib/instrumentation/mysql.js

@@ -5,8 +5,8 @@
 
 'use strict'
 
-var dbutils = require('../db/utils')
-var properties = require('../util/properties')
+const dbutils = require('../db/utils')
+const properties = require('../util/properties')
 
 module.exports = function initialize(agent, mysql, moduleName, shim) {
   shim.setDatastore(shim.MYSQL)
@@ -16,7 +16,7 @@ module.exports = function initialize(agent, mysql, moduleName, shim) {
   function wrapCreateConnection(shim, fn, fnName, connection) {
     shim.logger.debug('Wrapping Connection#query')
     if (wrapQueriable(shim, connection, false)) {
-      var connProto = Object.getPrototypeOf(connection)
+      const connProto = Object.getPrototypeOf(connection)
       shim.setInternalProperty(connProto, '__NR_storeDatabase', true)
       shim.unwrap(mysql, 'createConnection')
     }
@@ -33,7 +33,7 @@ module.exports = function initialize(agent, mysql, moduleName, shim) {
   shim.wrapReturn(mysql, 'createPoolCluster', wrapCreatePoolCluster)
   function wrapCreatePoolCluster(shim, fn, fnName, poolCluster) {
     shim.logger.debug('Wrapping PoolCluster#of')
-    var proto = Object.getPrototypeOf(poolCluster)
+    const proto = Object.getPrototypeOf(poolCluster)
     shim.wrapReturn(proto, 'of', wrapPoolClusterOf)
     function wrapPoolClusterOf(shim, of, _n, poolNamespace) {
       if (wrapGetConnection(shim, poolNamespace)) {
@@ -61,11 +61,11 @@ function wrapGetConnection(shim, connectable) {
     return false
   }
 
-  var proto = Object.getPrototypeOf(connectable)
+  const proto = Object.getPrototypeOf(connectable)
   shim.wrap(proto, 'getConnection', function doWrapGetConnection(shim, fn) {
     return function wrappedGetConnection() {
-      var args = shim.toArray(arguments)
-      var cbIdx = args.length - 1
+      const args = shim.toArray(arguments)
+      const cbIdx = args.length - 1
 
       if (shim.isFunction(args[cbIdx]) && !shim.isWrapped(args[cbIdx])) {
         shim.logger.trace(
@@ -74,7 +74,7 @@ function wrapGetConnection(shim, connectable) {
           },
           'Wrapping callback with segment'
         )
-        var cb = args[cbIdx]
+        let cb = args[cbIdx]
         if (!shim.__wrappedPoolConnection) {
           cb = shim.wrap(cb, wrapGetConnectionCallback)
         }
@@ -119,9 +119,9 @@ function wrapQueriable(shim, queriable, isPoolQuery) {
     return false
   }
 
-  var proto = Object.getPrototypeOf(queriable)
+  const proto = Object.getPrototypeOf(queriable)
 
-  var describe
+  let describe
   if (isPoolQuery) {
     describe = describePoolQuery
   } else {
@@ -139,8 +139,8 @@ function wrapQueriable(shim, queriable, isPoolQuery) {
 }
 
 function extractQueryArgs(shim, args) {
-  var query = ''
-  var callback = null
+  let query = ''
+  let callback = null
 
   // Figure out the query parameter.
   if (shim.isString(args[0])) {
@@ -168,10 +168,10 @@ function extractQueryArgs(shim, args) {
 
 function describeQuery(shim, queryFn, fnName, args) {
   shim.logger.trace('Recording query')
-  var extractedArgs = extractQueryArgs(shim, args)
+  const extractedArgs = extractQueryArgs(shim, args)
 
   // Pull out instance attributes.
-  var parameters = getInstanceParameters(shim, this, extractedArgs.query)
+  const parameters = getInstanceParameters(shim, this, extractedArgs.query)
 
   shim.logger.trace(
     {
@@ -193,7 +193,7 @@ function describeQuery(shim, queryFn, fnName, args) {
 
 function describePoolQuery(shim, queryFn, fnName, args) {
   shim.logger.trace('Recording pool query')
-  var extractedArgs = extractQueryArgs(shim, args)
+  const extractedArgs = extractQueryArgs(shim, args)
   return {
     stream: true,
     query: null,
@@ -204,10 +204,10 @@ function describePoolQuery(shim, queryFn, fnName, args) {
 }
 
 function getInstanceParameters(shim, queryable, query) {
-  var parameters = { host: null, port_path_or_id: null, database_name: null }
-  var conf = queryable.config
+  const parameters = { host: null, port_path_or_id: null, database_name: null }
+  let conf = queryable.config
   conf = (conf && conf.connectionConfig) || conf
-  var databaseName = queryable.__NR_databaseName || null
+  let databaseName = queryable.__NR_databaseName || null
   if (conf) {
     parameters.database_name = databaseName = databaseName || conf.database
 
@@ -229,7 +229,7 @@ function getInstanceParameters(shim, queryable, query) {
 
 function storeDatabaseName(shim, queryable, query) {
   if (queryable.__NR_storeDatabase) {
-    var databaseName = dbutils.extractDatabaseChangeFromUse(query)
+    const databaseName = dbutils.extractDatabaseChangeFromUse(query)
     if (databaseName) {
       shim.setInternalProperty(queryable, '__NR_databaseName', databaseName)
     }

package/lib/instrumentation/oracle.js

@@ -5,14 +5,14 @@
 
 'use strict'
 
-var logger = require('../logger').child({ component: 'oracle' })
-var shimmer = require('../shimmer')
-var parseSql = require('../db/parse-sql')
-var ORACLE = require('../metrics/names').ORACLE
+const logger = require('../logger').child({ component: 'oracle' })
+const shimmer = require('../shimmer')
+const parseSql = require('../db/parse-sql')
+const ORACLE = require('../metrics/names').ORACLE
 
 module.exports = function initialize(agent, oracle) {
-  var tracer = agent.tracer
-  var wrapped = false
+  const tracer = agent.tracer
+  let wrapped = false
 
   logger.trace('wrapping oracle.connect and oracle.connectSync')
 
@@ -31,7 +31,7 @@ module.exports = function initialize(agent, oracle) {
 
   shimmer.wrapMethod(oracle, 'Oracle', 'connectSync', function wrapSyncConnect(connect) {
     return function wrappedSyncConnect() {
-      var connection = connect.apply(this, arguments)
+      const connection = connect.apply(this, arguments)
       ensureConnectionWrapped(connection)
       return connection
     }
@@ -51,13 +51,13 @@ module.exports = function initialize(agent, oracle) {
       return tracer.wrapFunctionNoSegment(connect, 'connect')
     })
 
-    var proto = Object.getPrototypeOf(connection)
+    const proto = Object.getPrototypeOf(connection)
     wrapConnectionExecute(proto, tracer)
     wrapConnectionPrepare(proto, tracer)
 
     shimmer.wrapMethod(proto, 'Oracle', 'reader', function wrapMethod(createReader) {
       return function wrappedConnect(sql) {
-        var reader = createReader.apply(this, arguments)
+        const reader = createReader.apply(this, arguments)
         wrapReader(reader, tracer, sql)
         return reader
       }
@@ -73,9 +73,9 @@ function wrapConnectionExecute(connection, tracer) {
   }
 
   function wrappedExecute(segment, args, bind) {
-    var ps = parseSql(ORACLE.PREFIX, args[0])
-    var collection = ps.collection
-    var operation = ps.operation
+    const ps = parseSql(ORACLE.PREFIX, args[0])
+    const collection = ps.collection
+    const operation = ps.operation
 
     segment.name = ORACLE.STATEMENT + collection + '/Connection.execute/' + operation
     logger.trace('capturing oracle query. collection: %s, Operation: %s', collection, operation)
@@ -87,7 +87,7 @@ function wrapConnectionExecute(connection, tracer) {
 }
 
 function wrapReader(reader, tracer, sql) {
-  var ps = parseSql(ORACLE.PREFIX, sql)
+  const ps = parseSql(ORACLE.PREFIX, sql)
   shimmer.wrapMethod(reader, 'Oracle.Reader', 'nextRow', wrapNextRow)
   shimmer.wrapMethod(reader, 'Oracle.Reader', 'nextRows', wrapNextRows)
 
@@ -113,8 +113,8 @@ function wrapConnectionPrepare(connection, tracer) {
 
   function wrapPrepare(prepare) {
     return function wrappedPrepare(sql) {
-      var ps = parseSql(ORACLE.PREFIX, sql)
-      var prepared = prepare.apply(this, arguments)
+      const ps = parseSql(ORACLE.PREFIX, sql)
+      const prepared = prepare.apply(this, arguments)
       shimmer.wrapMethod(prepared, 'Oracle', 'execute', wrapExecute)
       return prepared
 

package/lib/instrumentation/pg.js

@@ -8,8 +8,8 @@
 const semver = require('semver')
 
 function getQuery(shim, original, name, args) {
-  var config = args[0]
-  var statement
+  const config = args[0]
+  let statement
   if (config && (typeof config === 'string' || config instanceof String)) {
     statement = config
   } else if (config && config.text) {
@@ -98,11 +98,11 @@ module.exports = function initialize(agent, pgsql, moduleName, shim) {
   // client.  The original getter replaces itself with the instance of the native
   // client, so only instrument if the getter exists (otherwise assume already
   // instrumented).
-  var origGetter = pgsql.__lookupGetter__('native')
+  const origGetter = pgsql.__lookupGetter__('native')
   if (origGetter) {
     delete pgsql.native
     pgsql.__defineGetter__('native', function getNative() {
-      var temp = origGetter()
+      const temp = origGetter()
       if (temp != null) {
         instrumentPGNative(temp)
       }

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,