newrelic 7.5.2 → 8.3.0

package/lib/config/attribute-filter.js

@@ -25,22 +25,20 @@ DESTINATIONS.TRANS_SCOPE =
 DESTINATIONS.SEGMENT_SCOPE = DESTINATIONS.SPAN_EVENT | DESTINATIONS.TRANS_SEGMENT
 
 DESTINATIONS.TRANS_COMMON =
-  DESTINATIONS.TRANS_EVENT |
-  DESTINATIONS.TRANS_TRACE |
-  DESTINATIONS.ERROR_EVENT
+  DESTINATIONS.TRANS_EVENT | DESTINATIONS.TRANS_TRACE | DESTINATIONS.ERROR_EVENT
 
 DESTINATIONS.LIMITED = DESTINATIONS.TRANS_TRACE | DESTINATIONS.ERROR_EVENT
 
 const TRANS_SCOPE_DETAILS = [
-  {id: DESTINATIONS.TRANS_EVENT, key: 'TRANS_EVENT', name: 'transaction_events'},
-  {id: DESTINATIONS.TRANS_TRACE, key: 'TRANS_TRACE', name: 'transaction_tracer'},
-  {id: DESTINATIONS.ERROR_EVENT, key: 'ERROR_EVENT', name: 'error_collector'},
-  {id: DESTINATIONS.BROWSER_EVENT, key: 'BROWSER_EVENT', name: 'browser_monitoring'}
+  { id: DESTINATIONS.TRANS_EVENT, key: 'TRANS_EVENT', name: 'transaction_events' },
+  { id: DESTINATIONS.TRANS_TRACE, key: 'TRANS_TRACE', name: 'transaction_tracer' },
+  { id: DESTINATIONS.ERROR_EVENT, key: 'ERROR_EVENT', name: 'error_collector' },
+  { id: DESTINATIONS.BROWSER_EVENT, key: 'BROWSER_EVENT', name: 'browser_monitoring' }
 ]
 
 const SEGMENT_SCOPE_DETAILS = [
-  {id: DESTINATIONS.SPAN_EVENT, key: 'SPAN_EVENT', name: 'span_events'},
-  {id: DESTINATIONS.TRANS_SEGMENT, key: 'TRANS_SEGMENT', name: 'transaction_segments'}
+  { id: DESTINATIONS.SPAN_EVENT, key: 'SPAN_EVENT', name: 'span_events' },
+  { id: DESTINATIONS.TRANS_SEGMENT, key: 'TRANS_SEGMENT', name: 'transaction_segments' }
 ]
 
 const DESTINATION_DETAILS = [...TRANS_SCOPE_DETAILS, ...SEGMENT_SCOPE_DETAILS]
