newrelic 8.3.0 → 8.4.0

package/lib/instrumentation/hapi/hapi-17.js

@@ -28,7 +28,7 @@ function serverFactoryWrapper(shim, fn, fnName, server) {
 }
 
 function serverPostConstructor(shim) {
-  var proto = Object.getPrototypeOf(this)
+  const proto = Object.getPrototypeOf(this)
 
   if (shim.isWrapped(proto.decorate)) {
     shim.logger.trace('Already wrapped Server proto, not wrapping again')
@@ -44,7 +44,7 @@ function serverPostConstructor(shim) {
       }
 
       // Convert arguments to usable array
-      var args = shim.argsToArray.apply(shim, arguments)
+      const args = shim.argsToArray.apply(shim, arguments)
 
       // Wrap the third server.decorate arg, the user-defined handler
       shim.wrap(args, shim.THIRD, function wrapHandler(shim, fn) {
@@ -59,7 +59,7 @@ function serverPostConstructor(shim) {
         return wrappedHandler
 
         function wrappedHandler(route) {
-          var ret = fn.apply(this, arguments)
+          const ret = fn.apply(this, arguments)
 
           return typeof ret === 'function' ? wrapRouteHandler(shim, ret, route && route.path) : ret
         }
@@ -71,7 +71,7 @@ function serverPostConstructor(shim) {
 
   shim.wrap(proto, 'route', function wrapRoute(shim, original) {
     return function wrappedRoute() {
-      var args = shim.argsToArray.apply(shim, arguments)
+      const args = shim.argsToArray.apply(shim, arguments)
 
       if (!shim.isObject(args[0])) {
         return original.apply(this, args)
@@ -92,7 +92,7 @@ function serverPostConstructor(shim) {
       function _wrapRoute(shim, route) {
         const routePath = prefix + route.path
         if (shim.isArray(route)) {
-          for (var i = 0; i < route.length; ++i) {
+          for (let i = 0; i < route.length; ++i) {
             _wrapRoute(shim, route[i])
           }
           return
@@ -132,10 +132,10 @@ function serverPostConstructor(shim) {
 
   shim.wrap(proto, 'ext', function wrapExt(shim, original) {
     return function wrappedExt(event, method) {
-      var args = shim.argsToArray.apply(shim, arguments)
+      const args = shim.argsToArray.apply(shim, arguments)
 
       if (shim.isArray(event)) {
-        for (var i = 0; i < event.length; i++) {
+        for (let i = 0; i < event.length; i++) {
           event[i].method = wrapMiddleware(shim, event[i].method, event[i].type)
         }
       } else if (shim.isObject(event)) {
@@ -154,7 +154,7 @@ function serverPostConstructor(shim) {
 
 function wrapPreHandlers(shim, container, path) {
   if (shim.isArray(container)) {
-    for (var i = 0; i < container.length; ++i) {
+    for (let i = 0; i < container.length; ++i) {
       container[i] = wrapPreHandlers(shim, container[i], path)
     }
     return container
@@ -177,14 +177,14 @@ function wrapRouteHandler(shim, handler, path) {
   return shim.recordMiddleware(handler, {
     route: path,
     req: function getReq(shim, fn, fnName, args) {
-      var request = args[0]
+      const request = args[0]
       if (request && request.raw) {
         return request.raw.req
       }
     },
     promise: true,
     params: function getParams(shim, fn, fnName, args) {
-      var req = args[0]
+      const req = args[0]
       return req && req.params
     }
   })
@@ -200,7 +200,7 @@ function wrapMiddleware(shim, middleware, event) {
     type: event === 'onPreResponse' ? shim.ERRORWARE : shim.MIDDLEWARE,
     promise: true,
     req: function getReq(shim, fn, fnName, args) {
-      var req = args[0]
+      const req = args[0]
       return req && req.raw && req.raw.req
     }
   })

package/lib/instrumentation/hapi/shared.js

@@ -7,7 +7,7 @@
 
 // This object defines all the events that we want to wrap extensions
 // for, as they are the only ones associated with requests.
-var ROUTE_EVENTS = {
+const ROUTE_EVENTS = {
   onRequest: true,
   onPreAuth: true,
   onCredentials: true,

package/lib/instrumentation/hapi.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var shared = require('./hapi/shared')
+const shared = require('./hapi/shared')
 
 module.exports = function initialize(agent, hapi, moduleName, shim) {
   if (!agent || !hapi || !shim) {
@@ -32,7 +32,7 @@ module.exports = function initialize(agent, hapi, moduleName, shim) {
 
     // See if we can find the plugin class. This should be the super class of
     // Server and will cover more scenarios.
-    var Plugin = hapi.Server.super_
+    const Plugin = hapi.Server.super_
     if (_isPluginClass(Plugin)) {
       wrapServer(shim, Plugin)
     } else {
@@ -46,9 +46,9 @@ function wrapServer(shim, Server) {
   // the second argument is expected to be a function that generates the handler function
   shim.wrap(Server.prototype, 'handler', function wrapHandler(shim, original) {
     return function wrappedHandler() {
-      var args = shim.argsToArray.apply(shim, arguments)
+      const args = shim.argsToArray.apply(shim, arguments)
 
-      var handlerGenerator = args[1]
+      const handlerGenerator = args[1]
       if (typeof handlerGenerator === 'function') {
         args[1] = wrapGenerator(handlerGenerator)
       }
@@ -57,10 +57,10 @@ function wrapServer(shim, Server) {
 
       function wrapGenerator(generator) {
         function wrappedGenerator() {
-          var generatorArgs = shim.argsToArray.apply(shim, arguments)
-          var handler = generator.apply(this, generatorArgs)
+          const generatorArgs = shim.argsToArray.apply(shim, arguments)
+          const handler = generator.apply(this, generatorArgs)
           if (typeof handler === 'function') {
-            var route = generatorArgs[0]
+            const route = generatorArgs[0]
             return wrapRouteHandler(shim, handler, route && route.path)
           }
           return handler
@@ -75,7 +75,7 @@ function wrapServer(shim, Server) {
 
   shim.wrap(Server.prototype, 'route', function wrapRoute(shim, original) {
     return function wrappedRoute() {
-      var args = shim.argsToArray.apply(shim, arguments)
+      const args = shim.argsToArray.apply(shim, arguments)
 
       // first argument is expected to be the route configuration object
       if (!shim.isObject(args[0])) {
@@ -98,7 +98,7 @@ function wrapServer(shim, Server) {
         const routePath = prefix + route.path
         // handler function could be on the route object, or on a nested config object
         if (shim.isArray(route)) {
-          for (var i = 0; i < route.length; ++i) {
+          for (let i = 0; i < route.length; ++i) {
             _wrapRoute(shim, route[i])
           }
           return
@@ -119,10 +119,10 @@ function wrapServer(shim, Server) {
 
   shim.wrap(Server.prototype, 'ext', function wrapExt(shim, original) {
     return function wrappedExt(event, method) {
-      var args = shim.argsToArray.apply(shim, arguments)
+      const args = shim.argsToArray.apply(shim, arguments)
 
       if (shim.isArray(event)) {
-        for (var i = 0; i < event.length; i++) {
+        for (let i = 0; i < event.length; i++) {
           event[i].method = wrapMiddleware(shim, event[i].method, event[i].type)
         }
       } else if (shim.isObject(event)) {
@@ -142,7 +142,7 @@ function wrapServer(shim, Server) {
 function wrapCreateServer(shim, hapi) {
   shim.wrap(hapi, 'createServer', function getWrapper(shim, createServer) {
     return function createServerWrapper() {
-      var server = createServer.apply(this, arguments)
+      const server = createServer.apply(this, arguments)
       wrapServer(shim, server.constructor)
       shim.unwrap(hapi, 'createServer')
       return server
@@ -152,7 +152,7 @@ function wrapCreateServer(shim, hapi) {
 
 function wrapPreHandlers(shim, container, path) {
   if (shim.isArray(container)) {
-    for (var i = 0; i < container.length; ++i) {
+    for (let i = 0; i < container.length; ++i) {
       container[i] = wrapPreHandlers(shim, container[i], path)
     }
     return container
@@ -194,20 +194,20 @@ function buildMiddlewareSpec(shim, path, isPreHandler) {
   return {
     route: path,
     req: function getReq(shim, fn, fnName, args) {
-      var request = args[0]
+      const request = args[0]
       if (request && request.raw) {
         return request.raw.req
       }
     },
     next: function wrapNext(shim, fn, fnName, args, wrap) {
-      var reply = args[1]
+      const reply = args[1]
       if (!shim.isFunction(reply)) {
         return
       }
       wrapReply(wrap, reply, isPreHandler)
     },
     params: function getParams(shim, fn, fnName, args) {
-      var req = args[0]
+      const req = args[0]
       return req && req.params
     }
   }
@@ -216,7 +216,7 @@ function buildMiddlewareSpec(shim, path, isPreHandler) {
 function wrapHapiHandler(shim, handler) {
   return shim.wrap(handler, function wrapHandler(shim, original) {
     return function wrapped() {
-      var reply = arguments[1]
+      const reply = arguments[1]
       if (reply) {
         shim.recordRender(reply, 'view')
       }
@@ -230,18 +230,18 @@ function wrapMiddleware(shim, middleware, event) {
     return middleware
   }
 
-  var spec = {
+  const spec = {
     route: event,
     type: event === 'onPreResponse' ? shim.ERRORWARE : shim.MIDDLEWARE,
     next: function wrapNext(shim, fn, fnName, args, wrap) {
-      var reply = args[1]
+      const reply = args[1]
       if (!reply || !shim.isFunction(reply.continue)) {
         return
       }
       wrap(reply, 'continue')
     },
     req: function getReq(shim, fn, fnName, args) {
-      var request = args[0]
+      const request = args[0]
       if (request && request.raw) {
         return request.raw.req
       }
@@ -256,7 +256,7 @@ function _isPluginClass(Plugin) {
     return false
   }
 
-  var proto = Plugin.prototype
+  const proto = Plugin.prototype
   return (
     typeof proto.handler === 'function' &&
     typeof proto.route === 'function' &&
@@ -265,7 +265,7 @@ function _isPluginClass(Plugin) {
 }
 
 function wrapReply(wrap, reply, isPreHandler) {
-  var isFinal = !isPreHandler
+  const isFinal = !isPreHandler
   // The only reply method that is actually used by pre-handlers is `response`. All
   // other methods still exist, but don't function as they do in normal route handlers.
   // Since they can still be referenced by users, they still need to be wrapped.

package/lib/instrumentation/ioredis.js

@@ -5,11 +5,11 @@
 
 'use strict'
 
-var stringify = require('json-stringify-safe')
-var urltils = require('../util/urltils.js')
+const stringify = require('json-stringify-safe')
+const urltils = require('../util/urltils.js')
 
 module.exports = function initialize(agent, redis, moduleName, shim) {
-  var proto = redis && redis.prototype
+  const proto = redis && redis.prototype
   if (!proto) {
     return false
   }
@@ -18,17 +18,17 @@ module.exports = function initialize(agent, redis, moduleName, shim) {
   shim.recordOperation(proto, 'sendCommand', wrapSendCommand)
 
   function wrapSendCommand(shim, original, name, args) {
-    var command = args[0]
+    const command = args[0]
 
     // TODO: Instance attributes for ioredis
-    var parameters = {
+    const parameters = {
       host: this.connector.options.host,
       port_path_or_id: this.connector.options.port
     }
 
-    var keys = command.args
+    const keys = command.args
     if (keys && typeof keys !== 'function') {
-      var src = Object.create(null)
+      const src = Object.create(null)
       try {
         src.key = stringify(keys[0])
       } catch (err) {

package/lib/instrumentation/memcached.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var stringify = require('json-stringify-safe')
+const stringify = require('json-stringify-safe')
 
 function wrapKeys(metacall) {
   if (metacall.key) {
@@ -23,7 +23,7 @@ function wrapKeys(metacall) {
  * instrument the memcached driver to intercept calls and keep stats on them.
  */
 module.exports = function initialize(agent, memcached, moduleName, shim) {
-  var proto = memcached && memcached.prototype
+  const proto = memcached && memcached.prototype
   if (!proto) {
     return false
   }
@@ -34,10 +34,10 @@ module.exports = function initialize(agent, memcached, moduleName, shim) {
     // address. The query generator returns a simple object describing the
     // memcached call. The server parameter is only provided for multi-calls.
     // When not provided, it can be derived from the key being interacted with.
-    var metacall = args[0]()
-    var server = args[1]
-    var keys = wrapKeys(metacall)
-    var parameters = Object.create(null)
+    const metacall = args[0]()
+    const server = args[1]
+    const keys = wrapKeys(metacall)
+    const parameters = Object.create(null)
     try {
       parameters.key = stringify(keys[0])
     } catch (err) {
@@ -46,7 +46,7 @@ module.exports = function initialize(agent, memcached, moduleName, shim) {
     }
 
     // Capture connection info for datastore instance metric.
-    var location = null
+    let location = null
     if (typeof server === 'string') {
       location = server
     } else if (this.HashRing && this.HashRing.get && metacall.key) {

package/lib/instrumentation/mongodb/common.js

@@ -173,7 +173,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

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)
       }