newrelic 7.5.2 → 8.3.0

package/lib/instrumentation/core/http.js

@@ -6,7 +6,7 @@
 'use strict'
 
 const shimmer = require('../../shimmer')
-const logger = require('../../logger').child({component: 'http'})
+const logger = require('../../logger').child({ component: 'http' })
 const recordWeb = require('../../metrics/recorders/http')
 const hashes = require('../../util/hashes')
 const cat = require('../../util/cat')
@@ -32,7 +32,6 @@ const NEWRELIC_TRANSACTION_HEADER = 'x-newrelic-transaction'
 const NEWRELIC_SYNTHETICS_HEADER = 'x-newrelic-synthetics'
 const TRANSACTION_INFO_KEY = '__NR_transactionInfo'
 
-
 // For incoming requests this instrumentation functions by wrapping
 // `http.createServer` and `http.Server#addListener`. The former merely sets the
 // agent dispatcher to 'http' and the latter wraps any event handlers bound to
@@ -49,7 +48,9 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
 
   return tracer.transactionProxy(function wrappedHandler(evnt, request, response) {
     var transaction = tracer.getTransaction()
-    if (!transaction) return emit.apply(this, arguments)
+    if (!transaction) {
+      return emit.apply(this, arguments)
+    }
 
     transaction.nameState.setPrefix(NAMES.NODEJS.PREFIX)
     transaction.nameState.setDelimiter(NAMES.ACTION_DELIMITER)
@@ -73,10 +74,7 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
     segment.start()
 
     if (request.method != null) {
-      segment.addSpanAttribute(
-        'request.method',
-        request.method
-      )
+      segment.addSpanAttribute('request.method', request.method)
     }
 
     if (txInfo) {
@@ -106,10 +104,7 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
       transaction.url
     )
 
-    segment.addSpanAttribute(
-      'request.uri',
-      transaction.url
-    )
+    segment.addSpanAttribute('request.uri', transaction.url)
 
     // store the port on which this transaction runs
     if (this.address instanceof Function) {
@@ -121,8 +116,10 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
     transaction.port = serverPort
 
     // need to set any config-driven names early for RUM
-    logger.trace({url: request.url, transaction: transaction.id},
-      'Applying user naming rules for RUM.')
+    logger.trace(
+      { url: request.url, transaction: transaction.id },
+      'Applying user naming rules for RUM.'
+    )
     transaction.applyUserNamingRules(request.url)
 
     const queueTimeStamp = headerProcessing.getQueueTime(logger, request.headers)
@@ -151,8 +148,7 @@ function wrapEmitWithTransaction(agent, emit, isHTTPS) {
       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)
+          logger.trace('Got inbound request CAT headers in transaction %s', transaction.id)
         }
       }
     }
@@ -228,10 +224,7 @@ function storeTxInfo(transaction, request, response) {
     request[TRANSACTION_INFO_KEY] = response[TRANSACTION_INFO_KEY] = txInfo
   }
 
-  logger.trace(
-    'Stored transaction %s information on request and response',
-    transaction.id
-  )
+  logger.trace('Stored transaction %s information on request and response', transaction.id)
 
   return txInfo
 }
@@ -240,11 +233,7 @@ function initializeRequest(transaction, request) {
   headerAttributes.collectRequestHeaders(request.headers, transaction)
 
   if (request.method != null) {
-    transaction.trace.attributes.addAttribute(
-      DESTS.TRANS_COMMON,
-      'request.method',
-      request.method
-    )
+    transaction.trace.attributes.addAttribute(DESTS.TRANS_COMMON, 'request.method', request.method)
     transaction.nameState.setVerb(request.method)
   }
 }
@@ -314,9 +303,7 @@ function wrapWriteHead(agent, writeHead) {
     }
 
     if (!agent.config.trusted_account_ids) {
-      logger.trace(
-        'No account IDs in config.trusted_account_ids - not adding response CAT headers'
-      )
+      logger.trace('No account IDs in config.trusted_account_ids - not adding response CAT headers')
       return writeHead.apply(this, arguments)
     }
 
@@ -346,10 +333,10 @@ 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 new_headers = arguments[arguments.length - 1]
+    var newHeaders = arguments[arguments.length - 1]
 
