newrelic 8.2.0 → 8.5.1

package/lib/db/query-trace-aggregator.js

@@ -28,7 +28,7 @@ class QueryTraceAggregator extends Aggregator {
 
   removeShortest() {
     let shortest = null
-    for (let sample of this.samples.values()) {
+    for (const sample of this.samples.values()) {
       const trace = sample.trace
       if (!shortest || shortest.duration > trace.duration) {
         shortest = trace
@@ -39,8 +39,8 @@ class QueryTraceAggregator extends Aggregator {
   }
 
   _merge(samples) {
-    for (let sample of samples.values()) {
-      let ownSample = this.samples.get(sample.trace.normalized)
+    for (const sample of samples.values()) {
+      const ownSample = this.samples.get(sample.trace.normalized)
       if (ownSample) {
         ownSample.merge(sample)
       } else {
@@ -55,7 +55,7 @@ class QueryTraceAggregator extends Aggregator {
     // If DT is enabled and the segment is part of a sampled transaction
     // (i.e. we are creating a span event for this segment), then we need
     // to collect the sql trace.
-    var slowQuery
+    let slowQuery
     switch (ttConfig.record_sql) {
       case 'raw':
         slowQuery = new SlowQuery(segment, type, query, trace)

package/lib/db/statement-matcher.js

@@ -6,7 +6,7 @@
 'use strict'
 
 //               (       `  database` .     `    table ` )
-var CLEANER = /^\(?(?:([`'"]?)(.*?)\1\.)?([`'"]?)(.*?)\3\)?$/
+const CLEANER = /^\(?(?:([`'"]?)(.*?)\1\.)?([`'"]?)(.*?)\3\)?$/
 
 function StatementMatcher(operation, operationPattern) {
   this.operation = operation
@@ -20,16 +20,16 @@ StatementMatcher.prototype.getParsedStatement = function getParsedStatement(sql)
   CLEANER.lastIndex = 0
 
   if (this.matcher.test(sql)) {
-    var queryMatch = this.operationPattern.exec(sql)
-    var collection = queryMatch ? queryMatch[1] : 'unknown'
-    var database = null
+    const queryMatch = this.operationPattern.exec(sql)
+    let collection = queryMatch ? queryMatch[1] : 'unknown'
+    let database = null
 
     // If the cleaner can match this collection, pull out the cleaned up names
     // from there. The spec doesn't want the database names in the collection
     // name, but for legacy reasons we keep it.
     // TODO: Either update the spec (and CATs) to accept database name in the
     // collection name or remove it here.
-    var cleanerMatch = CLEANER.exec(collection)
+    const cleanerMatch = CLEANER.exec(collection)
     if (cleanerMatch && cleanerMatch[4]) {
       collection = cleanerMatch[4]
       if (cleanerMatch[2]) {

package/lib/db/utils.js

@@ -10,6 +10,6 @@ module.exports.extractDatabaseChangeFromUse = extractDatabaseChangeFromUse
 function extractDatabaseChangeFromUse(sql) {
   // The character ranges for this were pulled from
   // http://dev.mysql.com/doc/refman/5.7/en/identifiers.html
-  var match = /^\s*use[^\w`]+([\w$_\u0080-\uFFFF]+|`[^`]+`)[\s;]*$/i.exec(sql)
+  const match = /^\s*use[^\w`]+([\w$_\u0080-\uFFFF]+|`[^`]+`)[\s;]*$/i.exec(sql)
   return (match && match[1]) || null
 }

package/lib/environment.js

@@ -5,16 +5,16 @@
 
 'use strict'
 
-var a = require('async')
-var path = require('path')
-var fs = require('./util/unwrapped-core').fs
-var os = require('os')
-var logger = require('./logger').child({ component: 'environment' })
-var stringify = require('json-stringify-safe')
+const a = require('async')
+const path = require('path')
+const fs = require('./util/unwrapped-core').fs
+const os = require('os')
+const logger = require('./logger').child({ component: 'environment' })
+const stringify = require('json-stringify-safe')
 
 // As of 1.7.0 you can no longer dynamically link v8
 // https://github.com/nodejs/io.js/commit/d726a177ed
-var remapping = {
+const remapping = {
   node_install_npm: 'npm installed?',
   node_install_waf: 'WAF build system installed?',
   node_use_openssl: 'OpenSSL support?',
@@ -25,7 +25,7 @@ var remapping = {
   node_use_etw: 'Event Tracing for Windows (ETW) support?'
 }
 
-var settings = Object.create(null)
+let settings = Object.create(null)
 
 /**
  * Fetches the setting of the given name, defaulting to an empty array.
@@ -112,7 +112,7 @@ function listPackages(root, packages, callback) {
     }
 
     // Read the package and pull out the name and version of it.
-    var pkg = path.resolve(root, dir, 'package.json')
+    const pkg = path.resolve(root, dir, 'package.json')
     fs.readFile(pkg, function onPackageRead(err, pkgFile) {
       _log('Read package at %s', pkg)
       if (err) {
@@ -120,10 +120,10 @@ function listPackages(root, packages, callback) {
         return cb()
       }
 
-      var name = null
-      var version = null
+      let name = null
+      let version = null
       try {
-        var pkgData = JSON.parse(pkgFile)
+        const pkgData = JSON.parse(pkgFile)
         name = pkgData.name
         version = pkgData.version
       } catch (e) {
@@ -186,7 +186,7 @@ function listDependencies(root, children, visited, callback) {
   function forEachEntry(entry, cb) {
     _log('Checking dependencies in %s (%s)', entry, root)
 
-    var candidate = path.resolve(root, entry, 'node_modules')
+    const candidate = path.resolve(root, entry, 'node_modules')
     fs.realpath(candidate, function realPathCb(err, realCandidate) {
       _log('Resolved %s to real path %s', candidate, realCandidate)
       if (err) {
@@ -230,10 +230,10 @@ function listDependencies(root, children, visited, callback) {
  *  appropriate names.
  */
 function getLocalPackages(callback) {
-  var packages = []
-  var dependencies = []
-  var candidate = process.cwd()
-  var visited = Object.create(null)
+  const packages = []
+  const dependencies = []
+  let candidate = process.cwd()
+  const visited = Object.create(null)
   _log('Getting local packages')
 
   a.whilst(
@@ -242,7 +242,7 @@ function getLocalPackages(callback) {
     },
     function iterate(cb) {
       _log('Checking for local packages in %s', candidate)
-      var root = path.resolve(candidate, 'node_modules')
+      const root = path.resolve(candidate, 'node_modules')
       a.series(
         [
           a.apply(listPackages, root, packages),
@@ -250,7 +250,7 @@ function getLocalPackages(callback) {
         ],
         function onListComplete(err) {
           _log('Done checking for local packages in %s', candidate)
-          var last = candidate
+          const last = candidate
           candidate = path.dirname(candidate)
           if (last === candidate) {
             candidate = null
@@ -280,8 +280,8 @@ function getLocalPackages(callback) {
  *  appropriate names.
  */
 function getPackages(root, cb) {
-  var packages = []
-  var dependencies = []
+  const packages = []
+  const dependencies = []
   _log('Getting packages from %s', root)
 
   a.series(
@@ -307,9 +307,9 @@ function getPackages(root, cb) {
 function getGlobalPackages(cb) {
   _log('Getting global packages')
   if (process.config && process.config.variables) {
-    var prefix = process.config.variables.node_prefix
+    const prefix = process.config.variables.node_prefix
     if (prefix) {
-      var root = path.resolve(prefix, 'lib', 'node_modules')
+      const root = path.resolve(prefix, 'lib', 'node_modules')
       _log('Getting global packages from %s', root)
       return getPackages(root, cb)
     }
@@ -328,10 +328,10 @@ function getGlobalPackages(cb) {
  * @return {Array.<string[]>} Sorted list of [name, version] pairs.
  */
 function flattenVersions(packages) {
-  var info = Object.create(null)
+  const info = Object.create(null)
   packages.forEach((pair) => {
-    var p = pair[0]
-    var v = pair[1]
+    const p = pair[0]
+    const v = pair[1]
 
     if (info[p]) {
       if (info[p].indexOf(v) < 0) {
@@ -365,10 +365,10 @@ function flattenVersions(packages) {
  */
 function remapConfigSettings() {
   if (process.config && process.config.variables) {
-    var variables = process.config.variables
+    const variables = process.config.variables
     Object.keys(variables).forEach((key) => {
       if (remapping[key]) {
-        var value = variables[key]
+        let value = variables[key]
 
         if (value === true || value === 1) {
           value = 'yes'
@@ -385,13 +385,13 @@ function remapConfigSettings() {
 
 function getOtherPackages(callback) {
   _log('Getting other packages')
-  var other = { packages: [], dependencies: [] }
+  const other = { packages: [], dependencies: [] }
 
   if (!process.env.NODE_PATH) {
     return callback(null, other)
   }
 
-  var paths
+  let paths
   if (process.platform === 'win32') {
     // why. WHY.
     paths = process.env.NODE_PATH.split(';')
@@ -425,7 +425,7 @@ function getOtherPackages(callback) {
 }
 
 function getHomePackages(cb) {
-  var homeDir = null
+  let homeDir = null
   if (process.platform === 'win32') {
     if (process.env.USERDIR) {
       homeDir = process.env.USERDIR
@@ -477,11 +477,11 @@ function findPackages(cb) {
         return cb(err)
       }
 
-      var packages = data.local.packages
+      const packages = data.local.packages
       packages.push.apply(packages, data.global.packages)
       packages.push.apply(packages, data.other.packages)
 
-      var dependencies = data.local.dependencies
+      const dependencies = data.local.dependencies
       dependencies.push.apply(dependencies, data.global.dependencies)
       dependencies.push.apply(dependencies, data.other.dependencies)
 
@@ -504,12 +504,12 @@ function findPackages(cb) {
 }
 
 function time(fn) {
-  var name = fn.name
+  const name = fn.name
   return function timeWrapper(cb) {
-    var start = Date.now()
+    const start = Date.now()
     logger.trace('Starting %s', name)
     return fn(function wrappedCb() {
-      var end = Date.now()
+      const end = Date.now()
       logger.trace('Finished %s in %dms', name, end - start)
       cb.apply(this, arguments)
     })
@@ -533,9 +533,9 @@ function gatherEnv() {
 
 function refreshSyncOnly() {
   // gather persisted settings
-  var framework = getSetting('Framework')
-  var dispatcher = getSetting('Dispatcher')
-  var dispatcherVersion = getSetting('Dispatcher Version')
+  const framework = getSetting('Framework')
+  const dispatcher = getSetting('Dispatcher')
+  const dispatcherVersion = getSetting('Dispatcher Version')
 
   // clearing and rebuilding a global variable
   settings = Object.create(null)
@@ -569,8 +569,8 @@ function refresh(cb) {
   _log('Refreshing environment settings')
   refreshSyncOnly()
 
-  var packages = getSetting('Packages')
-  var dependencies = getSetting('Dependencies')
+  const packages = getSetting('Packages')
+  const dependencies = getSetting('Dependencies')
 
   if (packages.length && dependencies.length) {
     settings.Packages = packages
@@ -599,7 +599,7 @@ function getJSON(cb) {
       return
     }
 
-    var items = []
+    const items = []
     Object.keys(settings).forEach(function settingKeysForEach(key) {
       settings[key].forEach(function settingsValuesForEach(setting) {
         items.push([key, setting])
@@ -613,7 +613,7 @@ function getJSON(cb) {
 // At startup, do the synchronous environment scanning stuff.
 refreshSyncOnly()
 
-var userSetDispatcher = false
+let userSetDispatcher = false
 module.exports = {
   setFramework: function setFramework(framework) {
     addSetting('Framework', framework)

package/lib/errors/error-collector.js

@@ -82,7 +82,7 @@ class ErrorCollector {
         this.seenObjectsByTransaction[txId] = new WeakSet()
       }
 
-      var seenObjects = this.seenObjectsByTransaction[txId]
+      const seenObjects = this.seenObjectsByTransaction[txId]
       if (seenObjects.has(exception)) {
         return true
       }
@@ -97,7 +97,7 @@ class ErrorCollector {
         this.seenStringsByTransaction[txId] = Object.create(null)
       }
 
-      var seenStrings = this.seenStringsByTransaction[txId]
+      const seenStrings = this.seenStringsByTransaction[txId]
       if (seenStrings[exception]) {
         return true
       }

package/lib/errors/error-trace-aggregator.js

@@ -50,7 +50,7 @@ class ErrorTraceAggregator extends TraceAggregator {
     const len = Math.min(errors.length, this.limit - this.errors.length)
     logger.warn('Merging %s (of %s) errors for next delivery.', len, errors.length)
 
-    for (var i = 0; i < len; i++) {
+    for (let i = 0; i < len; i++) {
       this.errors.push(errors[i])
     }
   }

package/lib/errors/helper.js

@@ -37,7 +37,7 @@ module.exports = {
     return false
   },
   isExpectedException: function isExpectedException(transaction, exception, config, urltils) {
-    let { type, message } = this.extractErrorInformation(transaction, exception, config, urltils)
+    const { type, message } = this.extractErrorInformation(transaction, exception, config, urltils)
 
     return (
       this.isExpectedErrorClass(config, type) || this.isExpectedErrorMessage(config, type, message)
@@ -93,7 +93,7 @@ module.exports = {
 
   shouldIgnoreError: function shouldIgnoreError(transaction, error, config) {
     // extract _just_ the error information, not transaction stuff
-    let errorInfo = this.extractErrorInformation(null, error, config, null)
+    const errorInfo = this.extractErrorInformation(null, error, config, null)
 
     return (
       this.shouldIgnoreErrorClass(errorInfo, config) ||
@@ -118,7 +118,7 @@ module.exports = {
   },
 
   shouldIgnoreErrorMessage: function shouldIgnoreErrorMessage(errorInfo, config) {
-    let configIgnoreMessages = config.error_collector.ignore_messages[errorInfo.type]
+    const configIgnoreMessages = config.error_collector.ignore_messages[errorInfo.type]
     if (!configIgnoreMessages) {
       return false
     }

package/lib/errors/index.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-var DESTINATIONS = require('../config/attribute-filter').DESTINATIONS
-var NAMES = require('../metrics/names')
-var props = require('../util/properties')
-var urltils = require('../util/urltils')
+const DESTINATIONS = require('../config/attribute-filter').DESTINATIONS
+const NAMES = require('../metrics/names')
+const props = require('../util/properties')
+const urltils = require('../util/urltils')
 const errorHelper = require('../errors/helper')
 
 class Exception {
@@ -51,14 +51,14 @@ class Exception {
  */
 function createError(transaction, exception, config) {
   const error = exception.error
-  let { name, message, type } = errorHelper.extractErrorInformation(
+  const { name, message, type } = errorHelper.extractErrorInformation(
     transaction,
     error,
     config,
     urltils
   )
 
-  let params = {
+  const params = {
     userAttributes: Object.create(null),
     agentAttributes: Object.create(null),
     intrinsics: Object.create(null)
@@ -83,7 +83,7 @@ function createError(transaction, exception, config) {
 
   const customAttributes = exception.customAttributes
   if (!config.high_security && config.api.custom_attributes_enabled && customAttributes) {
-    for (let key in customAttributes) {
+    for (const key in customAttributes) {
       if (props.hasOwn(customAttributes, key)) {
         const dest = config.attributeFilter.filterTransaction(DESTINATIONS.ERROR_EVENT, key)
         if (dest & DESTINATIONS.ERROR_EVENT) {
@@ -106,7 +106,7 @@ function createError(transaction, exception, config) {
     params.intrinsics['error.expected'] = true
   }
 
-  let res = [0, name, message, type, params]
+  const res = [0, name, message, type, params]
   if (transaction) {
     res.transaction = transaction.id
   }
@@ -118,11 +118,11 @@ function createError(transaction, exception, config) {
  * The error parameter is an output of the createError() function for a given exception.
  */
 function createEvent(transaction, error, timestamp, config) {
-  var message = error[2]
-  var errorClass = error[3]
-  var errorParams = error[4]
+  const message = error[2]
+  const errorClass = error[3]
+  const errorParams = error[4]
 
-  var intrinsicAttributes = _getErrorEventIntrinsicAttrs(
+  const intrinsicAttributes = _getErrorEventIntrinsicAttrs(
     transaction,
     errorClass,
     message,
@@ -133,10 +133,10 @@ function createEvent(transaction, error, timestamp, config) {
 
   // the error structure created by createError() already performs filtering of custom
   // and agent attributes, so it is ok to just copy them
-  var userAttributes = Object.assign(Object.create(null), errorParams.userAttributes)
-  var agentAttributes = Object.assign(Object.create(null), errorParams.agentAttributes)
+  const userAttributes = Object.assign(Object.create(null), errorParams.userAttributes)
+  const agentAttributes = Object.assign(Object.create(null), errorParams.agentAttributes)
 
-  var errorEvent = [intrinsicAttributes, userAttributes, agentAttributes]
+  const errorEvent = [intrinsicAttributes, userAttributes, agentAttributes]
 
   return errorEvent
 }
@@ -148,7 +148,7 @@ function _getErrorEventIntrinsicAttrs(transaction, errorClass, message, expected
     timestamp = timestamp / 1000
   }
 
-  var attributes = {
+  const attributes = {
     'type': 'TransactionError',
     'error.class': errorClass,
     'error.message': conf.high_security ? '' : message,
@@ -160,7 +160,7 @@ function _getErrorEventIntrinsicAttrs(transaction, errorClass, message, expected
     attributes.transactionName = transaction.getFullName()
     attributes.duration = transaction.timer.getDurationInMillis() / 1000
 
-    var metric = transaction.metrics.getMetric(NAMES.QUEUETIME)
+    let metric = transaction.metrics.getMetric(NAMES.QUEUETIME)
     if (metric) {
       attributes.queueDuration = metric.total
     }

package/lib/feature_flags.js

@@ -7,13 +7,14 @@
 
 // unreleased flags gating an active feature
 exports.prerelease = {
-  express5: false,
   await_support: true,
-  promise_segments: false,
-  reverse_naming_rules: false,
-  fastify_instrumentation: false,
   certificate_bundle: false,
+  express5: false,
   new_promise_tracking: false,
+  promise_segments: false,
+  reverse_naming_rules: false,
+  undici_instrumentation: false,
+  undici_async_tracking: true,
   unresolved_promise_cleanup: true
 }
 
@@ -29,7 +30,8 @@ exports.released = [
   'serverless_mode',
   'send_request_uri_attribute',
   'synthetics',
-  'dt_format_w3c'
+  'dt_format_w3c',
+  'fastify_instrumentation'
 ]
 
 // flags that are no longer used for unreleased features

package/lib/header-attributes.js

@@ -111,25 +111,25 @@ function _collectHeaders(headers, nameMap, prefix, transaction) {
     }, {})
   }
 
-  var headerKeys = !transaction.agent.config.allow_all_headers
+  const headerKeys = !transaction.agent.config.allow_all_headers
     ? COLLECTED_REQUEST_HEADERS
     : Object.keys(headers)
 
   const segment = transaction.agent.tracer.getSegment()
 
-  for (var i = 0; i < headerKeys.length; i++) {
-    var headerKey = headerKeys[i]
-    var header = headers[headerKey]
+  for (let i = 0; i < headerKeys.length; i++) {
+    const headerKey = headerKeys[i]
+    let header = headers[headerKey]
     if (header !== undefined) {
       // If any more processing of the headers is required consider refactoring this.
       if (headerKey === 'referer' && typeof header === 'string') {
-        var queryParamIndex = header.indexOf('?')
+        const queryParamIndex = header.indexOf('?')
         if (queryParamIndex !== -1) {
           header = header.substring(0, queryParamIndex)
         }
       }
 
-      var attributeName = nameMap[headerKey] || prefix + _headerToCamelCase(headerKey)
+      const attributeName = nameMap[headerKey] || prefix + _headerToCamelCase(headerKey)
       transaction.trace.attributes.addAttribute(DESTS.TRANS_COMMON, attributeName, header)
 
       segment.addSpanAttribute(attributeName, header)

package/lib/header-processing.js

@@ -65,7 +65,7 @@ function convertUnit(time) {
  * @param {*} headers
  */
 function getContentLengthFromHeaders(headers) {
-  let contentLength = -1
+  const contentLength = -1
   for (const [headerName, headerValue] of Object.entries(headers)) {
     if (CONTENT_LENGTH_REGEX.test(headerName)) {
       return headerValue