newrelic 8.0.0 → 8.4.0

package/lib/config/index.js

@@ -10,7 +10,7 @@ const CollectorResponse = require('../collector/response')
 const copy = require('../util/copy')
 const defaultConfig = require('./default').config
 const EventEmitter = require('events').EventEmitter
-const feature_flag = require('../feature_flags')
+const featureFlag = require('../feature_flags')
 const flatten = require('../util/flatten')
 const fs = require('../util/unwrapped-core').fs
 const hashes = require('../util/hashes')
@@ -29,45 +29,39 @@ const mergeServerConfig = new MergeServerConfig()
 const AZURE_APP_NAME = 'APP_POOL_ID'
 const DEFAULT_MAX_PAYLOAD_SIZE_IN_BYTES = 1000000
 const DEFAULT_CONFIG_PATH = require.resolve('./default')
-const SPAN_EVENT_LIMIT = 1000
 const BASE_CONFIG_PATH = require.resolve('../../newrelic')
-const HAS_ARBITRARY_KEYS = new Set([
-  'ignore_messages',
-  'expected_messages',
-  'labels'
-])
+const HAS_ARBITRARY_KEYS = new Set(['ignore_messages', 'expected_messages', 'labels'])
 
 const LASP_MAP = require('./lasp').LASP_MAP
 const ENV = require('./env')
 const HSM = require('./hsm')
+const REMOVE_BEFORE_SEND = new Set(['attributeFilter'])
 
 const exists = fs.existsSync || path.existsSync
 let logger = null // Lazy-loaded in `initialize`.
 let _configInstance = null
 