@@ -253,7 +251,6 @@ function _doTest(globalInclude, globalExclude, destConfig, key) {
   return (
     // If destination include is a better match than either exclude, it's in!
     (destInclude > destExclude && destInclude >= globalExclude) ||
-
     // If global include is a better match than either exclude, it's in!
     (globalInclude > destExclude && globalInclude > globalExclude)
   )
@@ -336,77 +333,88 @@ function _importRules(rules) {
  * @return {string} The rules composed into a single regular expression string.
  */
 function _convertRulesToRegex(rules) {
-  return '(?:' + rules.sort(function ruleSorter(a, b) {
-    // Step 1) Sort the rules according to match-ability. This way the regex
-    // will test the rules with the highest possible strength before weaker rules.
-
-    if (a[a.length - 1] !== '*') {
-      // If `a` is an exact rule, it should be moved up.
-      return -1
-    } else if (b[b.length - 1] !== '*') {
-      // If `b` is an exact rule and `a` is not, `b` should be moved up.
-      return 1
-    }
-
-    // Both `a` and `b` are wildcard rules, so the rule with greater length
-    // should be moved up.
-    return b.length - a.length
-  }).map(function ruleSplitter(rule) {
-    // Step 2) Escape regex special characters and split the rules into arrays.
-
-    // 'foo.bar' => ['foo', 'bar']
-    // 'foo.bang*' => ['foo', 'bang\\*']
-    // 'fizz.bang' => ['fizz', 'bang']
-    // '*' => ['\\*']
-    return rule.replace(/([.*+?|\\^$()\[\]])/g, function cleaner(m) {
-      return '\\' + m
-    }).split('.')
-  }).reduce(function ruleTransformer(collection, ruleParts) {
-    // Step 3) Merge the split rules into a single nested array, deduplicating
-    // rule sections as we go.
-
-    // ['foo', 'bar'] => [['foo\\.', ['bar']]]
-    // ['foo', 'bang\\*'] => [['foo\\.', ['bar'], ['bang']]]
-    // ['fizz', 'bang'] => [['foo\\.', ['bar'], ['bang']], ['fizz\\.', ['bang']]]
-    // ['\\*'] => [['foo\\.', ['bar'], ['bang']], ['fizz\\.', ['bang']], ['']]
-    add(collection, ruleParts, 0)
-    return collection
-    function add(c, r, i) {
-      var 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) {
-        return a[0] === v
+  return (
+    '(?:' +
+    rules
+      .sort(function ruleSorter(a, b) {
+        // Step 1) Sort the rules according to match-ability. This way the regex
+        // will test the rules with the highest possible strength before weaker rules.
+
+        if (a[a.length - 1] !== '*') {
+          // If `a` is an exact rule, it should be moved up.
+          return -1
+        } else if (b[b.length - 1] !== '*') {
+          // If `b` is an exact rule and `a` is not, `b` should be moved up.
+          return 1
+        }
+
+        // Both `a` and `b` are wildcard rules, so the rule with greater length
+        // should be moved up.
+        return b.length - a.length
       })
-      var part = c[idx]
-
-      if (idx === -1) {
-        part = [v]
-        c.push(part)
-      }
-      if (i !== r.length - 1) {
-        add(part, r, i + 1)
-      }
-    }
-  }, []).map(function rulesToRegex(part) {
-    // Step 4) Merge each of the transformed rules into a regex.
-
-    // ['foo\\.', ['bar', 'bang']] => 'foo\\.(?:bar|bang)'
-    // ['fizz\\.', ['bang']] => 'fizz\\.(?:bang)'
-    // [''] => ''
-    return mapper(part)
-    function mapper(p) {
-      if (typeof p === 'string') {
-        return p
-      } else if (p.length === 1) {
-        return mapper(p[0])
-      }
-      var first = mapper(p.shift()) // shift === pop_front
-      return first + '(?:' + p.map(mapper).join('|') + ')'
-    }
-  }).join('|') + ')' // Step 5) Merge all the regex strings into one.
+      .map(function ruleSplitter(rule) {
+        // Step 2) Escape regex special characters and split the rules into arrays.
+
+        // 'foo.bar' => ['foo', 'bar']
+        // 'foo.bang*' => ['foo', 'bang\\*']
+        // 'fizz.bang' => ['fizz', 'bang']
+        // '*' => ['\\*']
+        return rule
+          .replace(/([.*+?|\\^$()\[\]])/g, function cleaner(m) {
+            return '\\' + m
+          })
+          .split('.')
+      })
+      .reduce(function ruleTransformer(collection, ruleParts) {
+        // Step 3) Merge the split rules into a single nested array, deduplicating
+        // rule sections as we go.
+
+        // ['foo', 'bar'] => [['foo\\.', ['bar']]]
+        // ['foo', 'bang\\*'] => [['foo\\.', ['bar'], ['bang']]]
+        // ['fizz', 'bang'] => [['foo\\.', ['bar'], ['bang']], ['fizz\\.', ['bang']]]
+        // ['\\*'] => [['foo\\.', ['bar'], ['bang']], ['fizz\\.', ['bang']], ['']]
+        add(collection, ruleParts, 0)
+        return collection
+        function add(c, r, i) {
+          var 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) {
+            return a[0] === v
+          })
+          var part = c[idx]
+
+          if (idx === -1) {
+            part = [v]
+            c.push(part)
+          }
+          if (i !== r.length - 1) {
+            add(part, r, i + 1)
+          }
+        }
+      }, [])
+      .map(function rulesToRegex(part) {
+        // Step 4) Merge each of the transformed rules into a regex.
+
+        // ['foo\\.', ['bar', 'bang']] => 'foo\\.(?:bar|bang)'
+        // ['fizz\\.', ['bang']] => 'fizz\\.(?:bang)'
+        // [''] => ''
+        return mapper(part)
+        function mapper(p) {
+          if (typeof p === 'string') {
+            return p
+          } else if (p.length === 1) {
+            return mapper(p[0])
+          }
+          var first = mapper(p.shift()) // shift === pop_front
+          return first + '(?:' + p.map(mapper).join('|') + ')'
+        }
+      })
+      .join('|') +
+    ')'
+  ) // Step 5) Merge all the regex strings into one.
 }

package/lib/config/default.js

