newrelic 8.0.0 → 8.4.0

package/lib/priority-queue.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var Heap = require('@tyriar/fibonacci-heap').FibonacciHeap
+const Heap = require('@tyriar/fibonacci-heap').FibonacciHeap
 
 function PriorityQueue(limit) {
   this.limit = limit == null ? 10 : limit
@@ -20,7 +20,7 @@ function PriorityQueue(limit) {
 }
 
 PriorityQueue.prototype.overflow = function overflow() {
-  var diff = this.seen - this.limit
+  const diff = this.seen - this.limit
   return diff >= 0 ? diff : 0
 }
 
@@ -51,8 +51,8 @@ PriorityQueue.prototype._replace = function _replace(value, priority) {
 }
 
 PriorityQueue.prototype.getRawEvents = function getRawEvents() {
-  var events = []
-  var min = this._data.findMinimum()
+  const events = []
+  const min = this._data.findMinimum()
 
   if (min) {
     _getRawEvents(min, events)
@@ -61,10 +61,10 @@ PriorityQueue.prototype.getRawEvents = function getRawEvents() {
   return events
 
   function _getRawEvents(head, evts) {
-    var current = head
+    let current = head
 
     do {
-      evts.push({value: current.value, priority: current.key})
+      evts.push({ value: current.value, priority: current.key })
       if (current.child) {
         _getRawEvents(current.child, evts)
       }
@@ -74,8 +74,8 @@ PriorityQueue.prototype.getRawEvents = function getRawEvents() {
 }
 
 PriorityQueue.prototype.toArray = function toArray() {
-  var nodes = []
-  var min = this._data.findMinimum()
+  const nodes = []
+  const min = this._data.findMinimum()
 
   if (min) {
     serializeHeap(min, nodes)
@@ -84,7 +84,7 @@ PriorityQueue.prototype.toArray = function toArray() {
   return nodes
 
   function serializeHeap(head, arr) {
-    var current = head
+    let current = head
 
     do {
       arr.push(current.value)
@@ -110,11 +110,11 @@ PriorityQueue.prototype.merge = function merge(events) {
 
   if (events instanceof PriorityQueue) {
     while (events.length) {
-      var current = events._data.extractMinimum()
+      const current = events._data.extractMinimum()
       this.add(current.value, current.key)
     }
   } else {
-    for (var i = 0; i < events.length; ++i) {
+    for (let i = 0; i < events.length; ++i) {
       this.add(events[i].value, events[i].priority)
     }
   }

package/lib/proxy/grpc.js

@@ -17,4 +17,4 @@ class ProxyGrpc {
     this.ServerCredentials = this.library.ServerCredentials
   }
 }
-module.exports = (new ProxyGrpc)
+module.exports = new ProxyGrpc()

package/lib/reservoir.js

@@ -14,7 +14,7 @@ function Reservoir(limit) {
 }
 
 Reservoir.prototype.overflow = function overflow() {
-  var diff = this.seen - this.limit
+  const diff = this.seen - this.limit
   return diff >= 0 ? diff : 0
 }
 
@@ -29,8 +29,10 @@ Reservoir.prototype.add = function add(item) {
     // This is effectively the same as adding the new element to the
     // end, swapping the last element (the new one) with a random element in the list,
     // then dropping the last element (the potentially swapped one) in the list.
-    var toReplace = Math.floor(Math.random() * (this.seen + 2))
-    if (toReplace < this.limit) this._data[toReplace] = item
+    const toReplace = Math.floor(Math.random() * (this.seen + 2))
+    if (toReplace < this.limit) {
+      this._data[toReplace] = item
+    }
   }
   this.seen++
 }
@@ -40,9 +42,13 @@ Reservoir.prototype.toArray = function toArray() {
 }
 
 Reservoir.prototype.merge = function merge(items) {
-  if (!items || !items.length) return
-  if (items === this._data) return
-  for (var i = 0; i < items.length; i++) {
+  if (!items || !items.length) {
+    return
+  }
+  if (items === this._data) {
+    return
+  }
+  for (let i = 0; i < items.length; i++) {
     this.add(items[i])
   }
 }

package/lib/sampler.js

@@ -5,22 +5,22 @@
 
 'use strict'
 
-var NAMES = require('./metrics/names')
-var logger = require('./logger').child({component: 'sampler'})
-var Timer = require('./timer')
-var os = require('os')
+const NAMES = require('./metrics/names')
+const logger = require('./logger').child({ component: 'sampler' })
+const Timer = require('./timer')
+const os = require('os')
 
 /*
  *
  * CONSTANTS
  *
  */
-var MILLIS = 1e3
-var MICROS = 1e6
-var CPUS = os.cpus().length
-var SAMPLE_INTERVAL = 15 * MILLIS
+const MILLIS = 1e3
+const MICROS = 1e6
+const CPUS = os.cpus().length
+const SAMPLE_INTERVAL = 15 * MILLIS
 
-var samplers = []
+let samplers = []
 
 function Sampler(sampler, interval) {
   this.id = setInterval(sampler, interval)
@@ -39,7 +39,7 @@ function recordQueueTime(agent, timer) {
 function sampleMemory(agent) {
   return function memorySampler() {
     try {
-      var mem = process.memoryUsage()
+      const mem = process.memoryUsage()
       agent.metrics.measureBytes(NAMES.MEMORY.PHYSICAL, mem.rss)
       agent.metrics.measureBytes(NAMES.MEMORY.USED_HEAP, mem.heapUsed)
       agent.metrics.measureBytes(NAMES.MEMORY.MAX_HEAP, mem.heapTotal)
@@ -54,7 +54,7 @@ function sampleMemory(agent) {
 
 function checkEvents(agent) {
   return function eventSampler() {
-    var timer = new Timer()
+    const timer = new Timer()
     timer.begin()
     setTimeout(recordQueueTime.bind(null, agent, timer), 0)
   }
@@ -70,22 +70,22 @@ function getCpuSample(lastSample) {
 }
 
 function generateCPUMetricRecorder(agent) {
-  var lastSampleTime
+  let lastSampleTime
   // userTime and sysTime are in seconds
   return function recordCPUMetrics(userTime, sysTime) {
-    var elapsedUptime
+    let elapsedUptime
     if (!lastSampleTime) {
       elapsedUptime = process.uptime()
     } else {
       elapsedUptime = (Date.now() - lastSampleTime) / MILLIS
     }
 
-    var totalCpuTime = CPUS * elapsedUptime
+    const totalCpuTime = CPUS * elapsedUptime
 
     lastSampleTime = Date.now()
 
-    var userUtil = userTime / totalCpuTime
-    var sysUtil  = sysTime / totalCpuTime
+    const userUtil = userTime / totalCpuTime
+    const sysUtil = sysTime / totalCpuTime
 
     recordValue(agent, NAMES.CPU.USER_TIME, userTime)
     recordValue(agent, NAMES.CPU.SYSTEM_TIME, sysTime)
@@ -95,10 +95,10 @@ function generateCPUMetricRecorder(agent) {
 }
 
 function sampleCpu(agent) {
-  var lastSample
-  var recordCPU = generateCPUMetricRecorder(agent)
+  let lastSample
+  const recordCPU = generateCPUMetricRecorder(agent)
   return function cpuSampler() {
-    var cpuSample = getCpuSample(lastSample)
+    const cpuSample = getCpuSample(lastSample)
     lastSample = getCpuSample()
 
     if (lastSample == null) {
@@ -110,7 +110,7 @@ function sampleCpu(agent) {
 }
 
 function sampleCpuNative(agent, nativeMetrics) {
-  var recordCPU = generateCPUMetricRecorder(agent)
+  const recordCPU = generateCPUMetricRecorder(agent)
   nativeMetrics.on('usage', function collectResourceUsage(usage) {
     recordCPU(usage.diff.ru_utime / MILLIS, usage.diff.ru_stime / MILLIS)
   })
@@ -149,7 +149,7 @@ function sampleGc(agent, nativeMetrics) {
   }
 }
 
-var sampler = module.exports = {
+module.exports = {
   state: 'stopped',
   sampleMemory: sampleMemory,
   checkEvents: checkEvents,
@@ -170,12 +170,12 @@ var sampler = module.exports = {
         })
       } catch (err) {
         logger.info(
-          {error: {message: err.message, stack: err.stack}},
+          { error: { message: err.message, stack: err.stack } },
           'Not adding native metric sampler.'
         )
-        agent.metrics.getOrCreateMetric(
-          NAMES.SUPPORTABILITY.DEPENDENCIES + '/NoNativeMetricsModule'
-        ).incrementCallCount()
+        agent.metrics
+          .getOrCreateMetric(NAMES.SUPPORTABILITY.DEPENDENCIES + '/NoNativeMetricsModule')
+          .incrementCallCount()
       }
     }
 
@@ -197,17 +197,16 @@ var sampler = module.exports = {
 
     // Add CPU sampling using the built-in data if available, otherwise pulling
     // from the native module.
-    if (process.cpuUsage) { // introduced in 6.1.0
+    if (process.cpuUsage) {
+      // introduced in 6.1.0
       samplers.push(new Sampler(sampleCpu(agent), SAMPLE_INTERVAL))
     } else if (this.nativeMetrics && this.nativeMetrics.usageEnabled) {
-      samplers.push(
-        new Sampler(sampleCpuNative(agent, this.nativeMetrics), SAMPLE_INTERVAL)
-      )
+      samplers.push(new Sampler(sampleCpuNative(agent, this.nativeMetrics), SAMPLE_INTERVAL))
     } else {
       logger.debug('Not adding CPU metric sampler.')
     }
 
-    sampler.state = 'running'
+    this.state = 'running'
   },
 
   stop: function stop() {
@@ -215,7 +214,7 @@ var sampler = module.exports = {
       s.stop()
     })
     samplers = []
-    sampler.state = 'stopped'
+    this.state = 'stopped'
     if (this.nativeMetrics) {
       this.nativeMetrics.unbind()
       this.nativeMetrics.removeAllListeners()
@@ -228,13 +227,13 @@ var sampler = module.exports = {
 }
 
 function recordValue(agent, metric, value) {
-  var stats = agent.metrics.getOrCreateMetric(metric)
+  const stats = agent.metrics.getOrCreateMetric(metric)
   stats.recordValue(value)
   logger.trace('Recorded metric %s: %j', metric, value)
 }
 
 function recordCompleteMetric(agent, metricName, metric) {
-  var stats = agent.metrics.getOrCreateMetric(metricName)
+  const stats = agent.metrics.getOrCreateMetric(metricName)
   stats.merge(metric)
   logger.trace('Recorded metric %s: %j', metricName, metric)
 }
@@ -243,5 +242,5 @@ function divideMetric(metric, divisor) {
   metric.min /= divisor
   metric.max /= divisor
   metric.total /= divisor
-  metric.sumOfSquares /= (divisor * divisor)
+  metric.sumOfSquares /= divisor * divisor
 }

package/lib/serverless/api-gateway.js

@@ -14,9 +14,9 @@ class LambdaProxyWebRequest {
   constructor(event) {
     this.headers = event.headers
     this.url = {
-      'path': event.path,
-      'port': event.headers['X-Forwarded-Port'],
-      'requestParameters': event.queryStringParameters
+      path: event.path,
+      port: event.headers['X-Forwarded-Port'],
+      requestParameters: event.queryStringParameters
     }
     this.method = event.httpMethod
     this.transportType = event.headers['X-Forwarded-Proto']

package/lib/serverless/aws-lambda.js

@@ -8,7 +8,7 @@
 const apiGateway = require('./api-gateway')
 const headerAttributes = require('../header-attributes')
 const get = require('../util/get')
-const logger = require('../logger').child({component: 'aws-lambda'})
+const logger = require('../logger').child({ component: 'aws-lambda' })
 const recordBackground = require('../metrics/recorders/other')
 const recordWeb = require('../metrics/recorders/http')
 const TransactionShim = require('../shim/transaction-shim')
@@ -106,7 +106,7 @@ class AwsLambda {
       })
     }
 
-    return shim.bindCreateTransaction(wrappedHandler, {type: shim.BG})
+    return shim.bindCreateTransaction(wrappedHandler, { type: shim.BG })
 
     function wrappedHandler() {
       const args = shim.argsToArray.apply(shim, arguments)
@@ -138,17 +138,12 @@ class AwsLambda {
         resultProcessor = getApiGatewayLambdaProxyResultProcessor(transaction)
       }
 
-
       const cbIndex = args.length - 1
 
       // Add transaction ending closure to the list of functions to be called on
       // beforeExit (i.e. in the case that context.{done,fail,succeed} or callback
       // were not called).
-      const txnEnder = endTransaction.bind(
-        null,
-        transaction,
-        transactionEnders.length
-      )
+      const txnEnder = endTransaction.bind(null, transaction, transactionEnders.length)
 
       transactionEnders.push(txnEnder)
 
@@ -171,10 +166,7 @@ class AwsLambda {
       })
 
       const awsAttributes = awsLambda._getAwsAgentAttributes(event, context)
-      transaction.trace.attributes.addAttributes(
-        ATTR_DEST.TRANS_COMMON,
-        awsAttributes
-      )
+      transaction.trace.attributes.addAttributes(ATTR_DEST.TRANS_COMMON, awsAttributes)
 
       shim.agent.setLambdaArn(context.invokedFunctionArn)
 
@@ -201,17 +193,20 @@ class AwsLambda {
     // we need to store the error in uncaughtException
     // otherwise the transaction will end before they are captured
     function lambdaInterceptPromise(prom, resultProcessor, cb) {
-      return prom.then(function onThen(arg) {
-        if (resultProcessor) {
-          resultProcessor(arg)
+      return prom.then(
+        function onThen(arg) {
+          if (resultProcessor) {
+            resultProcessor(arg)
+          }
+          cb()
+          return arg
+        },
+        function onCatch(err) {
+          uncaughtException = err
+          cb()
+          throw err // This is not our error, just rethrowing the promise rejection.
         }
-        cb()
-        return arg
-      }, function onCatch(err) {
-        uncaughtException = err
-        cb()
-        throw err // This is not our error, just rethrowing the promise rejection.
-      })
+      )
     }
 
     function wrapCallbackAndCaptureError(transaction, txnEnder, cb, processResult) {
@@ -285,8 +280,11 @@ function setEventSourceAttributes(event, attributes) {
   } else if (event.records && event.deliveryStreamArn) {
     // Kinesis Firehose
     attributes[EVENT_SOURCE_ARN_KEY] = event.deliveryStreamArn
-  } else if (event.requestContext && event.requestContext.elb &&
-    event.requestContext.elb.targetGroupArn) {
+  } else if (
+    event.requestContext &&
+    event.requestContext.elb &&
+    event.requestContext.elb.targetGroupArn
+  ) {
     attributes[EVENT_SOURCE_ARN_KEY] = event.requestContext.elb.targetGroupArn
   } else if (event.resources && event.resources[0]) {
     attributes[EVENT_SOURCE_ARN_KEY] = event.resources[0]
@@ -319,10 +317,7 @@ function setWebRequest(shim, transaction, request) {
     request.method
   )
 
-  segment.addSpanAttribute(
-    'request.method',
-    request.method
-  )
+  segment.addSpanAttribute('request.method', request.method)
 
   transaction.port = request.url.port
 
@@ -335,10 +330,7 @@ function setWebRequest(shim, transaction, request) {
     request.url.path
   )
 
-  segment.addSpanAttribute(
-    'request.uri',
-    request.url.path
-  )
+  segment.addSpanAttribute('request.uri', request.url.path)
 
   headerAttributes.collectRequestHeaders(request.headers, transaction)
 
@@ -351,11 +343,10 @@ function setWebRequest(shim, transaction, request) {
 }
 
 function lowercaseObjectKeys(original) {
-  const lowercaseObject = Object.keys(original)
-    .reduce((destination, key) => {
-      destination[key.toLowerCase()] = original[key]
-      return destination
-    }, {})
+  const lowercaseObject = Object.keys(original).reduce((destination, key) => {
+    destination[key.toLowerCase()] = original[key]
+    return destination
+  }, {})
 
   return lowercaseObject
 }

package/lib/shim/conglomerate-shim.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-const logger = require('../logger').child({component: 'ConglomerateShim'})
+const logger = require('../logger').child({ component: 'ConglomerateShim' })
 const Shim = require('./shim')
 
-const {MODULE_TYPE} = require('./constants')
+const { MODULE_TYPE } = require('./constants')
 const SHIM_CLASSES = {
   [MODULE_TYPE.GENERIC]: Shim,
   [MODULE_TYPE.DATASTORE]: require('./datastore-shim'),
@@ -27,7 +27,7 @@ const SHIM_CLASSES = {
 class ConglomerateShim extends Shim {
   constructor(agent, moduleName, resolvedName) {
     super(agent, moduleName, resolvedName)
-    this._logger = logger.child({module: moduleName})
+    this._logger = logger.child({ module: moduleName })
     this._resolvedName = resolvedName
   }
 
@@ -62,7 +62,7 @@ class ConglomerateShim extends Shim {
   makeSpecializedShim(type, submodule) {
     const ShimClass = SHIM_CLASSES[type]
     const shim = new ShimClass(this.agent, this.moduleName, this._resolvedName)
-    shim._logger = shim._logger.child({submodule})
+    shim._logger = shim._logger.child({ submodule })
     return shim
   }
 }