-const getConfigFileNames = () => [
-  process.env.NEW_RELIC_CONFIG_FILENAME,
-  'newrelic.js',
-  'newrelic.cjs'
-].filter(Boolean)
-
-const getConfigFileLocations = () => [
-  process.env.NEW_RELIC_HOME,
-  process.cwd(),
-  process.env.HOME,
-  path.join(__dirname, '../../../..'), // above node_modules
-  // the REPL has no main module
-  process.mainModule && process.mainModule.filename
-    ? path.dirname(process.mainModule.filename)
-    : undefined
-].filter(Boolean)
+const getConfigFileNames = () =>
+  [process.env.NEW_RELIC_CONFIG_FILENAME, 'newrelic.js', 'newrelic.cjs'].filter(Boolean)
+
+const getConfigFileLocations = () =>
+  [
+    process.env.NEW_RELIC_HOME,
+    process.cwd(),
+    process.env.HOME,
+    path.join(__dirname, '../../../..'), // above node_modules
+    // the REPL has no main module
+    process.mainModule && process.mainModule.filename
+      ? path.dirname(process.mainModule.filename)
+      : undefined
+  ].filter(Boolean)
 
 function isTruthular(setting) {
   if (setting == null) {
     return false
   }
 
-  var normalized = setting.toString().toLowerCase()
+  const normalized = setting.toString().toLowerCase()
   switch (normalized) {
     case 'false':
     case 'f':
@@ -93,7 +87,7 @@ function fromObjectList(setting) {
 
 function _findConfigFile() {
   const configFileCandidates = getConfigFileLocations().reduce((files, configPath) => {
-    const configFiles = getConfigFileNames().map(filename =>
+    const configFiles = getConfigFileNames().map((filename) =>
       path.join(path.resolve(configPath), filename)
     )
 
@@ -117,7 +111,7 @@ function Config(config) {
 
   // feature flags are mostly private settings for gating unreleased features
   // flags are set in the feature_flags.js file
-  this.feature_flag = copy.shallow(feature_flag.prerelease)
+  this.feature_flag = copy.shallow(featureFlag.prerelease)
 
   // set by environment
   this.newrelic_home = null
@@ -160,9 +154,9 @@ function Config(config) {
   this.browser_monitoring.loader_version = ''
 
   // Settings to play nice with DLPs (see NODE-1044).
-  this.compressed_content_encoding = 'deflate'  // Deflate or gzip
-  this.simple_compression = false               // Disables subcomponent compression
-  this.put_for_data_send = false                // Changes http verb for harvest
+  this.compressed_content_encoding = 'deflate' // Deflate or gzip
+  this.simple_compression = false // Disables subcomponent compression
+  this.put_for_data_send = false // Changes http verb for harvest
 
   // 3. override defaults with values from the loaded / passed configuration
   this._fromPassed(config)
@@ -188,7 +182,7 @@ function Config(config) {
         analytic_event_data: this.transaction_events.max_samples_stored,
         custom_event_data: this.custom_insights_events.max_samples_stored,
         error_event_data: this.error_collector.max_event_samples_stored,
-        span_event_data: SPAN_EVENT_LIMIT
+        span_event_data: this.span_events.max_samples_stored
       }
     }
   }
@@ -201,9 +195,9 @@ function Config(config) {
     if (this.security_policies_token) {
       throw new Error(
         'Security Policies and High Security Mode cannot both be present ' +
-        'in the agent configuration. If Security Policies have been set ' +
-        'for your account, please ensure the security_policies_token is ' +
-        'set but high_security is disabled (default).'
+          'in the agent configuration. If Security Policies have been set ' +
+          'for your account, please ensure the security_policies_token is ' +
+          'set but high_security is disabled (default).'
       )
     }
     this._applyHighSecurity()
@@ -243,17 +237,21 @@ Config.prototype.onConnect = function onConnect(json, recursion) {
     this.emit('agent_enabled', false)
     return
   }
-  if (Object.keys(json).length === 0) return
+  if (Object.keys(json).length === 0) {
+    return
+  }
 
   Object.keys(json).forEach(function updateProp(key) {
     this._fromServer(json, key)
   }, this)
 
+  this._warnDeprecations()
+
   this.emit('change', this)
 }
 
 Config.prototype._getMostSecure = function getMostSecure(key, currentVal, newVal) {
-  var filter = LASP_MAP[key] && LASP_MAP[key].filter
+  const filter = LASP_MAP[key] && LASP_MAP[key].filter
   if (!this.security_policies_token || !filter) {
     // If we aren't applying something vetted by security policies we
     // just return the new value.
@@ -299,8 +297,7 @@ Config.prototype._fromServer = function _fromServer(params, key) {
     case 'encoding_key':
       this._alwaysUpdateIfChanged(params, key)
       if (this.cross_process_id && this.encoding_key) {
-        this.obfuscatedId =
-          hashes.obfuscateNameUsingKey(this.cross_process_id, this.encoding_key)
+        this.obfuscatedId = hashes.obfuscateNameUsingKey(this.cross_process_id, this.encoding_key)
       }
       break
 
@@ -321,12 +318,7 @@ Config.prototype._fromServer = function _fromServer(params, key) {
 
     case 'collect_error_events':
       if (params.collect_error_events === false) {
-        this._updateNestedIfChanged(
-          params,
-          this.error_collector,
-          key,
-          'capture_events'
-        )
+        this._updateNestedIfChanged(params, this.error_collector, key, 'capture_events')
       }
       break
 
@@ -355,10 +347,7 @@ Config.prototype._fromServer = function _fromServer(params, key) {
         this.emit(key, null)
         break
       }
-      logger.info(
-        'Valid event_harvest_config received. Updating harvest cycles.',
-        val
-      )
+      logger.info('Valid event_harvest_config received. Updating harvest cycles.', val)
       const limits = Object.keys(val.harvest_limits).reduce((acc, k) => {
         const v = val.harvest_limits[k]
         if (harvestConfigValidator.isValidHarvestValue(v)) {
@@ -406,12 +395,7 @@ Config.prototype._fromServer = function _fromServer(params, key) {
     // Browser Monitoring
     //
     case 'browser_monitoring.loader':
-      this._updateNestedIfChangedRaw(
-        params,
-        this.browser_monitoring,
-        key,
-        'loader'
-      )
+      this._updateNestedIfChangedRaw(params, this.browser_monitoring, key, 'loader')
       break
 
     // these are used by browser_monitoring
@@ -422,24 +406,14 @@ Config.prototype._fromServer = function _fromServer(params, key) {
     case 'error_beacon':
     case 'browser_key':
     case 'js_agent_loader':
-      this._updateNestedIfChangedRaw(
-        params,
-        this.browser_monitoring,
-        key,
-        key
-      )
+      this._updateNestedIfChangedRaw(params, this.browser_monitoring, key, key)
       break
 
     //
     // Cross Application Tracer
     //
     case 'cross_application_tracer.enabled':
-      this._updateNestedIfChanged(
-        params,
-        this.cross_application_tracer,
-        key,
-        'enabled'
-      )
+      this._updateNestedIfChanged(params, this.cross_application_tracer, key, 'enabled')
       break
     //
     // Error Collector
@@ -530,12 +504,7 @@ Config.prototype._fromServer = function _fromServer(params, key) {
     // Transaction Events
     //
     case 'transaction_events.enabled':
-      this._updateNestedIfChanged(
-        params,
-        this.transaction_events,
-        key,
-        'enabled'
-      )
+      this._updateNestedIfChanged(params, this.transaction_events, key, 'enabled')
       break
 
     //
@@ -576,6 +545,13 @@ Config.prototype._fromServer = function _fromServer(params, key) {
       this.logUnsupported(params, key)
       break
 
+    // DT span event harvest config limits
+    case 'span_event_harvest_config':
+      this.span_event_harvest_config = {
+        ...params[key]
+      }
+      break
+
     // These settings are not allowed from the server.
     case 'attributes.enabled':
     case 'attributes.exclude':
@@ -610,11 +586,13 @@ Config.prototype._fromServer = function _fromServer(params, key) {
  * @param {string} key  Value we're looking to set.
  */
 Config.prototype._alwaysUpdateIfChanged = function _alwaysUpdateIfChanged(json, key) {
-  var value = json[key]
+  const value = json[key]
   if (value != null && this[key] !== value) {
     if (Array.isArray(value) && Array.isArray(this[key])) {
       value.forEach(function pushIfNew(element) {
-        if (this[key].indexOf(element) === -1) this[key].push(element)
+        if (this[key].indexOf(element) === -1) {
+          this[key].push(element)
+        }
       }, this)
     } else {
       this[key] = value
@@ -652,7 +630,7 @@ Config.prototype._updateIfChanged = function _updateIfChanged(json, key) {
  */
 Config.prototype._validateThenUpdateStatusCodes = _validateThenUpdateStatusCodes
 function _validateThenUpdateStatusCodes(remote, local, remoteKey, localKey) {
-  let valueToTest = remote[remoteKey]
+  const valueToTest = remote[remoteKey]
   if (!Array.isArray(valueToTest)) {
     logger.warn(
       'Saw SSC (ignore|expect)_status_codes that is not an array, will not merge: %s',
@@ -663,10 +641,11 @@ function _validateThenUpdateStatusCodes(remote, local, remoteKey, localKey) {
 
   let valid = true
   valueToTest.forEach(function validateArray(thingToTest) {
-    if (!('string' === (typeof thingToTest) || 'number' === (typeof thingToTest))) {
+    if (!('string' === typeof thingToTest || 'number' === typeof thingToTest)) {
       logger.warn(
         'Saw SSC (ignore|expect)_status_code that is not a number or string,' +
-        'will not merge: %s', thingToTest
+          'will not merge: %s',
+        thingToTest
       )
       valid = false
     }
@@ -695,7 +674,7 @@ function _validateThenUpdateStatusCodes(remote, local, remoteKey, localKey) {
 Config.prototype._validateThenUpdateErrorClasses = _validateThenUpdateErrorClasses
 
 function _validateThenUpdateErrorClasses(remote, local, remoteKey, localKey) {
-  let valueToTest = remote[remoteKey]
+  const valueToTest = remote[remoteKey]
   if (!Array.isArray(valueToTest)) {
     logger.warn(
       'Saw SSC (ignore|expect)_classes that is not an array, will not merge: %s',
@@ -706,8 +685,8 @@ function _validateThenUpdateErrorClasses(remote, local, remoteKey, localKey) {
 
   let valid = true
   Object.keys(valueToTest).forEach(function validateArray(key) {
-    let thingToTest = valueToTest[key]
-    if ('string' !== (typeof thingToTest)) {
+    const thingToTest = valueToTest[key]
+    if ('string' !== typeof thingToTest) {
       logger.warn(
         'Saw SSC (ignore|expect)_class that is not a string, will not merge: %s',
         thingToTest
@@ -739,12 +718,9 @@ function _validateThenUpdateErrorClasses(remote, local, remoteKey, localKey) {
 Config.prototype._validateThenUpdateErrorMessages = _validateThenUpdateErrorMessages
 
 function _validateThenUpdateErrorMessages(remote, local, remoteKey, localKey) {
-  let valueToTest = remote[remoteKey]
+  const valueToTest = remote[remoteKey]
   if (Array.isArray(valueToTest)) {
-    logger.warn(
-      'Saw SSC (ignore|expect)_message that is an Array, will not merge: %s',
-      valueToTest
-    )
+    logger.warn('Saw SSC (ignore|expect)_message that is an Array, will not merge: %s', valueToTest)
     return
   }
 
@@ -768,12 +744,9 @@ function _validateThenUpdateErrorMessages(remote, local, remoteKey, localKey) {
 
   let valid = true
   Object.keys(valueToTest).forEach(function validateArray(key) {
-    let arrayToTest = valueToTest[key]
+    const arrayToTest = valueToTest[key]
     if (!Array.isArray(arrayToTest)) {
-      logger.warn(
-        'Saw SSC message array that is not an array, will not merge: %s',
-        arrayToTest
-      )
+      logger.warn('Saw SSC message array that is not an array, will not merge: %s', arrayToTest)
       valid = false
     }
   })
@@ -822,8 +795,10 @@ function _updateNestedIfChangedRaw(remote, local, remoteKey, localKey) {
  * @param {string} key  Value we're looking to set.
  */
 Config.prototype._emitIfSet = function _emitIfSet(json, key) {
-  var value = json[key]
-  if (value != null) this.emit(key, value)
+  const value = json[key]
+  if (value != null) {
+    this.emit(key, value)
+  }
 }
 
 /**
@@ -834,11 +809,11 @@ Config.prototype._emitIfSet = function _emitIfSet(json, key) {
  * @param {string} key  Value the agent won't set.
  */
 Config.prototype.logDisabled = function logDisabled(json, key) {
-  var value = json[key]
+  const value = json[key]
   if (value != null) {
     logger.debug(
       'Server-side configuration of %s is currently disabled by local configuration. ' +
-      '(Server sent value of %s.)',
+        '(Server sent value of %s.)',
       key,
       value
     )
@@ -853,11 +828,11 @@ Config.prototype.logDisabled = function logDisabled(json, key) {
  * @param {string} key  Value the agent doesn't set.
  */
 Config.prototype.logUnsupported = function logUnsupported(json, key) {
-  var value = json[key]
+  const value = json[key]
   if (value !== null && value !== undefined) {
     logger.debug(
       'Server-side configuration of %s is currently not supported by the ' +
-      'Node.js agent. (Server sent value of %s.)',
+        'Node.js agent. (Server sent value of %s.)',
       key,
       value
     )
@@ -872,12 +847,8 @@ Config.prototype.logUnsupported = function logUnsupported(json, key) {
  * @param {string} key  Value the agent knows nothing about.
  */
 Config.prototype.logUnknown = function logUnknown(json, key) {
-  var value = json[key]
-  logger.debug(
-    'New Relic sent unknown configuration parameter %s with value %s.',
-    key,
-    value
-  )
+  const value = json[key]
+  logger.debug('New Relic sent unknown configuration parameter %s with value %s.', key, value)
 }
 
 /**
@@ -903,7 +874,7 @@ Config.prototype.clearDisplayHostCache = function clearDisplayHostCache() {
 }
 
 function getDisplayHost() {
-  var _displayHost
+  let _displayHost
   this.getDisplayHost = function getCachedDisplayHost() {
     return _displayHost
   }
@@ -911,8 +882,8 @@ function getDisplayHost() {
     _displayHost = this.getHostnameSafe()
     return _displayHost
   }
-  var stringBuffer = Buffer.from(this.process_host.display_name, 'utf8')
-  var numBytes = stringBuffer.length
+  const stringBuffer = Buffer.from(this.process_host.display_name, 'utf8')
+  const numBytes = stringBuffer.length
 
   if (numBytes > 255) {
     logger.warn('Custom host display name must be less than 255 bytes')
@@ -941,16 +912,18 @@ Config.prototype.clearHostnameCache = function clearHostnameCache() {
 }
 
 Config.prototype.getIPAddresses = function getIPAddresses() {
-  var addresses = Object.create(null)
-  var interfaces = os.networkInterfaces()
+  const addresses = Object.create(null)
+  const interfaces = os.networkInterfaces()
 
-  for (var interfaceKey in interfaces) {
-    if (interfaceKey.match(/^lo/)) continue
+  for (const interfaceKey in interfaces) {
+    if (interfaceKey.match(/^lo/)) {
+      continue
+    }
 
-    var interfaceDescriptions = interfaces[interfaceKey]
-    for (var i = 0; i < interfaceDescriptions.length; i++) {
-      var description = interfaceDescriptions[i]
-      var family = description.family.toLowerCase()
+    const interfaceDescriptions = interfaces[interfaceKey]
+    for (let i = 0; i < interfaceDescriptions.length; i++) {
+      const description = interfaceDescriptions[i]
+      const family = description.family.toLowerCase()
       addresses[family] = description.address
     }
   }
@@ -958,7 +931,7 @@ Config.prototype.getIPAddresses = function getIPAddresses() {
 }
 
 function getHostnameSafe() {
-  var _hostname
+  let _hostname
   this.getHostnameSafe = function getCachedHostname() {
     return _hostname
   }
@@ -966,7 +939,7 @@ function getHostnameSafe() {
     _hostname = os.hostname()
     return _hostname
   } catch (e) {
-    var addresses = this.getIPAddresses()
+    const addresses = this.getIPAddresses()
 
     if (this.process_host.ipv_preference === '6' && addresses.ipv6) {
       _hostname = addresses.ipv6
@@ -989,7 +962,7 @@ function getHostnameSafe() {
  * Ensure that the apps names are always returned as a list.
  */
 Config.prototype.applications = function applications() {
-  var apps = this.app_name
+  const apps = this.app_name
 
   if (Array.isArray(apps) && apps.length > 0) {
     return apps
@@ -1009,20 +982,27 @@ Config.prototype.applications = function applications() {
  * @param {object} internal Whichever chunk of the config being overridden.
  */
 Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrary) {
-  if (!external) return
-  if (!internal) internal = this
+  if (!external) {
+    return
+  }
+  if (!internal) {
+    internal = this
+  }
 
   Object.keys(external).forEach(function overwrite(key) {
     // if it's not in the defaults, it doesn't exist
-    if (!arbitrary && internal[key] === undefined) return
+    if (!arbitrary && internal[key] === undefined) {
+      return
+    }
 
     if (key === 'ssl' && !isTruthular(external.ssl)) {
       logger.warn('SSL config key can no longer be disabled, not updating.')
       return
     }
 
+    let node = null
     try {
-      var node = external[key]
+      node = external[key]
     } catch (err) {
       logger.warn('Error thrown on access of user config for key: %s', key)
       return
@@ -1030,7 +1010,7 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
 
     if (typeof node === 'object' && !Array.isArray(node)) {
       // is top level and can have arbitrary keys
-      var allowArbitrary = internal === this || HAS_ARBITRARY_KEYS.has(key)
+      const allowArbitrary = internal === this || HAS_ARBITRARY_KEYS.has(key)
       this._fromPassed(node, internal[key], allowArbitrary)
     } else {
       internal[key] = node
@@ -1047,11 +1027,17 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
  * of configuration.
  */
 Config.prototype._fromSpecial = function _fromSpecial() {
-  var name = this.app_name
-  if (name === null || name === undefined || name === '' ||
-      (Array.isArray(name) && name.length === 0)) {
-    var azureName = process.env[AZURE_APP_NAME]
-    if (azureName) this.app_name = azureName.split(',')
+  const name = this.app_name
+  if (
+    name === null ||
+    name === undefined ||
+    name === '' ||
+    (Array.isArray(name) && name.length === 0)
+  ) {
+    const azureName = process.env[AZURE_APP_NAME]
+    if (azureName) {
+      this.app_name = azureName.split(',')
+    }
   }
 }
 
@@ -1060,7 +1046,7 @@ Config.prototype._fromSpecial = function _fromSpecial() {
  * (of the form NEW_RELIC_FEATURE_FLAG_<feature flag name in upper case>).
  */
 Config.prototype._featureFlagsFromEnv = function _featureFlagsFromEnv() {
-  const flags = Object.keys(feature_flag.prerelease).concat(feature_flag.released)
+  const flags = Object.keys(featureFlag.prerelease).concat(featureFlag.released)
   const config = this
   flags.forEach(function checkFlag(flag) {
     const envVal = process.env['NEW_RELIC_FEATURE_FLAG_' + flag.toUpperCase()]
@@ -1081,8 +1067,12 @@ Config.prototype._featureFlagsFromEnv = function _featureFlagsFromEnv() {
  *                        never need to set this yourself.
  */
 Config.prototype._fromEnvironment = function _fromEnvironment(metadata, data) {
-  if (!metadata) metadata = ENV.ENV_MAPPING
-  if (!data) data = this
+  if (!metadata) {
+    metadata = ENV.ENV_MAPPING
+  }
+  if (!data) {
+    data = this
+  }
 
   Object.keys(metadata).forEach(function applyEnvDefault(value) {
     // if it's not in the config, it doesn't exist
@@ -1090,14 +1080,14 @@ Config.prototype._fromEnvironment = function _fromEnvironment(metadata, data) {
       return
     }
 
-    var node = metadata[value]
+    const node = metadata[value]
     if (typeof node === 'string') {
-      var setting = process.env[node]
+      const setting = process.env[node]
       if (setting) {
         logger.debug(`${node} environment variable set.`)
 
         if (ENV.LIST_VARS.has(node)) {
-          let split = ENV.LIST_VARS_CUSTOM_DELIMITERS[node] || /,/
+          const split = ENV.LIST_VARS_CUSTOM_DELIMITERS[node] || /,/
           data[value] = setting.split(split).map(function trimVal(k) {
             return k.trim()
           })
@@ -1119,7 +1109,9 @@ Config.prototype._fromEnvironment = function _fromEnvironment(metadata, data) {
       }
     } else {
       // don't crash if the mapping has config keys the current config doesn't.
-      if (!data[value]) data[value] = Object.create(null)
+      if (!data[value]) {
+        data[value] = Object.create(null)
+      }
       this._fromEnvironment(node, data[value])
     }
   }, this)
@@ -1137,7 +1129,7 @@ Config.prototype._loggingManuallySet = function _loggingManuallySet(inputConfig)
   const inputEnabled = inputConfig && inputConfig.logging && inputConfig.logging.enabled
   const envEnabled = process.env.NEW_RELIC_LOG_ENABLED
 
-  return (inputEnabled !== undefined) || (envEnabled !== undefined)
+  return inputEnabled !== undefined || envEnabled !== undefined
 }
 
 /**
@@ -1148,16 +1140,16 @@ Config.prototype._loggingManuallySet = function _loggingManuallySet(inputConfig)
  *
  * @returns {boolean}
  */
-Config.prototype._nativeMetricsManuallySet =
-  function _nativeMetricsManuallySet(inputConfig) {
-    const inputEnabled = inputConfig
-      && inputConfig.plugins
-      && inputConfig.plugins.native_metrics
-      && inputConfig.plugins.native_metrics.enabled
-    const envEnabled = process.env.NEW_RELIC_NATIVE_METRICS_ENABLED
-
-    return (inputEnabled !== undefined) || (envEnabled !== undefined)
-  }
+Config.prototype._nativeMetricsManuallySet = function _nativeMetricsManuallySet(inputConfig) {
+  const inputEnabled =
+    inputConfig &&
+    inputConfig.plugins &&
+    inputConfig.plugins.native_metrics &&
+    inputConfig.plugins.native_metrics.enabled
+  const envEnabled = process.env.NEW_RELIC_NATIVE_METRICS_ENABLED
+
+  return inputEnabled !== undefined || envEnabled !== undefined
+}
 
 /**
  * Returns true if distributed tracing has been manually enabled via configuration file or
@@ -1168,13 +1160,12 @@ Config.prototype._nativeMetricsManuallySet =
  * @returns {boolean}
  */
 Config.prototype._DTManuallySet = function _DTManuallySet(inputConfig) {
-  const inputEnabled = inputConfig
-  && inputConfig.distributed_tracing
-  && inputConfig.distributed_tracing.enabled
+  const inputEnabled =
+    inputConfig && inputConfig.distributed_tracing && inputConfig.distributed_tracing.enabled
 
   const envEnabled = process.env.NEW_RELIC_DISTRIBUTED_TRACING_ENABLED
 
-  return (inputEnabled !== undefined) || (envEnabled !== undefined)
+  return inputEnabled !== undefined || envEnabled !== undefined
 }
 
 /**
@@ -1197,7 +1188,7 @@ Config.prototype._enforceServerless = function _enforceServerless(inputConfig) {
       const name = process.env.AWS_LAMBDA_FUNCTION_NAME || 'Serverless Application'
       this.app_name = [name]
 
-      logger.info('Auto-naming serverless application to [\'%s\'] from: %s', name, namingSource)
+      logger.info("Auto-naming serverless application to ['%s'] from: %s", name, namingSource)
     }
 
     // Explicitly disable old CAT in serverless_mode
@@ -1217,26 +1208,25 @@ Config.prototype._enforceServerless = function _enforceServerless(inputConfig) {
 
       logger.info(
         'Logging is disabled by default when serverless_mode is enabled. ' +
-        'If desired, enable logging via config file or environment variable and ' +
-        'set filepath to a valid path for current environment, stdout or stderr.'
+          'If desired, enable logging via config file or environment variable and ' +
+          'set filepath to a valid path for current environment, stdout or stderr.'
       )
     }
 
-    if (this._nativeMetricsManuallySet(inputConfig) &&
-      this.plugins.native_metrics.enabled) {
+    if (this._nativeMetricsManuallySet(inputConfig) && this.plugins.native_metrics.enabled) {
       logger.info(
         'Enabling the native-metrics module when in serverless mode may greatly ' +
-        'increase cold-start times. Given the limited benefit of the VM metrics' +
-        'and general lack of control in a serverless environment, we do not ' +
-        'recommend this trade-off.'
+          'increase cold-start times. Given the limited benefit of the VM metrics' +
+          'and general lack of control in a serverless environment, we do not ' +
+          'recommend this trade-off.'
       )
     } else {
       this.plugins.native_metrics.enabled = false
 
       logger.info(
         'The native-metrics module is disabled by default when serverless_mode ' +
-        'is enabled.  If desired, enable the native-metrics module via config file ' +
-        'or environment variable.'
+          'is enabled.  If desired, enable the native-metrics module via config file ' +
+          'or environment variable.'
       )
     }
 
@@ -1248,8 +1238,8 @@ Config.prototype._enforceServerless = function _enforceServerless(inputConfig) {
       if (this.distributed_tracing.enabled) {
         logger.warn(
           'Using distributed tracing in serverless mode requires account_id be ' +
-          'defined, either in your newrelic.js file or via environment variables. ' +
-          'Disabling distributed tracing.'
+            'defined, either in your newrelic.js file or via environment variables. ' +
+            'Disabling distributed tracing.'
         )
         this.distributed_tracing.enabled = false
       }
@@ -1270,8 +1260,9 @@ Config.prototype._enforceServerless = function _enforceServerless(inputConfig) {
   DT_KEYS.forEach((key) => {
     if (this[key]) {
       logger.warn(
-        key + ' was configured locally without enabling serverless_mode. ' +
-        'This local value will be ignored and set by the New Relic servers.'
+        key +
+          ' was configured locally without enabling serverless_mode. ' +
+          'This local value will be ignored and set by the New Relic servers.'
       )
       this[key] = null
     }
@@ -1285,7 +1276,7 @@ Config.prototype._enforceServerless = function _enforceServerless(inputConfig) {
  * based on special properties of configuration values should go here as well.
  */
 Config.prototype._canonicalize = function _canonicalize() {
-  var statusCodes = this.error_collector && this.error_collector.ignore_status_codes
+  const statusCodes = this.error_collector && this.error_collector.ignore_status_codes
   if (statusCodes) {
     this.error_collector.ignore_status_codes = _parseCodes(statusCodes)
   }
@@ -1295,17 +1286,17 @@ Config.prototype._canonicalize = function _canonicalize() {
     this.error_collector.expected_status_codes = _parseCodes(expectedCodes)
   }
 
-  var logAliases = {
+  const logAliases = {
     verbose: 'trace',
     debugging: 'debug',
     warning: 'warn',
     err: 'error'
   }
-  var level = this.logging.level
+  const level = this.logging.level
   this.logging.level = logAliases[level] || level
 
   if (this.host === '') {
-    var region = parseKey(this.license_key)
+    const region = parseKey(this.license_key)
     if (region) {
       this.host = 'collector.' + region + '.nr-data.net'
     } else {
@@ -1317,8 +1308,8 @@ Config.prototype._canonicalize = function _canonicalize() {
     logger.warnOnce(
       'IgnoreServerConfigurationWarning',
       'The local config setting `ignore_server_configuration` has been deprecated ' +
-      'and removed as of Agent v5. Please review agent documentation or contact ' +
-      'New Relic support.'
+        'and removed as of Agent v5. Please review agent documentation or contact ' +
+        'New Relic support.'
     )
   }
 
@@ -1330,16 +1321,17 @@ Config.prototype._canonicalize = function _canonicalize() {
 function _parseCodes(codes) {
   // range does not support negative values
   function parseRange(range, parsed) {
-    var split = range.split('-')
+    const split = range.split('-')
     if (split.length !== 2) {
       logger.warn('Failed to parse range %s', range)
       return parsed
     }
-    if (split[0] === '') { // catch negative code. ex. -7
+    if (split[0] === '') {
+      // catch negative code. ex. -7
       return parsed.push(parseInt(range, 10))
     }
-    var lower = parseInt(split[0], 10)
-    var upper = parseInt(split[1], 10)
+    const lower = parseInt(split[0], 10)
+    const upper = parseInt(split[1], 10)
     if (Number.isNaN(lower) || Number.isNaN(upper)) {
       logger.warn('Range must contain two numbers %s', range)
       return parsed
@@ -1348,22 +1340,23 @@ function _parseCodes(codes) {
       logger.warn('Range must start with lower bound %s', range)
     } else if (lower < 0 || upper > 1000) {
       logger.warn('Range must be between 0 and 1000 %s', range)
-    } else { // success
-      for (var i = lower; i <= upper; i++) {
+    } else {
+      // success
+      for (let i = lower; i <= upper; i++) {
         parsed.push(i)
       }
     }
     return parsed
   }
 
-  var parsedCodes = []
-  for (var i = 0; i < codes.length; i++) {
-    var code = codes[i]
-    var parsedCode
+  const parsedCodes = []
+  for (let i = 0; i < codes.length; i++) {
+    const code = codes[i]
+
     if (typeof code === 'string' && code.indexOf('-') !== -1) {
       parseRange(code, parsedCodes)
     } else {
-      parsedCode = parseInt(code, 10)
+      const parsedCode = parseInt(code, 10)
       if (!Number.isNaN(parsedCode)) {
         parsedCodes.push(parsedCode)
       } else {
@@ -1379,7 +1372,7 @@ function _parseCodes(codes) {
  * them to be correct.
  */
 Config.prototype._applyHighSecurity = function _applyHighSecurity() {
-  var config = this
+  const config = this
   checkNode('', this, HSM.HIGH_SECURITY_SETTINGS)
   // as a one off, we add a global exclude rule to the list to keep from
   // clobbering user defined rules
@@ -1391,15 +1384,11 @@ Config.prototype._applyHighSecurity = function _applyHighSecurity() {
   }
 
   function checkKey(base, target, settings, key) {
-    var hsValue = settings[key]
+    const hsValue = settings[key]
 
     if (hsValue && typeof hsValue === 'object' && !(hsValue instanceof Array)) {
       if (typeof target[key] !== 'object') {
-        logger.warn(
-          'High Security Mode: %s should be an object, found %s',
-          key,
-          target[key]
-        )
+        logger.warn('High Security Mode: %s should be an object, found %s', key, target[key])
         target[key] = Object.create(null)
       }
 
@@ -1407,12 +1396,7 @@ Config.prototype._applyHighSecurity = function _applyHighSecurity() {
     }
 
     if (target[key] !== hsValue) {
-      logger.warn(
-        'High Security Mode: %s was set to %s, coercing to %s',
-        key,
-        target[key],
-        hsValue
-      )
+      logger.warn('High Security Mode: %s was set to %s, coercing to %s', key, target[key], hsValue)
       target[key] = hsValue
       config.emit(base + key, hsValue)
     }
@@ -1431,8 +1415,8 @@ Config.prototype._applyHighSecurity = function _applyHighSecurity() {
  *  policies as the response payload.
  */
 Config.prototype.applyLasp = function applyLasp(agent, policies) {
-  var config = this
-  var keys = Object.keys(policies)
+  const config = this
+  const keys = Object.keys(policies)
 
   if (!config.security_policies_token) {
     if (keys.length) {
@@ -1444,12 +1428,12 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
     return CollectorResponse.success(null)
   }
 
-  var missingLASP = []
-  var missingRequired = []
+  const missingLASP = []
+  const missingRequired = []
 
-  var finalPolicies = keys.reduce(function applyPolicy(obj, name) {
-    var policy = policies[name]
-    var localMapping = LASP_MAP[name]
+  const finalPolicies = keys.reduce(function applyPolicy(obj, name) {
+    const policy = policies[name]
+    const localMapping = LASP_MAP[name]
 
     if (!localMapping) {
       if (!policy.required) {
@@ -1459,26 +1443,26 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
       // policy is required but does not exist in agent -- fail
       missingRequired.push(name)
     } else {
-      var splitConfigName = localMapping.path.split('.')
-      var settingBlock = config[splitConfigName[0]]
+      const splitConfigName = localMapping.path.split('.')
+      let settingBlock = config[splitConfigName[0]]
       // pull out the configuration subsection that the option lives in
-      for (var i = 1; i < splitConfigName.length - 1; ++i) {
+      for (let i = 1; i < splitConfigName.length - 1; ++i) {
         settingBlock = settingBlock[splitConfigName[i]]
       }
-      var valueName = splitConfigName[splitConfigName.length - 1]
-      var localVal = settingBlock[valueName]
+      const valueName = splitConfigName[splitConfigName.length - 1]
+      const localVal = settingBlock[valueName]
 
       // Indexes into "allowed values" based on "enabled" setting
       // to retrieve proper mapping.
-      var policyValues = localMapping.allowedValues
-      var policyValue = policyValues[policy.enabled ? 1 : 0]
+      const policyValues = localMapping.allowedValues
+      const policyValue = policyValues[policy.enabled ? 1 : 0]
 
       // get the most secure setting between local config and the policy
-      var finalValue = settingBlock[valueName] = config._getMostSecure(
+      const finalValue = (settingBlock[valueName] = config._getMostSecure(
         name,
         localVal,
         policyValue
-      )
+      ))
       policy.enabled = policyValues.indexOf(finalValue) === 1
       obj[name] = policy
 
@@ -1507,11 +1491,14 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
   if (missingLASP.length) {
     fatalMessage =
       'The agent did not receive one or more security policies that it ' +
-      'expected and will shut down: ' + missingLASP.join(', ') + '.'
+      'expected and will shut down: ' +
+      missingLASP.join(', ') +
+      '.'
   } else if (missingRequired.length) {
     fatalMessage =
       'The agent received one or more required security policies that it ' +
-      'does not recognize and will shut down: ' + missingRequired.join(', ') +
+      'does not recognize and will shut down: ' +
+      missingRequired.join(', ') +
       '. Please check if a newer agent version supports these policies ' +
       'or contact support.'
   }
@@ -1526,10 +1513,10 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
 
 Config.prototype.validateFlags = function validateFlags() {
   Object.keys(this.feature_flag).forEach(function forEachFlag(key) {
-    if (feature_flag.released.indexOf(key) > -1) {
+    if (featureFlag.released.indexOf(key) > -1) {
       logger.warn('Feature flag %s has been released', key)
     }
-    if (feature_flag.unreleased.indexOf(key) > -1) {
+    if (featureFlag.unreleased.indexOf(key) > -1) {
       logger.warn('Feature flag %s has been deprecated', key)
     }
   })
@@ -1556,9 +1543,9 @@ function redactValue(value) {
  * @return Object containing simple key-value pairs of settings
  */
 Config.prototype.publicSettings = function publicSettings() {
-  var settings = Object.create(null)
+  let settings = Object.create(null)
 
-  for (var key in this) {
+  for (const key in this) {
     if (this.hasOwnProperty(key) && !REMOVE_BEFORE_SEND.has(key)) {
       if (HSM.REDACT_BEFORE_SEND.has(key)) {
         const value = this[key]
@@ -1596,6 +1583,19 @@ Config.prototype.getAggregatorConfig = function getAggregatorConfig(method) {
   }
 }
 
+Config.prototype._warnDeprecations = function _warnDeprecations() {
+  // DT overrides CAT so only warn when CAT is actually used.
+  if (this.cross_application_tracer.enabled && !this.distributed_tracing.enabled) {
+    const deprecationWarning = [
+      '[Deprecation Warning]: Cross Application Tracing (CAT) has been deprecated and will be ',
+      'removed in a future major release. CAT has been replaced by Distributed Tracing (DT). ',
+      'Enable DT by setting distributed_tracing: { enabled: true }.'
+    ].join('')
+
+    logger.infoOnce('Deprecation:CAT', deprecationWarning)
+  }
+}
+
 /**
  * Create a configuration, either from a configuration file or the node
  * process's environment.
@@ -1626,7 +1626,9 @@ function initialize(config) {
    */
   logger = require('../logger')
 
-  if (config) return new Config(config)
+  if (config) {
+    return new Config(config)
+  }
 
   if (isTruthular(process.env.NEW_RELIC_NO_CONFIG_FILE)) {
     logger.info('NEW_RELIC_NO_CONFIG_FILE set, deferring to environment variables.')
@@ -1634,31 +1636,36 @@ function initialize(config) {
     return createNewConfigObject(config)
   }
 
-  var filepath = _findConfigFile()
+  const filepath = _findConfigFile()
   if (!filepath) {
-    logger.info(['Unable to find configuration file.',
-      'If a configuration file is desired (common for non-containerized environments),',
-      `a base configuration file can be copied from ${BASE_CONFIG_PATH}`,
-      'and renamed to "newrelic.js" in the directory from which you will start',
-      'your application.',
-      'Attempting to start agent using environment variables.'
-    ].join(' '))
+    logger.info(
+      [
+        'Unable to find configuration file.',
+        'If a configuration file is desired (common for non-containerized environments),',
+        `a base configuration file can be copied from ${BASE_CONFIG_PATH}`,
+        'and renamed to "newrelic.js" in the directory from which you will start',
+        'your application.',
+        'Attempting to start agent using environment variables.'
+      ].join(' ')
+    )
 
     return createNewConfigObject(config)
   }
 
-  var userConf
+  let userConf
   try {
     userConf = require(filepath).config
   } catch (error) {
     logger.error(error)
 
-    logger.warn([
-      `Unable to read existing configuration file "${filepath}".`,
-      'To allow reading of the file (if desired),',
-      'please ensure the application has read access and the file is exporting valid JSON.',
-      'Attempting to start agent using enviornment variables.'
-    ].join(' '))
+    logger.warn(
+      [
+        `Unable to read existing configuration file "${filepath}".`,
+        'To allow reading of the file (if desired),',
+        'please ensure the application has read access and the file is exporting valid JSON.',
+        'Attempting to start agent using enviornment variables.'
+      ].join(' ')
+    )
   }
 
   if (!userConf) {
@@ -1679,7 +1686,9 @@ function initialize(config) {
  */
 function createNewConfigObject(config) {
   config = new Config(Object.create(null))
-  if (config.newrelic_home) delete config.newrelic_home
+  if (config.newrelic_home) {
+    delete config.newrelic_home
+  }
   return config
 }
 
@@ -1700,7 +1709,7 @@ function getOrCreateInstance() {
 
       // Config construction has potential to throw due to invalid settings.
       // This allows the agent to return a stub api without crashing the process.
-      _configInstance = Object.assign(defaultConfig(), {agent_enabled: false})
+      _configInstance = Object.assign(defaultConfig(), { agent_enabled: false })
       _configInstance.setLogger = Config.prototype.setLogger
     }
   }
@@ -1716,8 +1725,6 @@ function createInstance(config) {
   return _configInstance
 }
 
-const REMOVE_BEFORE_SEND = new Set(['attributeFilter'])
-
 /**
  * Preserve the legacy initializer, but also allow consumers to manage their
  * own configuration if they choose.
@@ -1726,6 +1733,5 @@ Config.initialize = initialize
 Config.getOrCreateInstance = getOrCreateInstance
 Config.getInstance = getInstance
 Config.createInstance = createInstance
-Config.SPAN_EVENT_LIMIT = SPAN_EVENT_LIMIT
 
 module.exports = Config