@@ -128,7 +128,7 @@ exports.config = () => ({
    *
    * @see https://docs.newrelic.com/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings
    */
-  apdex_t: 0.100,
+  apdex_t: 0.1,
 
   /**
    * When true, all request headers except for those listed in attributes.exclude
@@ -220,7 +220,6 @@ exports.config = () => ({
   },
 
   audit_log: {
-
     /**
      * Enables logging of out bound traffic from the Agent to the Collector.
      * This field is ignored if trace level logging is enabled.
@@ -293,7 +292,7 @@ exports.config = () => ({
      */
     capture_events: true,
     /**
-     * The agent will collect all error events up to this number per minute.
+     * The agent will collect all error events up to this number every 5 seconds.
      * If there are more than that, a statistical sampling will be collected.
      * Currently this uses a priority sampling algorithm.
      *
@@ -302,14 +301,17 @@ exports.config = () => ({
      * Relic servers. The memory concerns are something you should consider for
      * your own server's sake. The payload of events is compressed, but if it
      * grows too large the New Relic servers may reject it.
+     *
+     * @env NEW_RELIC_ERROR_COLLECTOR_MAX_EVENT_SAMPLES_STORED
+     *
      */
     max_event_samples_stored: 100,
 
     expected_classes: [],
     expected_messages: {},
     expected_status_codes: [],
-    ignore_classes:[],
-    ignore_messages:{}
+    ignore_classes: [],
+    ignore_messages: {}
   },
   /**
    * Error message redaction
@@ -503,9 +505,7 @@ exports.config = () => ({
      *
      * @env NEW_RELIC_IGNORING_RULES
      */
-    ignore: [
-      '^\/socket\.io\/.*\/xhr-polling/'
-    ]
+    ignore: ['^/socket.io/.*/xhr-polling/']
   },
   /**
    * By default, any transactions that are not affected by other bits of
@@ -612,7 +612,7 @@ exports.config = () => ({
      *
      * @env NEW_RELIC_API_NOTICE_ERROR
      */
-    notice_error_enabled: true,
+    notice_error_enabled: true
   },
   /**
    * Transaction Events
@@ -651,8 +651,10 @@ exports.config = () => ({
      */
     enabled: true,
     /**
-     * The agent will collect all events up to this number per minute. If
+     * The agent will collect all events up to this number every 5 seconds. If
      * there are more than that, a statistical sampling will be collected.
+     *
+     * @env NEW_RELIC_TRANSACTION_EVENTS_MAX_SAMPLES_STORED
      */
     max_samples_stored: 10000
   },
@@ -674,7 +676,7 @@ exports.config = () => ({
      */
     enabled: true,
     /**
-     * The agent will collect all events up to this number per minute. If there
+     * The agent will collect all events up to this number every 5 seconds. If there
      * are more than that, a statistical sampling will be collected. Currently
      * this uses a priority sampling algorithm.
      *
@@ -683,6 +685,9 @@ exports.config = () => ({
      * Relic servers. The memory concerns are something you should consider for
      * your own server's sake. The payload of events is compressed, but if it
      * grows too large the New Relic servers may reject it.
+     *
+     * @env NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED
+     *
      */
     max_samples_stored: 1000
   },
@@ -762,8 +767,8 @@ exports.config = () => ({
    *  Enables reporting of database/schema names. Default is `true`.
    */
   datastore_tracer: {
-    instance_reporting: {enabled: true},
-    database_name_reporting: {enabled: true}
+    instance_reporting: { enabled: true },
+    database_name_reporting: { enabled: true }
   },
 
   /**
@@ -798,7 +803,14 @@ exports.config = () => ({
        * @env NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_INCLUDE
        */
       include: []
-    }
+    },
+    /**
+     * 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_SPAN_EVENTS_MAX_SAMPLES_STORED
+     */
+    max_samples_stored: 2000
   },
 
   /**
@@ -843,7 +855,7 @@ exports.config = () => ({
      *
      * @env NEW_RELIC_DISTRIBUTED_TRACING_ENABLED
      */
-    enabled: false,
+    enabled: true,
 
     /**
      * Excludes New Relic format distributed tracing header (`newrelic`) on
@@ -862,7 +874,7 @@ exports.config = () => ({
    * @property {bool} [enabled=true]
    *  Enables tracing transactions across multiple applications. Default is `true`.
    */
-  cross_application_tracer: {enabled: true},
+  cross_application_tracer: { enabled: true },
 
   /**
    * Controls behavior of message broker tracing.
@@ -871,7 +883,7 @@ exports.config = () => ({
    *  Enables reporting parameters on message broker segments.
    */
   message_tracer: {
-    segment_parameters: {enabled: true}
+    segment_parameters: { enabled: true }
   },
 
   /**
@@ -917,6 +929,6 @@ exports.config = () => ({
      * Controls usage of the native metrics module which samples VM and event
      * loop data.
      */
