newrelic 8.3.0 → 8.5.2

package/lib/spans/span-event.js

@@ -274,7 +274,7 @@ function _truncate(val) {
 
 function _filterNulls(obj) {
   const out = Object.create(null)
-  for (let key in obj) {
+  for (const key in obj) {
     if (obj[key] != null) {
       out[key] = obj[key]
     }

package/lib/spans/streaming-span-attributes.js

@@ -55,7 +55,7 @@ class StreamingSpanAttributes {
       return
     }
 
-    for (let [key, value] of Object.entries(attributes)) {
+    for (const [key, value] of Object.entries(attributes)) {
       this.addAttribute(key, value)
     }
   }

package/lib/stats/apdex.js

@@ -10,7 +10,7 @@
  * CONSTANTS
  *
  */
-var FROM_MILLIS = 1e-3
+const FROM_MILLIS = 1e-3
 
 function ApdexStats(apdexT) {
   if (!apdexT && apdexT !== 0) {
@@ -24,7 +24,7 @@ function ApdexStats(apdexT) {
 }
 
 ApdexStats.prototype.recordValue = function recordValue(time, overrideApdex) {
-  var apdexT = overrideApdex || this.apdexT
+  const apdexT = overrideApdex || this.apdexT
   if (time <= apdexT) {
     ++this.satisfying
   } else if (time <= 4 * apdexT) {

package/lib/stats/index.js

@@ -10,8 +10,8 @@
  * CONSTANTS
  *
  */
-var BYTES_PER_MB = 1024 * 1024
-var FROM_MILLIS = 1e-3
+const BYTES_PER_MB = 1024 * 1024
+const FROM_MILLIS = 1e-3
 
 /**
  * Simple container for tracking running statistics for a metric.

package/lib/system-info.js

@@ -5,15 +5,15 @@
 
 'use strict'
 
-var exec = require('child_process').exec
-var readProc = require('./utilization/common').readProc
-var getBootId = require('./utilization/docker-info').getBootId
-var utilization = require('./utilization')
-var logger = require('./logger.js').child({ component: 'system-info' })
-var os = require('os')
-var parseCpuInfo = require('./parse-proc-cpuinfo')
-var parseMemInfo = require('./parse-proc-meminfo')
-var platform = os.platform()
+const exec = require('child_process').exec
+const readProc = require('./utilization/common').readProc
+const getBootId = require('./utilization/docker-info').getBootId
+const utilization = require('./utilization')
+const logger = require('./logger.js').child({ component: 'system-info' })
+const os = require('os')
+const parseCpuInfo = require('./parse-proc-cpuinfo')
+const parseMemInfo = require('./parse-proc-meminfo')
+const platform = os.platform()
 
 module.exports = fetchSystemInfo
 
@@ -22,19 +22,19 @@ function isInteger(i) {
 }
 
 function fetchSystemInfo(agent, callback) {
-  var config = agent.config
-  var systemInfo = {
+  const config = agent.config
+  const systemInfo = {
     processorArch: os.arch()
   }
 
-  var utilizationConfig = Object.create(null)
+  const utilizationConfig = Object.create(null)
   if (config.utilization) {
-    var configProcessors = config.utilization.logical_processors
-    var configRam = config.utilization.total_ram_mib
-    var configHostname = config.utilization.billing_hostname
+    const configProcessors = config.utilization.logical_processors
+    const configRam = config.utilization.total_ram_mib
+    const configHostname = config.utilization.billing_hostname
 
     if (configProcessors) {
-      var parsedConfigProcessors = parseFloat(configProcessors, 10)
+      const parsedConfigProcessors = parseFloat(configProcessors, 10)
       if (!isNaN(parsedConfigProcessors) && isInteger(parsedConfigProcessors)) {
         utilizationConfig.logical_processors = parsedConfigProcessors
       } else {
@@ -46,7 +46,7 @@ function fetchSystemInfo(agent, callback) {
     }
 
     if (configRam) {
-      var parsedConfigRam = parseFloat(configRam, 10)
+      const parsedConfigRam = parseFloat(configRam, 10)
       if (!isNaN(parsedConfigRam) && isInteger(parsedConfigRam)) {
         utilizationConfig.total_ram_mib = parsedConfigRam
       } else {
@@ -73,8 +73,8 @@ function fetchSystemInfo(agent, callback) {
     }
   }
 
-  var tasksDone = 0
-  var numTasks = 5
+  let tasksDone = 0
+  const numTasks = 5
   function finishedResponse() {
     if (++tasksDone === numTasks) {
       callback(null, systemInfo)
@@ -111,7 +111,7 @@ function fetchSystemInfo(agent, callback) {
 
 // placed on module for mocking purposes in tests
 module.exports._getProcessorStats = function getProcessorStats(callback) {
-  var processorStats = {
+  const processorStats = {
     logical: null,
     cores: null,
     packages: null
@@ -127,7 +127,7 @@ module.exports._getProcessorStats = function getProcessorStats(callback) {
             processorStats.cores = parseFloat(cores, 10)
             processorStats.packages = parseFloat(packages, 10)
 
-            for (var key in processorStats) {
+            for (const key in processorStats) {
               if (!processorStats[key] || !isInteger(processorStats[key])) {
                 processorStats[key] = null
               }
@@ -196,8 +196,8 @@ function getSysctlValue(names, callback) {
   if (!names) {
     return callback(null)
   }
-  var returned = false
-  var ran = 0
+  let returned = false
+  let ran = 0
   names.forEach(function sysctlName(name) {
     exec('sysctl -n ' + name, respond)
 

package/lib/timer.js

@@ -16,9 +16,9 @@
  *   are set, but the timer has not yet been harvested).
  * DEAD timer has been harvested and can only have its duration read.
  */
-var PENDING = 1
-var RUNNING = 2
-var STOPPED = 3
+const PENDING = 1
+const RUNNING = 2
+const STOPPED = 3
 
 function hrToMillis(hr) {
   // process.hrTime gives you [second, nanosecond] duration pairs
@@ -209,8 +209,8 @@ Timer.prototype.toRange = function toRange() {
  */
 Timer.prototype.startedRelativeTo = function startedRelativeTo(other) {
   if (this.hrstart && other.hrstart) {
-    var s = this.hrstart[0] - other.hrstart[0]
-    var ns = this.hrstart[1] - other.hrstart[1]
+    const s = this.hrstart[0] - other.hrstart[0]
+    const ns = this.hrstart[1] - other.hrstart[1]
 
     return hrToMillis([s, ns])
   }

package/lib/transaction/dt-payload.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var logger = require('../logger').child({ component: 'distributedTracePayload' })
+const logger = require('../logger').child({ component: 'distributedTracePayload' })
 
 const DT_VERSION_MAJOR = 0
 const DT_VERSION_MINOR = 1

package/lib/transaction/index.js

@@ -6,16 +6,16 @@
 'use strict'
 
 const errorHelper = require('../errors/helper')
-var hashes = require('../util/hashes')
-var logger = require('../logger').child({ component: 'transaction' })
-var Metrics = require('../metrics')
-var NAMES = require('../metrics/names')
-var NameState = require('./name-state')
-var props = require('../util/properties')
-var Timer = require('../timer')
-var Trace = require('./trace')
-var url = require('url')
-var urltils = require('../util/urltils')
+const hashes = require('../util/hashes')
+const logger = require('../logger').child({ component: 'transaction' })
+const Metrics = require('../metrics')
+const NAMES = require('../metrics/names')
+const NameState = require('./name-state')
+const props = require('../util/properties')
+const Timer = require('../timer')
+const Trace = require('./trace')
+const url = require('url')
+const urltils = require('../util/urltils')
 const TraceContext = require('./tracecontext').TraceContext
 
 /*
@@ -270,11 +270,11 @@ Transaction.prototype.getResponseTimeInMillis = function getResponseTimeInMillis
  */
 Transaction.prototype._runUserNamingRules = function _runUserNamingRules(requestUrl) {
   // 1. user normalization rules (set in configuration)
-  var normalized = this.agent.userNormalizer.normalize(requestUrl)
+  const normalized = this.agent.userNormalizer.normalize(requestUrl)
   if (normalized.matched) {
     // After applying user naming rule, apply server-side sent rules to
     // further squash possible MGIs
-    var serverNormalized = this.agent.urlNormalizer.normalize(normalized.value)
+    const serverNormalized = this.agent.urlNormalizer.normalize(normalized.value)
     if (serverNormalized.ignore) {
       normalized.ignore = true
     }
@@ -294,7 +294,7 @@ Transaction.prototype._runUserNamingRules = function _runUserNamingRules(request
  * @param {string} requestUrl - The URL to normalize and apply to this transaction.
  */
 Transaction.prototype.applyUserNamingRules = function applyUserNamingRules(requestUrl) {
-  var normalized = this._runUserNamingRules(requestUrl)
+  const normalized = this._runUserNamingRules(requestUrl)
   if (normalized.ignore) {
     this.ignore = normalized.ignore
   }
@@ -327,11 +327,11 @@ Transaction.prototype.setPartialName = function setPartialName(name) {
  */
 Transaction.prototype._partialNameFromUri = _partialNameFromUri
 function _partialNameFromUri(requestUrl, status) {
-  var scrubbedUrl = urltils.scrub(requestUrl)
+  const scrubbedUrl = urltils.scrub(requestUrl)
 
   // 0. If there is a name in the name-state stack, use it.
-  var partialName = this._partialName
-  var ignore = false
+  let partialName = this._partialName
+  let ignore = false
   if (!this.nameState.isEmpty()) {
     partialName = this.nameState.getFullName()
   }
@@ -343,7 +343,7 @@ function _partialNameFromUri(requestUrl, status) {
 
   // 2. user normalization rules (set in configuration) can override transaction
   // naming from API
-  var userNormalized = this._runUserNamingRules(scrubbedUrl)
+  const userNormalized = this._runUserNamingRules(scrubbedUrl)
   ignore = ignore || userNormalized.ignore
   if (userNormalized.matched) {
     partialName = userNormalized.value
@@ -358,7 +358,7 @@ function _partialNameFromUri(requestUrl, status) {
     if (statusName) {
       partialName = statusName
     } else {
-      var normalized = this.agent.urlNormalizer.normalize(scrubbedUrl)
+      const normalized = this.agent.urlNormalizer.normalize(scrubbedUrl)
       ignore = ignore || normalized.ignore
       partialName = normalized.value
     }
@@ -421,7 +421,7 @@ function finalizeNameFromUri(requestURL, statusCode) {
   this.statusCode = statusCode
 
   // Derive the name from the request URL.
-  var partialName = this._partialNameFromUri(requestURL, statusCode)
+  const partialName = this._partialNameFromUri(requestURL, statusCode)
   this._partialName = partialName.value
   if (partialName.ignore) {
     this.ignore = true
@@ -430,7 +430,7 @@ function finalizeNameFromUri(requestURL, statusCode) {
   // If a namestate stack exists, copy route parameters over to the trace.
   if (!this.nameState.isEmpty() && this.baseSegment) {
     this.nameState.forEachParams(function forEachRouteParams(params) {
-      for (var key in params) {
+      for (const key in params) {
         if (props.hasOwn(params, key)) {
           this.trace.attributes.addAttribute(DESTS.NONE, 'request.parameters.' + key, params[key])
 
@@ -450,8 +450,8 @@ function finalizeNameFromUri(requestURL, statusCode) {
   }
 
   // Apply transaction name normalization rules (sent by server) to full name.
-  var fullName = TYPE_METRICS[this.type] + '/' + this._partialName
-  var normalized = this.agent.transactionNameNormalizer.normalize(fullName)
+  const fullName = TYPE_METRICS[this.type] + '/' + this._partialName
+  const normalized = this.agent.transactionNameNormalizer.normalize(fullName)
   if (normalized.ignore) {
     this.ignore = true
   }
@@ -499,8 +499,8 @@ Transaction.prototype._copyNameToActiveSpan = function _copyNameToActiveSpan(nam
  */
 Transaction.prototype._markAsWeb = function _markAsWeb(rawURL) {
   // Because we are assured we have the URL here, lets grab query params.
-  var params = urltils.parseParameters(rawURL)
-  for (var key in params) {
+  const params = urltils.parseParameters(rawURL)
+  for (const key in params) {
     if (props.hasOwn(params, key)) {
       this.trace.attributes.addAttribute(DESTS.NONE, 'request.parameters.' + key, params[key])
 
@@ -539,11 +539,11 @@ Transaction.prototype.finalizeName = function finalizeName(name) {
     return
   }
 
-  var fullName = TYPE_METRICS[this.type] + '/' + this._partialName
+  const fullName = TYPE_METRICS[this.type] + '/' + this._partialName
 
   // Transaction normalizers run on the full metric name, not the user facing
   // transaction name.
-  var normalized = this.agent.transactionNameNormalizer.normalize(fullName)
+  const normalized = this.agent.transactionNameNormalizer.normalize(fullName)
   if (normalized.ignore) {
     this.ignore = true
   }
@@ -589,7 +589,7 @@ Transaction.prototype.getName = function getName() {
 }
 
 Transaction.prototype.getFullName = function getFullName() {
-  var name = null
+  let name = null
   if (this.forceName) {
     name = this.forceName
   } else if (this.name) {
@@ -601,7 +601,7 @@ Transaction.prototype.getFullName = function getFullName() {
   if (!name) {
     return null
   }
-  var fullName = TYPE_METRICS[this.type] + '/' + name
+  const fullName = TYPE_METRICS[this.type] + '/' + name
   return this.agent.transactionNameNormalizer.normalize(fullName).value
 }
 
@@ -635,7 +635,7 @@ Transaction.prototype.getScrubbedUrl = function getScrubbedUrl() {
     this.parsedUrl = url.parse(this.url)
   }
 
-  var scrubbedParsedUrl = Object.assign(Object.create(null), this.parsedUrl)
+  const scrubbedParsedUrl = Object.assign(Object.create(null), this.parsedUrl)
   scrubbedParsedUrl.search = null
   scrubbedParsedUrl.query = null
   scrubbedParsedUrl.href = null
@@ -670,8 +670,8 @@ Transaction.prototype.addRecorder = function addRecorder(recorder) {
  * and should be written to handle this.
  */
 Transaction.prototype.record = function record() {
-  var name = this.name
-  for (var i = 0, l = this._recorders.length; i < l; ++i) {
+  const name = this.name
+  for (let i = 0, l = this._recorders.length; i < l; ++i) {
     this._recorders[i](name)
   }
 }
@@ -700,7 +700,7 @@ Transaction.prototype.measure = function measure(name, scope, duration, exclusiv
  *                          (optional).
  */
 Transaction.prototype._setApdex = function _setApdex(name, duration, keyApdexInMillis) {
-  var apdexStats = this.metrics.getOrCreateApdexMetric(name, null, keyApdexInMillis)
+  const apdexStats = this.metrics.getOrCreateApdexMetric(name, null, keyApdexInMillis)
 
   // if we have an error-like status code, and all the errors are
   // expected, we know the status code was caused by an expected
@@ -744,13 +744,13 @@ Transaction.prototype.includesOutboundRequests = function includesOutboundReques
  * current path hash.
  */
 Transaction.prototype.alternatePathHashes = function alternatePathHashes() {
-  var curHash = hashes.calculatePathHash(
+  const curHash = hashes.calculatePathHash(
     this.agent.config.applications()[0],
     this.getFullName(),
     this.referringPathHash
   )
-  var altHashes = this.pathHashes.slice()
-  var curIndex = altHashes.indexOf(curHash)
+  const altHashes = this.pathHashes.slice()
+  const curIndex = altHashes.indexOf(curHash)
 
   if (curIndex !== -1) {
     altHashes.splice(curIndex, 1)
@@ -836,9 +836,9 @@ Transaction.prototype.hasIgnoredErrorStatusCode = function _hasIgnoredErrorStatu
  * considered to be an error.
  */
 Transaction.prototype.hasErrors = function _hasErrors() {
-  var isErroredTransaction = urltils.isError(this.agent.config, this.statusCode)
-  var transactionHasExceptions = this.exceptions.length > 0
-  var transactionHasuserErrors = this.userErrors.length > 0
+  const isErroredTransaction = urltils.isError(this.agent.config, this.statusCode)
+  const transactionHasExceptions = this.exceptions.length > 0
+  const transactionHasuserErrors = this.userErrors.length > 0
   return transactionHasExceptions || transactionHasuserErrors || isErroredTransaction
 }
 
@@ -867,7 +867,7 @@ Transaction.prototype.hasOnlyExpectedErrors = function hasOnlyExpectedErrors() {
  */
 Transaction.prototype.getIntrinsicAttributes = function getIntrinsicAttributes() {
   if (!this._intrinsicAttributes.totalTime) {
-    var config = this.agent.config
+    const config = this.agent.config
     this._intrinsicAttributes.totalTime = this.trace.getTotalTimeDurationInMillis() * FROM_MILLIS
 
     if (config.distributed_tracing.enabled) {
@@ -1295,7 +1295,7 @@ Transaction.prototype.addRequestParameters = addRequestParameters
  * @param {Object.<string, string>} requestParameters
  */
 function addRequestParameters(requestParameters) {
-  for (var key in requestParameters) {
+  for (const key in requestParameters) {
     if (props.hasOwn(requestParameters, key)) {
       this.trace.attributes.addAttribute(
         DESTS.NONE,

package/lib/transaction/name-state.js

@@ -5,11 +5,11 @@
 
 'use strict'
 
-var logger = require('../logger.js').child({ component: 'name-state' })
-var NAMES = require('../metrics/names')
+const logger = require('../logger.js').child({ component: 'name-state' })
+const NAMES = require('../metrics/names')
 
 // TODO: Figure out a way to phase out legacy transaction names.
-var LEGACY_NAMING = {
+const LEGACY_NAMING = {
   Custom: true,
 
   Connect: true,
@@ -107,7 +107,7 @@ NameState.prototype.isEmpty = function isEmpty() {
  */
 NameState.prototype.appendPath = function appendPath(path, params) {
   if (!this._frozen && path != null) {
-    var strPath = path instanceof RegExp ? path.source : String(path)
+    const strPath = path instanceof RegExp ? path.source : String(path)
     this.pathStack.push({ path: strPath, params: params || null })
 
     if (path !== '') {
@@ -141,7 +141,7 @@ NameState.prototype.popPath = function popPath(path) {
   }
 
   this._pathCache = null
-  var pops = 0
+  let pops = 0
   if (path != null) {
     const idx = _findLastIndex(this.pathStack, (a) => a.path === path)
     if (idx !== -1) {
@@ -156,17 +156,17 @@ NameState.prototype.popPath = function popPath(path) {
 }
 
 NameState.prototype.getPath = function getPath() {
-  var ps = !this.pathStack.length ? this.markedPath : this.pathStack
-  var psLength = ps.length
+  const ps = !this.pathStack.length ? this.markedPath : this.pathStack
+  const psLength = ps.length
   if (this._pathCache) {
     return this._pathCache
   } else if (psLength === 0) {
     return null // nameState initialized but never set
   }
 
-  var path = '/'
-  for (var i = 0; i < psLength; ++i) {
-    var a = ps[i].path
+  let path = '/'
+  for (let i = 0; i < psLength; ++i) {
+    let a = ps[i].path
     if (a && a !== '/') {
       if (a[0] !== '/' && path[path.length - 1] !== '/') {
         path += '/'
@@ -181,7 +181,7 @@ NameState.prototype.getPath = function getPath() {
 }
 
 NameState.prototype.getNameNotFound = function getNameNotFound() {
-  var name = _getName(this, '(not found)')
+  const name = _getName(this, '(not found)')
   if (LEGACY_NAMING.hasOwnProperty(this.prefix)) {
     return name
   }
@@ -189,7 +189,7 @@ NameState.prototype.getNameNotFound = function getNameNotFound() {
 }
 
 NameState.prototype.getName = function getName() {
-  var path = this.getPath()
+  const path = this.getPath()
   if (path === null) {
     return null
   }
@@ -198,7 +198,7 @@ NameState.prototype.getName = function getName() {
 }
 
 NameState.prototype.getFullName = function getFullName() {
-  var name = this.getName()
+  const name = this.getName()
   if (LEGACY_NAMING.hasOwnProperty(this.prefix)) {
     return name
   }
@@ -234,7 +234,7 @@ NameState.prototype.reset = function reset() {
 }
 
 function _getName(nameState, path) {
-  var verb = nameState.verb ? '/' + nameState.verb : ''
+  const verb = nameState.verb ? '/' + nameState.verb : ''
   return (nameState.prefix || '') + verb + (nameState.delimiter || '') + path
 }
 

package/lib/transaction/trace/exclusive-time-calculator.js

@@ -36,7 +36,7 @@ class ExclusiveCalculator {
           segment: segment,
           childPairs: []
         })
-        for (var i = children.length - 1; i >= 0; --i) {
+        for (let i = children.length - 1; i >= 0; --i) {
           this.toProcess.push(children[i])
         }
       }
@@ -103,17 +103,17 @@ function merge(first, second) {
   }
 
   const res = []
-  var resIdx = 0
-  var firstIdx = 0
-  var secondIdx = 0
+  let resIdx = 0
+  let firstIdx = 0
+  let secondIdx = 0
   // N.B. this is destructive, it will be updating the end times for range arrays in
   // the input arrays.  If we need to reuse these arrays for anything, this behavior
   // must be changed.
-  var currInterval =
+  let currInterval =
     first[firstIdx][0] < second[secondIdx][0] ? first[firstIdx++] : second[secondIdx++]
 
   while (firstIdx < first.length && secondIdx < second.length) {
-    var next = first[firstIdx][0] < second[secondIdx][0] ? first[firstIdx++] : second[secondIdx++]
+    const next = first[firstIdx][0] < second[secondIdx][0] ? first[firstIdx++] : second[secondIdx++]
     if (next[0] <= currInterval[1]) {
       // if the segment overlaps, update the end of the current merged segment
       currInterval[1] = Math.max(next[1], currInterval[1])

package/lib/transaction/trace/index.js

@@ -5,13 +5,13 @@
 
 'use strict'
 
-var codec = require('../../util/codec')
-var Segment = require('./segment')
-var { Attributes, MAXIMUM_CUSTOM_ATTRIBUTES } = require('../../attributes')
-var logger = require('../../logger').child({ component: 'trace' })
+const codec = require('../../util/codec')
+const Segment = require('./segment')
+const { Attributes, MAXIMUM_CUSTOM_ATTRIBUTES } = require('../../attributes')
+const logger = require('../../logger').child({ component: 'trace' })
 
-var { DESTINATIONS } = require('../../config/attribute-filter')
-var FROM_MILLIS = 1e-3
+const { DESTINATIONS } = require('../../config/attribute-filter')
+const FROM_MILLIS = 1e-3
 const ATTRIBUTE_SCOPE = 'transaction'
 
 const REQUEST_URI_KEY = 'request.uri'
@@ -41,8 +41,8 @@ function Trace(transaction) {
   this.attributes = new Attributes(ATTRIBUTE_SCOPE)
 
   // sending displayName if set by user
-  var displayName = transaction.agent.config.getDisplayHost()
-  var hostName = transaction.agent.config.getHostnameSafe()
+  const displayName = transaction.agent.config.getDisplayHost()
+  const hostName = transaction.agent.config.getHostnameSafe()
   if (displayName !== hostName) {
     this.attributes.addAttribute(DESTINATIONS.TRANS_COMMON, 'host.displayName', displayName)
 
@@ -82,7 +82,7 @@ Trace.prototype.generateSpanEvents = function generateSpanEvents() {
     config.span_events.enabled &&
     config.distributed_tracing.enabled
   ) {
-    let toProcess = []
+    const toProcess = []
 
     // Root segment does not become a span, so we need to process it separately.
     const spanAggregator = this.transaction.agent.spanEventAggregator
@@ -113,8 +113,8 @@ Trace.prototype.generateSpanEvents = function generateSpanEvents() {
     }
 
     while (toProcess.length) {
-      let segmentInfo = toProcess.pop()
-      let segment = segmentInfo.segment
+      const segmentInfo = toProcess.pop()
+      const segment = segmentInfo.segment
 
       // Even though at some point we might want to stop adding events because all the priorities
       // should be the same, we need to count the spans as seen.
@@ -209,11 +209,11 @@ Trace.prototype.getTotalTimeDurationInMillis = function getTotalTimeDurationInMi
   if (this.root.children.length === 0) {
     return 0
   }
-  var segments = this.root.getChildren()
-  var totalTimeInMillis = 0
+  let segments = this.root.getChildren()
+  let totalTimeInMillis = 0
 
   while (segments.length !== 0) {
-    var segment = segments.pop()
+    const segment = segments.pop()
     totalTimeInMillis += segment.getExclusiveDurationInMillis()
     segments = segments.concat(segment.getChildren())
   }