newrelic 8.3.0 → 8.5.2

package/lib/metrics/normalizer.js

@@ -5,12 +5,12 @@
 
 'use strict'
 
-var EventEmitter = require('events').EventEmitter
-var util = require('util')
-var logger = require('../logger').child({ component: 'metric_normalizer' })
-var deepEqual = require('../util/deep-equal')
-var NormalizerRule = require('./normalizer/rule')
-var NAMES = require('../metrics/names.js')
+const EventEmitter = require('events').EventEmitter
+const util = require('util')
+const logger = require('../logger').child({ component: 'metric_normalizer' })
+const deepEqual = require('../util/deep-equal')
+const NormalizerRule = require('./normalizer/rule')
+const NAMES = require('../metrics/names.js')
 
 function url(normalized, path, config) {
   if (normalized) {
@@ -91,7 +91,7 @@ MetricNormalizer.prototype.load = function load(json) {
 
     json.forEach((ruleJSON) => {
       // no need to add the same rule twice
-      var rule = new NormalizerRule(ruleJSON)
+      const rule = new NormalizerRule(ruleJSON)
       if (!this.rules.find(deepEqual.bind(null, rule))) {
         this.rules.push(rule)
         logger.trace('Loaded %s normalization rule: %s', this.type, rule)
@@ -115,7 +115,7 @@ MetricNormalizer.prototype.load = function load(json) {
  * Operates via side effects.
  */
 MetricNormalizer.prototype.loadFromConfig = function loadFromConfig() {
-  var rules = this.config.rules
+  const rules = this.config.rules
 
   if (rules && rules.name && rules.name.length > 0) {
     rules.name.forEach((rule) => {
@@ -126,9 +126,9 @@ MetricNormalizer.prototype.loadFromConfig = function loadFromConfig() {
         return logger.error({ rule: rule }, 'Simple naming rules require a replacement name.')
       }
 
-      var precedence = rule.precedence
-      var terminal = rule.terminate_chain
-      var json = {
+      const precedence = rule.precedence
+      const terminal = rule.terminate_chain
+      const json = {
         match_expression: rule.pattern,
         eval_order: typeof precedence === 'number' ? precedence : 500,
         terminate_chain: typeof terminal === 'boolean' ? terminal : true,
@@ -138,8 +138,8 @@ MetricNormalizer.prototype.loadFromConfig = function loadFromConfig() {
       }
 
       // Find where the rule should be inserted and do so.
-      var reverse = this.config.feature_flag.reverse_naming_rules
-      var insert = this.rules.findIndex(function findRule(r) {
+      const reverse = this.config.feature_flag.reverse_naming_rules
+      const insert = this.rules.findIndex(function findRule(r) {
         return reverse ? r.precedence >= json.eval_order : r.precedence > json.eval_order
       })
       if (insert === -1) {
@@ -174,7 +174,7 @@ MetricNormalizer.prototype.addSimple = function addSimple(pattern, name) {
     return logger.error('Simple naming rules require a pattern.')
   }
 
-  var json = {
+  const json = {
     match_expression: pattern,
     eval_order: 0,
     terminate_chain: true,
@@ -200,16 +200,16 @@ MetricNormalizer.prototype.addSimple = function addSimple(pattern, name) {
  * @returns {NormalizationResults} - The results of normalization.
  */
 MetricNormalizer.prototype.normalize = function normalize(path) {
-  var last = path
-  var length = this.rules.length
-  var normalized
-  var matched = false
-  var ignored = false
+  let last = path
+  const length = this.rules.length
+  let normalized
+  let matched = false
+  let ignored = false
 
   // Apply each of our rules in turn.
-  for (var i = 0; i < length; i++) {
-    var rule = this.rules[i]
-    var applied = rule.apply(last)
+  for (let i = 0; i < length; i++) {
+    const rule = this.rules[i]
+    const applied = rule.apply(last)
     if (!rule.matched) {
       continue
     }

package/lib/metrics/recorders/custom.js

@@ -5,13 +5,13 @@
 
 'use strict'
 
-var NAMES = require('../names')
+const NAMES = require('../names')
 
 function record(segment, scope) {
-  var duration = segment.getDurationInMillis()
-  var exclusive = segment.getExclusiveDurationInMillis()
-  var transaction = segment.transaction
-  var name = NAMES.CUSTOM + NAMES.ACTION_DELIMITER + segment.name
+  const duration = segment.getDurationInMillis()
+  const exclusive = segment.getExclusiveDurationInMillis()
+  const transaction = segment.transaction
+  const name = NAMES.CUSTOM + NAMES.ACTION_DELIMITER + segment.name
 
   if (scope) {
     transaction.measure(name, scope, duration, exclusive)

package/lib/metrics/recorders/generic.js

@@ -6,9 +6,9 @@
 'use strict'
 
 function record(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(segment.name, scope, duration, exclusive)

package/lib/metrics/recorders/http.js

@@ -16,19 +16,19 @@ function recordWeb(segment, scope) {
     return
   }
 
-  var tx = segment.transaction
+  const tx = segment.transaction
   // if there was a nested webTransaction use its recorder instead
   if (tx.type === 'web' && tx.baseSegment && segment !== tx.baseSegment) {
     return
   }
 
-  var duration = segment.getDurationInMillis()
-  var totalTime = tx.trace.getTotalTimeDurationInMillis()
-  var exclusive = segment.getExclusiveDurationInMillis()
-  var partial = segment.partialName
-  var config = segment.transaction.agent.config
+  const duration = segment.getDurationInMillis()
+  const totalTime = tx.trace.getTotalTimeDurationInMillis()
+  const exclusive = segment.getExclusiveDurationInMillis()
+  const partial = segment.partialName
+  const config = segment.transaction.agent.config
   // named / key transaction support requires per-name apdexT
-  var keyApdexInMillis = config.web_transactions_apdex[scope] * TO_MILLIS || 0
+  const keyApdexInMillis = config.web_transactions_apdex[scope] * TO_MILLIS || 0
 
   tx.measure(NAMES.WEB.RESPONSE_TIME, null, duration, exclusive)
   tx.measure(NAMES.WEB.TOTAL_TIME, null, totalTime, exclusive)

package/lib/metrics/recorders/http_external.js

@@ -5,16 +5,16 @@
 
 'use strict'
 
-var EXTERNAL = require('../../metrics/names').EXTERNAL
+const EXTERNAL = require('../../metrics/names').EXTERNAL
 
 function recordExternal(host, library) {
   return function externalRecorder(segment, scope) {
-    var duration = segment.getDurationInMillis()
-    var exclusive = segment.getExclusiveDurationInMillis()
-    var transaction = segment.transaction
-    var metricName = EXTERNAL.PREFIX + host + '/' + library
-    var rollupType = transaction.isWeb() ? EXTERNAL.WEB : EXTERNAL.OTHER
-    var rollupHost = EXTERNAL.PREFIX + host + '/all'
+    const duration = segment.getDurationInMillis()
+    const exclusive = segment.getExclusiveDurationInMillis()
+    const transaction = segment.transaction
+    const metricName = EXTERNAL.PREFIX + host + '/' + library
+    const rollupType = transaction.isWeb() ? EXTERNAL.WEB : EXTERNAL.OTHER
+    const rollupHost = EXTERNAL.PREFIX + host + '/all'
 
     if (segment.catId && segment.catTransaction) {
       transaction.measure(

package/lib/metrics/recorders/message-transaction.js

@@ -5,19 +5,18 @@
 
 'use strict'
 
-var NAMES = require('../../metrics/names.js')
+const NAMES = require('../../metrics/names.js')
 
 function recordMessageTransaction(segment, scope) {
-  var tx = segment.transaction
+  const tx = segment.transaction
   if (tx.type !== 'message' || tx.baseSegment !== segment) {
     return
   }
 
-  var duration = segment.getDurationInMillis()
-  var exclusive = segment.getExclusiveDurationInMillis()
-  var totalTime = segment.transaction.trace.getTotalTimeDurationInMillis()
+  const duration = segment.getDurationInMillis()
+  const exclusive = segment.getExclusiveDurationInMillis()
+  const totalTime = segment.transaction.trace.getTotalTimeDurationInMillis()
 
-  var tx = segment.transaction
   if (scope) {
     tx.measure(scope, null, duration, exclusive)
     tx.measure(

package/lib/metrics/recorders/other.js

@@ -10,15 +10,15 @@ const recordDistributedTrace = require('./distributed-trace')
 
 function recordBackground(segment, scope) {
   // if there was a nested otherTransaction use its recorder instead
-  var tx = segment.transaction
+  const tx = segment.transaction
   if (tx.type === 'bg' && tx.baseSegment && segment !== tx.baseSegment) {
     return
   }
 
-  var duration = segment.getDurationInMillis()
-  var exclusive = segment.getExclusiveDurationInMillis()
-  var totalTime = segment.transaction.trace.getTotalTimeDurationInMillis()
-  var name = segment.partialName
+  const duration = segment.getDurationInMillis()
+  const exclusive = segment.getExclusiveDurationInMillis()
+  const totalTime = segment.transaction.trace.getTotalTimeDurationInMillis()
+  const name = segment.partialName
 
   if (scope) {
     tx.measure(scope, null, duration, exclusive)

package/lib/parse-proc-cpuinfo.js

@@ -5,26 +5,32 @@
 
 'use strict'
 
-var logger = require('./logger.js').child({ component: 'proc-cpuinfo' })
+const logger = require('./logger.js').child({ component: 'proc-cpuinfo' })
 module.exports = parseProcCPUInfo
 
 function parseProcCPUInfo(data) {
-  var relevantAttributes = ['processor', 'physical id', 'cpu cores', 'core id']
+  const relevantAttributes = ['processor', 'physical id', 'cpu cores', 'core id']
 
-  var processorStats = {
+  let processorStats = {
     logical: null,
     cores: null,
     packages: null
   }
 
+  // In some rare cases the OS may be locked down so that you cannot retrieve this info.
+  if (!data) {
+    logger.debug('No CPU data to parse, returning empty stats.')
+    return processorStats
+  }
+
   // separate the processors
-  var splitData = data.split('\n').map(function formatAttribute(attr) {
+  let splitData = data.split('\n').map(function formatAttribute(attr) {
     return attr.split(':').map(function eliminateExtraWhitespace(s) {
       return s.replace(/\\r|\\t| {2,}/g, '').trim()
     })
   })
 
-  var validData = splitData.filter(function checkForValidAttrs(a) {
+  const validData = splitData.filter(function checkForValidAttrs(a) {
     return a.length === 2 && relevantAttributes.indexOf(a[0]) !== -1
   })
   if (validData.length === 0) {
@@ -34,7 +40,7 @@ function parseProcCPUInfo(data) {
 
   splitData = collapseMultilineValues(splitData)
 
-  var processors = seperateProcessors(splitData)
+  const processors = separateProcessors(splitData)
 
   processorStats = countProcessorStats(processors)
   if (!processorStats.cores) {
@@ -56,9 +62,9 @@ function parseProcCPUInfo(data) {
 // some values are split up over multiple lines, these won't be broken
 // by split(':'), and should be folded into the last seen valid value
 function collapseMultilineValues(li) {
-  var tmp = []
-  var last
-  for (var i = 0; i < li.length; ++i) {
+  const tmp = []
+  let last
+  for (let i = 0; i < li.length; ++i) {
     if (li[i].length === 2) {
       // store the last valid entry to append invalid entries to
       last = li[i]
@@ -73,12 +79,12 @@ function collapseMultilineValues(li) {
 
 // walk through the processed list of key, value pairs and populate
 // objects till you find a collision
-function seperateProcessors(processorData) {
-  var processors = []
-  var processor = Object.create(null)
-  for (var i = 0; i < processorData.length; ++i) {
-    var key = processorData[i][0]
-    var value = processorData[i][1]
+function separateProcessors(processorData) {
+  const processors = []
+  let processor = Object.create(null)
+  for (let i = 0; i < processorData.length; ++i) {
+    const key = processorData[i][0]
+    const value = processorData[i][1]
     if (processor[key] !== undefined) {
       processors.push(processor)
       processor = Object.create(null)
@@ -90,11 +96,11 @@ function seperateProcessors(processorData) {
 }
 
 function countProcessorStats(processors) {
-  var phys = []
-  var cores = []
+  const phys = []
+  const cores = []
 
-  for (var i = 0; i < processors.length; i++) {
-    var processor = processors[i]
+  for (let i = 0; i < processors.length; i++) {
+    const processor = processors[i]
     if (
       processor['physical id'] &&
       processor['cpu cores'] &&

package/lib/parse-proc-meminfo.js

@@ -5,12 +5,18 @@
 
 'use strict'
 
-var logger = require('./logger.js').child({ component: 'proc-meminfo' })
+const logger = require('./logger.js').child({ component: 'proc-meminfo' })
 
 module.exports = parseProcMeminfo
 
 function parseProcMeminfo(data) {
-  var memTotal = parseInt(data.replace(/MemTotal:\s*(\d*)\skB/, '$1'), 10)
+  // In some rare cases the OS may be locked down so that you cannot retrieve this info.
+  if (!data) {
+    logger.debug('No memory data to parse.')
+    return null
+  }
+
+  const memTotal = parseInt(data.replace(/MemTotal:\s*(\d*)\skB/, '$1'), 10)
 
   if (memTotal) {
     return memTotal / 1024

package/lib/prioritized-attributes.js

@@ -35,7 +35,7 @@ class PrioritizedAttributes {
   get(dest) {
     const attrs = Object.create(null)
 
-    for (let [key, attr] of this.attributes) {
+    for (const [key, attr] of this.attributes) {
       if (!(attr.destinations & dest)) {
         continue
       }
@@ -127,7 +127,7 @@ class PrioritizedAttributes {
   }
 
   addAttributes(destinations, attrs) {
-    for (let key in attrs) {
+    for (const key in attrs) {
       if (properties.hasOwn(attrs, key)) {
         this.addAttribute(destinations, key, attrs[key])
       }

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,7 +61,7 @@ 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 })
@@ -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/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,7 +29,7 @@ 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))
+    const toReplace = Math.floor(Math.random() * (this.seen + 2))
     if (toReplace < this.limit) {
       this._data[toReplace] = item
     }
@@ -48,7 +48,7 @@ Reservoir.prototype.merge = function merge(items) {
   if (items === this._data) {
     return
   }
-  for (var i = 0; i < items.length; i++) {
+  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,
@@ -206,7 +206,7 @@ var sampler = (module.exports = {
       logger.debug('Not adding CPU metric sampler.')
     }
 
-    sampler.state = 'running'
+    this.state = 'running'
   },
 
   stop: function stop() {
@@ -214,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()
@@ -224,16 +224,16 @@ var sampler = (module.exports = {
       this.nativeMetrics = null
     }
   }
-})
+}
 
 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)
 }

package/lib/serverless/aws-lambda.js

@@ -82,8 +82,14 @@ class AwsLambda {
       // NOTE: This may be converted to holding onto a single ender function if only
       // one invocation is executing at a time.
       shim.wrap(process, 'emit', function wrapEmit(shim, emit) {
-        return function wrappedEmit(ev) {
-          if (ev === 'beforeExit') {
+        return function wrappedEmit(ev, error) {
+          // need to add error as uncaughtException to be used
+          // later to add to transaction errors
+          if (ev === 'unhandledRejection') {
+            uncaughtException = error
+          }
+
+          if (['beforeExit', 'unhandledRejection'].includes(ev)) {
             transactionEnders.forEach((ender) => {
               ender()
             })