newrelic 8.3.0 → 8.5.2

package/lib/collector/http-agents.js

@@ -5,10 +5,10 @@
 
 'use strict'
 
-var parse = require('url').parse
-var ProxyAgent = require('https-proxy-agent')
-var logger = require('../logger').child({ component: 'http-agent' })
-var certificates = require('./ssl/certificates.js')
+const parse = require('url').parse
+const ProxyAgent = require('https-proxy-agent')
+const logger = require('../logger').child({ component: 'http-agent' })
+const certificates = require('./ssl/certificates.js')
 
 const https = require('https')
 
@@ -50,10 +50,10 @@ exports.proxyAgent = function proxyAgent(config) {
   if (null !== agentProxyWithKeepAlive) {
     return agentProxyWithKeepAlive
   }
-  var opts = proxyOptions(config)
-  var proxyUrl = opts.proxy_url
+  const opts = proxyOptions(config)
+  const proxyUrl = opts.proxy_url
 
-  var proxyOpts = {
+  const proxyOpts = {
     host: proxyUrl.host,
     port: proxyUrl.port,
     protocol: proxyUrl.protocol,
@@ -78,17 +78,18 @@ exports.proxyAgent = function proxyAgent(config) {
 }
 
 function proxyOptions(config) {
+  let proxyUrl
   if (config.proxy) {
-    var parsedUrl = parse(config.proxy)
+    const parsedUrl = parse(config.proxy)
 
-    var proxyUrl = {
+    proxyUrl = {
       protocol: parsedUrl.protocol || 'https:',
       host: parsedUrl.hostname,
       port: parsedUrl.port || 80,
       auth: parsedUrl.auth
     }
   } else {
-    var proxyAuth = config.proxy_user
+    let proxyAuth = config.proxy_user
     if (config.proxy_pass !== '') {
       proxyAuth += ':' + config.proxy_pass
     }
@@ -102,7 +103,7 @@ function proxyOptions(config) {
     }
   }
 
-  var opts = {
+  const opts = {
     proxy_url: proxyUrl
   }
 

package/lib/collector/key-parser.js

@@ -6,6 +6,6 @@
 'use strict'
 
 module.exports.parseKey = function parseKey(licenseKey) {
-  var regionMatch = /^(.+?)x/.exec(licenseKey)
+  const regionMatch = /^(.+?)x/.exec(licenseKey)
   return regionMatch && regionMatch[1]
 }

package/lib/collector/remote-method.js

@@ -5,16 +5,16 @@
 
 'use strict'
 
-var util = require('util')
-var url = require('url')
-var https = require('https')
-var zlib = require('zlib')
-var logger = require('../logger').child({ component: 'remote_method' })
-var parse = require('./parse-response')
-var stringify = require('json-stringify-safe')
-var Sink = require('../util/stream-sink')
-var agents = require('./http-agents')
-var certificates = require('./ssl/certificates')
+const util = require('util')
+const url = require('url')
+const https = require('https')
+const zlib = require('zlib')
+const logger = require('../logger').child({ component: 'remote_method' })
+const parse = require('./parse-response')
+const stringify = require('json-stringify-safe')
+const Sink = require('../util/stream-sink')
+const agents = require('./http-agents')
+const certificates = require('./ssl/certificates')
 const isValidLength = require('../util/byte-limit').isValidLength
 
 /*
@@ -50,8 +50,9 @@ RemoteMethod.prototype.updateEndpoint = function updateEndpoint(endpoint) {
 }
 
 RemoteMethod.prototype.serialize = function serialize(payload, callback) {
+  let res
   try {
-    var res = stringify(payload)
+    res = stringify(payload)
   } catch (error) {
     logger.error(error, 'Unable to serialize payload for method %s.', this.name)
     return process.nextTick(function onNextTick() {
@@ -102,8 +103,8 @@ RemoteMethod.prototype.invoke = function invoke(payload, nrHeaders, callback) {
  * @param {Function} callback   What to do next. Gets passed any error.
  */
 RemoteMethod.prototype._post = function _post(data, nrHeaders, callback) {
-  var method = this
-  var options = {
+  const method = this
+  const options = {
     port: this.endpoint.port,
     host: this.endpoint.host,
     compressed: this._shouldCompress(data),
@@ -121,8 +122,8 @@ RemoteMethod.prototype._post = function _post(data, nrHeaders, callback) {
   if (options.compressed) {
     // NOTE: gzip and deflate throw immediately in Node 14+ with an invalid argument
     try {
-      var useGzip = this._config.compressed_content_encoding === 'gzip'
-      var compressor = useGzip ? zlib.gzip : zlib.deflate
+      const useGzip = this._config.compressed_content_encoding === 'gzip'
+      const compressor = useGzip ? zlib.gzip : zlib.deflate
       compressor(data, function onCompress(err, compressed) {
         if (err) {
           logger.warn(err, 'Error compressing JSON for delivery. Not sending.')
@@ -197,11 +198,11 @@ RemoteMethod.prototype._safeRequest = function _safeRequest(options) {
     throw new Error('Must include URL to request!')
   }
 
-  var protocol = 'https'
-  var logConfig = this._config.logging
-  var auditLog = this._config.audit_log
+  const protocol = 'https'
+  const logConfig = this._config.logging
+  const auditLog = this._config.audit_log
   const maxPayloadSize = this._config.max_payload_size_in_bytes
-  var level = 'trace'
+  let level = 'trace'
 
   if (!isValidLength(options.body, maxPayloadSize)) {
     logger.warn(
@@ -252,7 +253,7 @@ RemoteMethod.prototype._safeRequest = function _safeRequest(options) {
  *                                      ._post).
  */
 RemoteMethod.prototype._request = function _request(options) {
-  var requestOptions = {
+  const requestOptions = {
     method: this._config.put_for_data_send ? 'PUT' : 'POST',
     setHost: false, // See below
     host: options.host, // Set explicitly in the headers
@@ -262,9 +263,9 @@ RemoteMethod.prototype._request = function _request(options) {
     agent: agents.keepAliveAgent(),
     __NR__connection: true // Who measures the metrics measurer?
   }
-  var request
+  let request
 
-  var isProxy = !!(this._config.proxy || this._config.proxy_port || this._config.proxy_host)
+  const isProxy = !!(this._config.proxy || this._config.proxy_port || this._config.proxy_host)
 
   if (isProxy) {
     // proxy
@@ -317,7 +318,7 @@ RemoteMethod.prototype._userAgent = function _userAgent() {
  * @returns {string} The URL path to be POSTed to.
  */
 RemoteMethod.prototype._path = function _path() {
-  var query = {
+  const query = {
     marshal_format: 'json',
     protocol_version: this._protocolVersion,
     license_key: this._config.license_key,
@@ -328,7 +329,7 @@ RemoteMethod.prototype._path = function _path() {
     query[RUN_ID_NAME] = this._config.run_id
   }
 
-  var formatted = url.format({
+  const formatted = url.format({
     pathname: RAW_METHOD_PATH,
     query: query
   })
@@ -343,9 +344,9 @@ RemoteMethod.prototype._path = function _path() {
  * @param {bool}   options.compressed - The compression method used, if any.
  */
 RemoteMethod.prototype._headers = function _headers(options) {
-  var agent = this._userAgent()
+  const agent = this._userAgent()
 
-  var headers = {
+  const headers = {
     // select the virtual host on the server end
     'Host': this.endpoint.host,
     'User-Agent': agent,

package/lib/config/attribute-filter.js

@@ -5,9 +5,9 @@
 
 'use strict'
 
-var NO_MATCH = -Infinity
-var EXACT_MATCH = Infinity
-var DESTINATIONS = {
+const NO_MATCH = -Infinity
+const EXACT_MATCH = Infinity
+const DESTINATIONS = {
   NONE: 0x00,
   TRANS_EVENT: 0x01,
   TRANS_TRACE: 0x02,
@@ -62,7 +62,7 @@ function AttributeFilter(config) {
   this._cachedCount = 0
   this._enabledDestinations = DESTINATIONS.NONE
 
-  var updater = this.update.bind(this)
+  const updater = this.update.bind(this)
 
   // Add the global rules.
   config.on('attributes.enabled', updater)
@@ -140,21 +140,21 @@ AttributeFilter.prototype._filter = function _filter(scope, destinations, key) {
   }
 
   // These are lazy computed to avoid calculating them for cached results.
-  var globalInclude = null
-  var globalExclude = null
+  let globalInclude = null
+  let globalExclude = null
 
   // Iterate over each destination and see if the rules apply.
-  for (var i = 0; i < scope.length; ++i) {
-    var dest = scope[i]
-    var destId = dest.id
-    var destName = dest.name
+  for (let i = 0; i < scope.length; ++i) {
+    const dest = scope[i]
+    const destId = dest.id
+    const destName = dest.name
     if (!(this._enabledDestinations & destId)) {
       destinations &= ~destId // Remove this destination.
       continue
     }
 
     // Check for a cached result for this key.
-    var result = this._cache[destName][key]
+    let result = this._cache[destName][key]
     if (result === undefined) {
       if (globalInclude === null) {
         globalInclude = _matchRules(this._rules.global.include, key)
@@ -162,7 +162,7 @@ AttributeFilter.prototype._filter = function _filter(scope, destinations, key) {
       }
 
       // Freshly calculate this attribute.
-      var result = _doTest(globalInclude, globalExclude, this._rules[destName], key)
+      result = _doTest(globalInclude, globalExclude, this._rules[destName], key)
       if (this._cachedCount < this.config.attributes.filter_cache_limit) {
         this._cache[destName][key] = result
         ++this._cachedCount
@@ -195,7 +195,7 @@ AttributeFilter.prototype.update = function update() {
 
   // And all the destination rules.
   DESTINATION_DETAILS.forEach(function forEachDestination(dest) {
-    var name = dest.name
+    const name = dest.name
     if (!this.config[name].attributes.enabled) {
       return
     }
@@ -222,7 +222,7 @@ function _doTest(globalInclude, globalExclude, destConfig, key) {
   if (globalExclude === EXACT_MATCH) {
     return false
   }
-  var destExclude = _matchRules(destConfig.exclude, key)
+  const destExclude = _matchRules(destConfig.exclude, key)
   if (destExclude === EXACT_MATCH) {
     return false
   }
@@ -231,7 +231,7 @@ function _doTest(globalInclude, globalExclude, destConfig, key) {
   if (globalInclude === EXACT_MATCH) {
     return true
   }
-  var destInclude = _matchRules(destConfig.include, key)
+  const destInclude = _matchRules(destConfig.include, key)
   if (destInclude === EXACT_MATCH) {
     return true
   }
@@ -276,7 +276,7 @@ function _matchRules(rules, key) {
     return EXACT_MATCH
   }
 
-  var wildcard = rules.wildcard
+  const wildcard = rules.wildcard
   if (!wildcard) {
     return NO_MATCH
   }
@@ -296,12 +296,12 @@ function _matchRules(rules, key) {
  * `RegExp` instances for testing keys.
  */
 function _importRules(rules) {
-  var out = {
+  const out = {
     exact: null,
     wildcard: null
   }
-  var exactRules = []
-  var wildcardRules = []
+  const exactRules = []
+  const wildcardRules = []
   rules.forEach(function separateRules(rule) {
     if (rule[rule.length - 1] === '*') {
       wildcardRules.push(rule)
@@ -376,17 +376,17 @@ function _convertRulesToRegex(rules) {
         add(collection, ruleParts, 0)
         return collection
         function add(c, r, i) {
-          var v = r[i]
+          let v = r[i]
           if (i !== r.length - 1) {
             v += '.'
           } else if (/\\\*$/.test(v)) {
             v = v.substr(0, v.length - 2)
           }
 
-          var idx = c.findIndex(function findV(a) {
+          const idx = c.findIndex(function findV(a) {
             return a[0] === v
           })
-          var part = c[idx]
+          let part = c[idx]
 
           if (idx === -1) {
             part = [v]
@@ -410,7 +410,7 @@ function _convertRulesToRegex(rules) {
           } else if (p.length === 1) {
             return mapper(p[0])
           }
-          var first = mapper(p.shift()) // shift === pop_front
+          const first = mapper(p.shift()) // shift === pop_front
           return first + '(?:' + p.map(mapper).join('|') + ')'
         }
       })

package/lib/config/default.js

@@ -292,7 +292,7 @@ exports.config = () => ({
      */
     capture_events: true,
     /**
-     * The agent will collect all error events up to this number every 5 seconds.
+     * The agent will collect all error events up to this number per minute.
      * If there are more than that, a statistical sampling will be collected.
      * Currently this uses a priority sampling algorithm.
      *
@@ -651,7 +651,7 @@ exports.config = () => ({
      */
     enabled: true,
     /**
-     * The agent will collect all events up to this number every 5 seconds. If
+     * The agent will collect all events up to this number per minute. If
      * there are more than that, a statistical sampling will be collected.
      *
      * @env NEW_RELIC_TRANSACTION_EVENTS_MAX_SAMPLES_STORED
@@ -676,7 +676,7 @@ exports.config = () => ({
      */
     enabled: true,
     /**
-     * The agent will collect all events up to this number every 5 seconds. If there
+     * The agent will collect all events up to this number per minute. If there
      * are more than that, a statistical sampling will be collected. Currently
      * this uses a priority sampling algorithm.
      *
@@ -759,11 +759,11 @@ exports.config = () => ({
   /**
    * Controls behavior of datastore instance metrics.
    *
-   * @property {bool} [instance_reporting.enabled=true]
+   * @property {Boolean} [instance_reporting.enabled=true]
    *  Enables reporting the host and port/path/id of database servers. Default
    *  is `true`.
    *
-   * @property {bool} [database_name_reporting.enabled=true]
+   * @property {Boolean} [database_name_reporting.enabled=true]
    *  Enables reporting of database/schema names. Default is `true`.
    */
   datastore_tracer: {
@@ -847,7 +847,7 @@ exports.config = () => ({
    * distributed system. Enabling distributed tracing changes the behavior of some
    * New Relic features, so carefully consult the transition guide before you enable
    * this feature: https://docs.newrelic.com/docs/transition-guide-distributed-tracing
-   * Default is false.
+   * Default is true.
    */
   distributed_tracing: {
     /**
@@ -871,15 +871,17 @@ exports.config = () => ({
   /**
    * Controls the use of cross-application tracing.
    *
-   * @property {bool} [enabled=true]
-   *  Enables tracing transactions across multiple applications. Default is `true`.
+   * @property {Boolean} [enabled=false]
+   * Enables tracing transactions across multiple applications. Default is `false`.
+   * This feature has been deprecated in favor of Distributed Tracing (DT).
+   * To fully enable this feature, you must also disable DT in your configuration.
    */
-  cross_application_tracer: { enabled: true },
+  cross_application_tracer: { enabled: false },
 
   /**
    * Controls behavior of message broker tracing.
    *
-   * @property {bool} [segment_parameters.enabled=true]
+   * @property {Boolean} [segment_parameters.enabled=true]
    *  Enables reporting parameters on message broker segments.
    */
   message_tracer: {

package/lib/config/hsm.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-var flatten = require('../util/flatten')
+const flatten = require('../util/flatten')
 
 // Config keys that can't be set by the server if high_security is enabled
 const HIGH_SECURITY_SETTINGS = {