-    if (typeof new_headers === 'object') {
-      contentLength = headerProcessing.getContentLengthFromHeaders(new_headers)
+    if (typeof newHeaders === 'object') {
+      contentLength = headerProcessing.getContentLengthFromHeaders(newHeaders)
     }
 
     const currentHeaders = this.getHeaders()
@@ -395,9 +382,10 @@ function wrapWriteHead(agent, writeHead) {
 function urlToOptions(_url) {
   const options = {
     protocol: _url.protocol,
-    hostname: typeof _url.hostname === 'string' && _url.hostname.startsWith('[') ?
-      _url.hostname.slice(1, -1) :
-      _url.hostname,
+    hostname:
+      typeof _url.hostname === 'string' && _url.hostname.startsWith('[')
+        ? _url.hostname.slice(1, -1)
+        : _url.hostname,
     hash: _url.hash,
     search: _url.search,
     pathname: _url.pathname,
@@ -437,7 +425,6 @@ function wrapRequest(agent, request) {
 
     let reqArgs = [options, cb]
 
-
     // Don't pollute metrics and calls with NR connections
     const internalOnly = options && options[NR_CONNECTION_PROP]
     if (internalOnly) {
@@ -477,8 +464,9 @@ module.exports = function initialize(agent, http, moduleName) {
   const IS_HTTPS = moduleName === 'https'
 
   // FIXME: will this ever not be called?
-  shimmer.wrapMethod(http, 'http', 'createServer', function cb_wrapMethod(createServer) {
-    return function setDispatcher(requestListener) { // eslint-disable-line no-unused-vars
+  shimmer.wrapMethod(http, 'http', 'createServer', function wrapMethod(createServer) {
+    // eslint-disable-next-line no-unused-vars
+    return function setDispatcher(requestListener) {
       agent.environment.setDispatcher('http')
       return createServer.apply(this, arguments)
     }
@@ -504,7 +492,6 @@ module.exports = function initialize(agent, http, moduleName) {
 
   wrapResponseEnd(agent, http.ServerResponse && http.ServerResponse.prototype)
 
-
   // If CAT is enabled we'll wrap `writeHead` to inject our headers.
   if (agent.config.cross_application_tracer.enabled) {
     shimmer.wrapMethod(
@@ -517,19 +504,9 @@ module.exports = function initialize(agent, http, moduleName) {
 
   var agentProto = http && http.Agent && http.Agent.prototype
 
-  shimmer.wrapMethod(
-    http,
-    'http',
-    'request',
-    wrapRequest.bind(null, agent)
-  )
+  shimmer.wrapMethod(http, 'http', 'request', wrapRequest.bind(null, agent))
 
-  shimmer.wrapMethod(
-    http,
-    'http',
-    'get',
-    wrapRequest.bind(null, agent)
-  )
+  shimmer.wrapMethod(http, 'http', 'get', wrapRequest.bind(null, agent))
 
   shimmer.wrapMethod(
     agentProto,
@@ -597,24 +574,17 @@ function parseSyntheticsHeader(header, encKey, trustedIds) {
   }
   var synthData = null
   try {
-    synthData = JSON.parse(
-      hashes.deobfuscateNameUsingKey(header, encKey)
-    )
+    synthData = JSON.parse(hashes.deobfuscateNameUsingKey(header, encKey))
   } catch (e) {
     logger.trace(e, 'Got unparsable synthetics header: %s', header)
     return
   }
 
   if (!Array.isArray(synthData)) {
-    logger.trace(
-      'Synthetics data is not an array: %s (%s)',
-      synthData,
-      typeof synthData
-    )
+    logger.trace('Synthetics data is not an array: %s (%s)', synthData, typeof synthData)
     return
   }
 
-
   if (synthData.length < Object.keys(parsedData).length) {
     logger.trace(
       'Synthetics header length is %s, expected at least %s',
@@ -625,11 +595,7 @@ function parseSyntheticsHeader(header, encKey, trustedIds) {
 
   parsedData.version = synthData[0]
   if (parsedData.version !== 1) {
-    logger.trace(
-      'Synthetics header version is not 1, got: %s (%s)',
-      parsedData.version,
-      synthData
-    )
+    logger.trace('Synthetics header version is not 1, got: %s (%s)', parsedData.version, synthData)
     return
   }
 

package/lib/instrumentation/core/inspector.js

@@ -13,15 +13,11 @@ function initialize(agent, inspector, name, shim) {
     return false
   }
 
-  shim.wrap(
-    sessionProto,
-    'post',
-    function wrapPost(shim, fn) {
-      return function wrappedPost() {
-        var args = shim.argsToArray.apply(shim, arguments)
-        shim.bindCallbackSegment(args, shim.LAST)
-        return fn.apply(this, args)
-      }
+  shim.wrap(sessionProto, 'post', function wrapPost(shim, fn) {
+    return function wrappedPost() {
+      var args = shim.argsToArray.apply(shim, arguments)
+      shim.bindCallbackSegment(args, shim.LAST)
+      return fn.apply(this, args)
     }
-  )
+  })
 }

package/lib/instrumentation/core/net.js

@@ -46,7 +46,9 @@ module.exports = function initialize(agent, net, moduleName, shim) {
       const segment = shim.getActiveSegment()
       const emit = this.emit
 
-      if (!segment || !emit) return fn.apply(this, arguments)
+      if (!segment || !emit) {
+        return fn.apply(this, arguments)
+      }
 
       this.emit = wrappedEmit
 

package/lib/instrumentation/core/timers.js

@@ -10,29 +10,25 @@ module.exports = initialize
 function initialize(agent, timers, moduleName, shim) {
   const processMethods = ['nextTick', '_nextDomainTick', '_tickDomainCallback']
 
-  shim.wrap(
-    process,
-    processMethods,
-    function wrapProcess(shim, fn) {
-      return function wrappedProcess() {
-        const segment = shim.getActiveSegment()
-        if (!segment) {
-          return fn.apply(this, arguments)
-        }
+  shim.wrap(process, processMethods, function wrapProcess(shim, fn) {
+    return function wrappedProcess() {
+      const segment = shim.getActiveSegment()
+      if (!segment) {
+        return fn.apply(this, arguments)
+      }
 
-        // 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) {
-          args[i] = arguments[i]
-        }
+      // 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) {
+        args[i] = arguments[i]
+      }
 
-        shim.bindSegment(args, shim.FIRST, segment)
+      shim.bindSegment(args, shim.FIRST, segment)
 
-        return fn.apply(this, args)
-      }
+      return fn.apply(this, args)
     }
-  )
+  })
 
   instrumentTimerMethods(timers)
 
@@ -43,10 +39,7 @@ function initialize(agent, timers, moduleName, shim) {
   }
 
   function instrumentTimerMethods(nodule) {
-    const asynchronizers = [
-      'setTimeout',
-      'setInterval'
-    ]
+    const asynchronizers = ['setTimeout', 'setInterval']
 
     shim.record(nodule, asynchronizers, recordAsynchronizers)
 
@@ -87,7 +80,7 @@ function initialize(agent, timers, moduleName, shim) {
   }
 
   function recordAsynchronizers(shim, fn, name) {
-    return {name: 'timers.' + name, callback: shim.FIRST}
+    return { name: 'timers.' + name, callback: shim.FIRST }
   }
 }
 

package/lib/instrumentation/core/zlib.js

@@ -9,15 +9,7 @@ const recorder = require('../../metrics/recorders/generic')
 
 module.exports = initialize
 
-var methods = [
-  'deflate',
-  'deflateRaw',
-  'gzip',
-  'gunzip',
-  'inflate',
-  'inflateRaw',
-  'unzip'
-]
+var methods = ['deflate', 'deflateRaw', 'gzip', 'gunzip', 'inflate', 'inflateRaw', 'unzip']
 
 function initialize(agent, zlib, moduleName, shim) {
   shim.record(zlib, methods, recordZLib)
@@ -34,7 +26,7 @@ function initialize(agent, zlib, moduleName, shim) {
   }
 
   function recordZLib(shim, fn, name) {
-    return {name: `zlib.${name}`, callback: shim.LAST, recorder}
+    return { name: `zlib.${name}`, callback: shim.LAST, recorder }
   }
 }
 

package/lib/instrumentation/express.js

@@ -121,7 +121,7 @@ function wrapExpress3(shim, express) {
 
 function wrapRouteMethods(shim, route, path) {
   var methods = ['all', 'delete', 'get', 'head', 'opts', 'post', 'put', 'patch']
-  shim.wrapMiddlewareMounter(route, methods, {route: path, wrapper: wrapMiddleware})
+  shim.wrapMiddlewareMounter(route, methods, { route: path, wrapper: wrapMiddleware })
 }
 
 function wrapResponse(shim, response) {
@@ -139,7 +139,9 @@ function wrapResponse(shim, response) {
         ++cbIdx
         cb = function defaultRenderCB(err, str) {
           // https://github.com/expressjs/express/blob/4.x/lib/response.js#L961-L962
-          if (err) return res.req.next(err)
+          if (err) {
+            return res.req.next(err)
+          }
           res.send(str)
         }
         args.push(cb)

package/lib/instrumentation/fastify/spec-builders.js

@@ -1,3 +1,8 @@
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 'use strict'
 
 const getRawRequestFromFastifyRequest = (shim, fn, fnName, args) => {

package/lib/instrumentation/fastify.js

@@ -1,9 +1,14 @@
+/*
+ * Copyright 2020 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 'use strict'
 const semver = require('semver')
 const {
   buildMiddlewareSpecForRouteHandler,
   buildMiddlewareSpecForMiddlewareFunction
-} = require ('./fastify/spec-builders')
+} = require('./fastify/spec-builders')
 /**
  * Sets up fastify route handler
  *
@@ -17,7 +22,7 @@ const {
  * maintain code
  */
 const setupRouteHandler = (shim, fastify) => {
-  fastify.addHook('onRoute', (routeOptions)=>{
+  fastify.addHook('onRoute', (routeOptions) => {
     if (!routeOptions.handler) {
       return
     }
@@ -38,12 +43,6 @@ const setupRouteHandler = (shim, fastify) => {
 }
 
 const setupMiddlewareHandlers = (shim, fastify) => {
-  // Don't wrap use() in fastify v3+
-  const fastifyVersion = shim.require('./package.json').version
-  if (semver.satisfies(fastifyVersion, '>=3.0.0')) {
-    return
-  }
-
   shim.wrap(fastify, 'use', function wrapFastifyUse(shim, fn) {
     return function wrappedFastifyUser() {
       const args = shim.argsToArray.apply(shim, arguments)
@@ -65,10 +64,14 @@ module.exports = function initialize(agent, fastify, moduleName, shim) {
     return
   }
   shim.setFramework(shim.FASTIFY)
+
+  const fastifyVersion = shim.require('./package.json').version
+  const isv3Plus = semver.satisfies(fastifyVersion, '>=3.0.0')
+
   /**
    * Fastify exports a function, so we need to use wrapExport
    */
-  shim.wrapExport(fastify, function wrapFastifyModule(shim, fn) {
+  const wrappedExport = shim.wrapExport(fastify, function wrapFastifyModule(shim, fn) {
     return function wrappedFastifyModule() {
       // normalize arguments
       const args = shim.argsToArray.apply(shim, arguments)
@@ -78,9 +81,33 @@ module.exports = function initialize(agent, fastify, moduleName, shim) {
 
       setupRouteHandler(shim, fastifyForWrapping)
 
-      setupMiddlewareHandlers(shim, fastifyForWrapping)
+      // Don't wrap use() in fastify v3+
+      if (!isv3Plus) {
+        setupMiddlewareHandlers(shim, fastifyForWrapping)
+      }
 
       return fastifyForWrapping
     }
   })
+
+  if (isv3Plus) {
+    setupExports(fastify, wrappedExport)
+  }
+}
+
+/**
+ * module.exports = fastify
+ * module.exports.fastify = fastify
+ * module.exports.default = fastify
+ */
+function setupExports(original, wrappedExport) {
+  wrappedExport.fastify = original.fastify
+
+  if (original.fastify) {
+    wrappedExport.fastify = wrappedExport
+  }
+
+  if (original.default) {
+    wrappedExport.default = wrappedExport
+  }
 }

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

@@ -13,7 +13,7 @@ module.exports = function initialize(agent, hapi, moduleName, shim) {
   // At this point, framework and error predicate have both already been set via ./hapi,
   // so we only need to set the response predicate and wrap the server object
   shim.setResponsePredicate(function hapiResponsePredicate(args, result) {
-    return !(result instanceof Error) && (result !== args[1].continue)
+    return !(result instanceof Error) && result !== args[1].continue
   })
 
   // 'Server' and 'server' both point to the same export,
@@ -61,9 +61,7 @@ function serverPostConstructor(shim) {
         function wrappedHandler(route) {
           var ret = fn.apply(this, arguments)
 
-          return (typeof ret === 'function')
-            ? wrapRouteHandler(shim, ret, route && route.path)
-            : ret
+          return typeof ret === 'function' ? wrapRouteHandler(shim, ret, route && route.path) : ret
         }
       })
 
@@ -80,11 +78,12 @@ function serverPostConstructor(shim) {
       }
 
       // If route is created via a plugin, pull prefix if it exists
-      const prefix = this.realm
-        && this.realm.modifiers
-        && this.realm.modifiers.route
-        && this.realm.modifiers.route.prefix
-        || ''
+      const prefix =
+        (this.realm &&
+          this.realm.modifiers &&
+          this.realm.modifiers.route &&
+          this.realm.modifiers.route.prefix) ||
+        ''
 
       _wrapRoute(shim, args[0])
 
@@ -170,7 +169,7 @@ function wrapPreHandlers(shim, container, path) {
 
 function wrapPreHandler(shim, container, path) {
   return shim.record(container, (shim) => {
-    return {name: [shim.HAPI, ' pre handler: ','(',path,')'].join(''), recorder: record}
+    return { name: [shim.HAPI, ' pre handler: ', '(', path, ')'].join(''), recorder: record }
   })
 }
 

package/lib/instrumentation/hapi.js

@@ -7,19 +7,19 @@
 
 var shared = require('./hapi/shared')
 
-
 module.exports = function initialize(agent, hapi, moduleName, shim) {
   if (!agent || !hapi || !shim) {
-    shim && shim.logger.debug(
-      'Hapi instrumentation function called with incorrect arguments, not instrumenting.'
-    )
+    shim &&
+      shim.logger.debug(
+        'Hapi instrumentation function called with incorrect arguments, not instrumenting.'
+      )
     return false
   }
 
   shim.setFramework(shim.HAPI)
 
   shim.setErrorPredicate(function hapiErrorPredicate(err) {
-    return (err instanceof Error)
+    return err instanceof Error
   })
 
   if (hapi.createServer) {
@@ -83,11 +83,12 @@ function wrapServer(shim, Server) {
       }
 
       // If route is created via a plugin, pull prefix if it exists
-      const prefix = this.realm
-        && this.realm.modifiers
-        && this.realm.modifiers.route
-        && this.realm.modifiers.route.prefix
-        || ''
+      const prefix =
+        (this.realm &&
+          this.realm.modifiers &&
+          this.realm.modifiers.route &&
+          this.realm.modifiers.route.prefix) ||
+        ''
 
       _wrapRoute(shim, args[0])
 
@@ -185,10 +186,7 @@ function wrapRouteHandler(shim, container, path) {
   }
 
   function _wrapRouteHandler(handler) {
-    return shim.recordMiddleware(
-      wrapHapiHandler(shim, handler),
-      buildMiddlewareSpec(shim, path)
-    )
+    return shim.recordMiddleware(wrapHapiHandler(shim, handler), buildMiddlewareSpec(shim, path))
   }
 }
 
@@ -237,7 +235,9 @@ function wrapMiddleware(shim, middleware, event) {
     type: event === 'onPreResponse' ? shim.ERRORWARE : shim.MIDDLEWARE,
     next: function wrapNext(shim, fn, fnName, args, wrap) {
       var reply = args[1]
-      if (!reply || !shim.isFunction(reply.continue)) return
+      if (!reply || !shim.isFunction(reply.continue)) {
+        return
+      }
       wrap(reply, 'continue')
     },
     req: function getReq(shim, fn, fnName, args) {

package/lib/instrumentation/ioredis.js

@@ -8,7 +8,6 @@
 var stringify = require('json-stringify-safe')
 var urltils = require('../util/urltils.js')
 
-
 module.exports = function initialize(agent, redis, moduleName, shim) {
   var proto = redis && redis.prototype
   if (!proto) {
@@ -40,7 +39,7 @@ module.exports = function initialize(agent, redis, moduleName, shim) {
     }
 
     return {
-      name: (command.name || 'unknown'),
+      name: command.name || 'unknown',
       parameters: parameters,
       promise: true
     }