-    native_metrics: {enabled: true}
+    native_metrics: { enabled: true }
   }
 })

package/lib/config/env.js

@@ -45,6 +45,7 @@ const ENV_MAPPING = {
     ignore_classes: 'NEW_RELIC_ERROR_COLLECTOR_IGNORE_ERRORS',
     expected_status_codes: 'NEW_RELIC_ERROR_COLLECTOR_EXPECTED_ERROR_CODES',
     expected_classes: 'NEW_RELIC_ERROR_COLLECTOR_EXPECTED_ERRORS',
+    max_event_samples_stored: 'NEW_RELIC_ERROR_COLLECTOR_MAX_EVENT_SAMPLES_STORED'
   },
   strip_exception_messages: {
     enabled: 'NEW_RELIC_STRIP_EXCEPTION_MESSAGES_ENABLED'
@@ -54,7 +55,11 @@ const ENV_MAPPING = {
       enabled: 'NEW_RELIC_TRANSACTION_EVENTS_ATTRIBUTES_ENABLED',
       exclude: 'NEW_RELIC_TRANSACTION_EVENTS_ATTRIBUTES_EXCLUDE',
       include: 'NEW_RELIC_TRANSACTION_EVENTS_ATTRIBUTES_INCLUDE'
-    }
+    },
+    max_samples_stored: 'NEW_RELIC_TRANSACTION_EVENTS_MAX_SAMPLES_STORED'
+  },
+  custom_insights_events: {
+    max_samples_stored: 'NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED'
   },
   transaction_tracer: {
     attributes: {
@@ -113,7 +118,7 @@ const ENV_MAPPING = {
     instance_reporting: {
       enabled: 'NEW_RELIC_DATASTORE_INSTANCE_REPORTING_ENABLED'
     },
-    database_name_reporting:{
+    database_name_reporting: {
       enabled: 'NEW_RELIC_DATASTORE_DATABASE_NAME_REPORTING_ENABLED'
     }
   },
@@ -123,7 +128,8 @@ const ENV_MAPPING = {
       enabled: 'NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_ENABLED',
       exclude: 'NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_EXCLUDE',
       include: 'NEW_RELIC_SPAN_EVENTS_ATTRIBUTES_INCLUDE'
-    }
+    },
+    max_samples_stored: 'NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED'
   },
   transaction_segments: {
     attributes: {
@@ -190,13 +196,11 @@ const LIST_VARS = new Set([
 
 // Mapping to customize the split delimiter for the LIST_VARS
 const LIST_VARS_CUSTOM_DELIMITERS = {
-  'NEW_RELIC_APP_NAME': /;|,/
+  NEW_RELIC_APP_NAME: /;|,/
 }
 
 // Values in object lists are comma-delimited object literals
-const OBJECT_LIST_VARS = new Set([
-  'NEW_RELIC_NAMING_RULES'
-])
+const OBJECT_LIST_VARS = new Set(['NEW_RELIC_NAMING_RULES'])
 
 // Values in boolean variables. Is pretty tolerant about values, but don't get
 // fancy--just use 'true' and 'false', everybody.
@@ -239,15 +243,16 @@ const BOOLEAN_VARS = new Set([
   'NEW_RELIC_NATIVE_METRICS_ENABLED'
 ])
 
-const FLOAT_VARS = new Set([
-  'NEW_RELIC_APDEX_T',
-  'NEW_RELIC_TRACER_THRESHOLD'
-])
+const FLOAT_VARS = new Set(['NEW_RELIC_APDEX_T', 'NEW_RELIC_TRACER_THRESHOLD'])
 
 const INT_VARS = new Set([
   'NEW_RELIC_EXPLAIN_THRESHOLD',
   'NEW_RELIC_MAX_SQL_SAMPLES',
-  'NEW_RELIC_INFINITE_TRACING_SPAN_EVENTS_QUEUE_SIZE'
+  'NEW_RELIC_INFINITE_TRACING_SPAN_EVENTS_QUEUE_SIZE',
+  'NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED',
+  'NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED',
+  'NEW_RELIC_TRANSACTION_EVENTS_MAX_SAMPLES_STORED',
+  'NEW_RELIC_ERROR_COLLECTOR_MAX_EVENT_SAMPLES_STORED'
 ])
 
 exports.ENV_MAPPING = ENV_MAPPING

package/lib/config/harvest-config-validator.js

@@ -21,7 +21,7 @@ function isValidHarvestConfig(harvestConfig) {
 }
 
 function isValidHarvestValue(value) {
-  const isValid = value != null && (value >= 0)
+  const isValid = value != null && value >= 0
   return !!isValid
 }