newrelic 8.2.0 → 8.3.0

package/THIRD_PARTY_NOTICES.md

@@ -46,7 +46,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [eslint-plugin-prettier](#eslint-plugin-prettier)
 * [eslint](#eslint)
 * [express](#express)
-* [fastify](#fastify)
 * [generic-pool](#generic-pool)
 * [glob](#glob)
 * [got](#got)
@@ -2348,38 +2347,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ```
 
-### fastify
-
-This product includes source derived from [fastify](https://github.com/fastify/fastify) ([v2.15.3](https://github.com/fastify/fastify/tree/v2.15.3)), distributed under the [MIT License](https://github.com/fastify/fastify/blob/v2.15.3/LICENSE):
-
-```
-MIT License
-
-Copyright (c) 2016-2020 The Fastify Team
-
-The Fastify team members are listed at https://github.com/fastify/fastify#team
-and in the README file.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-```
-
 ### generic-pool
 
 This product includes source derived from [generic-pool](https://github.com/coopernurse/node-pool) ([v3.8.2](https://github.com/coopernurse/node-pool/tree/v3.8.2)), distributed under the [MIT License](https://github.com/coopernurse/node-pool/blob/v3.8.2/README.md):

package/lib/collector/facts.js

@@ -10,7 +10,6 @@ const fetchSystemInfo = require('../system-info')
 const logger = require('../logger').child({ component: 'facts' })
 const os = require('os')
 const parseLabels = require('../util/label-parser')
-const Config = require('../config/')
 
 module.exports = facts
 
@@ -64,7 +63,7 @@ function facts(agent, callback) {
           analytic_event_data: agent.config.transaction_events.max_samples_stored,
           custom_event_data: agent.config.custom_insights_events.max_samples_stored,
           error_event_data: agent.config.error_collector.max_event_samples_stored,
-          span_event_data: Config.SPAN_EVENT_LIMIT
+          span_event_data: agent.config.span_events.max_samples_stored
         }
       }
 

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 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.
      *
@@ -301,6 +301,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_ERROR_COLLECTOR_MAX_EVENT_SAMPLES_STORED
+     *
      */
     max_event_samples_stored: 100,
 
@@ -648,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
   },
@@ -671,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.
      *
@@ -680,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
   },
@@ -795,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
   },
 
   /**
@@ -840,7 +855,7 @@ exports.config = () => ({
      *
      * @env NEW_RELIC_DISTRIBUTED_TRACING_ENABLED
      */
-    enabled: false,
+    enabled: true,
 
     /**
      * Excludes New Relic format distributed tracing header (`newrelic`) on

package/lib/config/env.js

@@ -44,7 +44,8 @@ const ENV_MAPPING = {
     ignore_status_codes: 'NEW_RELIC_ERROR_COLLECTOR_IGNORE_ERROR_CODES',
     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'
+    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: {
@@ -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: {
@@ -242,7 +248,11 @@ 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/index.js

@@ -29,7 +29,6 @@ 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'])
 
@@ -183,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
       }
     }
   }
@@ -544,6 +543,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':
@@ -1711,6 +1717,5 @@ Config.initialize = initialize
 Config.getOrCreateInstance = getOrCreateInstance
 Config.getInstance = getInstance
 Config.createInstance = createInstance
-Config.SPAN_EVENT_LIMIT = SPAN_EVENT_LIMIT
 
 module.exports = Config

package/lib/instrumentation/fastify.js

@@ -43,12 +43,6 @@ const setupRouteHandler = (shim, fastify) => {
 }
 
 const setupMiddlewareHandlers = (shim, fastify) => {
-  // Don't wrap use() in fastify v3+
-  const fastifyVersion = shim.require('./package.json').version
-  if (semver.satisfies(fastifyVersion, '>=3.0.0')) {
-    return
-  }
-
   shim.wrap(fastify, 'use', function wrapFastifyUse(shim, fn) {
     return function wrappedFastifyUser() {
       const args = shim.argsToArray.apply(shim, arguments)
@@ -70,10 +64,14 @@ module.exports = function initialize(agent, fastify, moduleName, shim) {
     return
   }
   shim.setFramework(shim.FASTIFY)
+
+  const fastifyVersion = shim.require('./package.json').version
+  const isv3Plus = semver.satisfies(fastifyVersion, '>=3.0.0')
+
   /**
    * Fastify exports a function, so we need to use wrapExport
    */
-  shim.wrapExport(fastify, function wrapFastifyModule(shim, fn) {
+  const wrappedExport = shim.wrapExport(fastify, function wrapFastifyModule(shim, fn) {
     return function wrappedFastifyModule() {
       // normalize arguments
       const args = shim.argsToArray.apply(shim, arguments)
@@ -83,9 +81,33 @@ module.exports = function initialize(agent, fastify, moduleName, shim) {
 
       setupRouteHandler(shim, fastifyForWrapping)
 
-      setupMiddlewareHandlers(shim, fastifyForWrapping)
+      // Don't wrap use() in fastify v3+
+      if (!isv3Plus) {
+        setupMiddlewareHandlers(shim, fastifyForWrapping)
+      }
 
       return fastifyForWrapping
     }
   })
+
+  if (isv3Plus) {
+    setupExports(fastify, wrappedExport)
+  }
+}
+
+/**
+ * module.exports = fastify
+ * module.exports.fastify = fastify
+ * module.exports.default = fastify
+ */
+function setupExports(original, wrappedExport) {
+  wrappedExport.fastify = original.fastify
+
+  if (original.fastify) {
+    wrappedExport.fastify = wrappedExport
+  }
+
+  if (original.default) {
+    wrappedExport.default = wrappedExport
+  }
 }

package/lib/instrumentation/mongodb/common.js

@@ -5,9 +5,8 @@
 
 'use strict'
 const { CURSOR_OPS, COLLECTION_OPS, DB_OPS } = require('./constants')
-const { URL } = require('url')
-
 const common = module.exports
+common.NR_ATTRS = Symbol('NR_ATTRS')
 
 /**
  * Instruments all methods from constants.CURSOR_OPS on a given
@@ -24,7 +23,7 @@ common.instrumentCursor = function instrumentCursor(shim, Cursor) {
     }
 
     shim.recordQuery(proto, 'each', common.makeQueryDescFunc(shim, 'each'))
-    shim.recordOperation(proto, 'pipe')
+    shim.recordOperation(proto, 'pipe', { opaque: true })
   }
 }
 
@@ -97,18 +96,16 @@ common.captureAttributesOnStarted = function captureAttributesOnStarted(shim, in
     // out of an excess of caution.
     const connId = evnt.connectionId
     if (connId) {
-      // Mongo sticks the path to the domain socket in the "host" slot, but we
-      // want it in the "port", so if we have a domain socket we need to change
-      // the order of our parameters.
-      if (typeof connId === 'string') {
-        const parts = connId.split(':')
-        if (parts.length && parts[0][0] === '/') {
-          shim.captureInstanceAttributes('localhost', parts[0], evnt.databaseName)
-        } else {
-          shim.captureInstanceAttributes(parts[0], parts[1], evnt.databaseName)
-        }
+      // used in v3 when connection is a cluster pool
+      if (typeof connId === 'number') {
+        setHostPort(shim, evnt.address, evnt.databaseName, this.$MongoClient)
+        // used in v3 when connection is to 1 host
+      } else if (typeof connId === 'string') {
+        setHostPort(shim, connId, evnt.databaseName)
+        // v2 contains `domainSocket`, get socket connection from `host`
       } else if (connId.domainSocket) {
         shim.captureInstanceAttributes('localhost', connId.host, evnt.databaseName)
+        // v2 remote connection get `host` `port` from respective properties
       } else {
         shim.captureInstanceAttributes(connId.host, connId.port, evnt.databaseName)
       }
@@ -116,6 +113,41 @@ common.captureAttributesOnStarted = function captureAttributesOnStarted(shim, in
   })
 }
 
+/**
+ * Extracts the host and port from a connection string
+ * This also handles if connection string is a domain socket
+ * Mongo sticks the path to the domain socket in the "host" slot, but we
+ * want it in the "port", so if we have a domain socket we need to change
+ * the order of our parameters.
+ *
+ * @param {Shim} shim
+ * @param {string} connStr
+ * @param {string} db database name
+ * @param {Object} client mongo client instance
+ */
+function setHostPort(shim, connStr, db, client) {
+  const parts = connStr.split(':')
+  // in v3 when running with a cluster of socket connections
+  // the address is `undefined:undefined`. we will instead attempt
+  // to get connection details from the client symbol NR_ATTRS
+  // added in `lib/instrumentation/mongodb/v3-mongo` when a client connects
+  // with a URL string
+  if (parts.includes('undefined')) {
+    try {
+      const attrs = client[common.NR_ATTRS]
+      const socket = decodeURIComponent(attrs.split(',')[0].split('mongodb://')[1])
+      shim.captureInstanceAttributes('localhost', socket, db)
+    } catch (err) {
+      shim.logger.debug(err, 'Could not extract host/port from mongo command')
+    }
+    // connected using domain socket but the "host"(e.g: /path/to/mongo-socket-port.sock)
+  } else if (parts.length && parts[0][0] === '/') {
+    shim.captureInstanceAttributes('localhost', parts[0], db)
+  } else {
+    shim.captureInstanceAttributes(parts[0], parts[1], db)
+  }
+}
+
 /**
  * Get the database_name, host, port_path_or_id
  * for the query segment. v4 refactored where the toplogy is stored.
@@ -136,13 +168,15 @@ function getInstanceAttributeParameters(shim, obj) {
     obj.s.db.s &&
     obj.s.db.s.client &&
     obj.s.db.s.client.s &&
-    obj.s.db.s.client.s.url
+    obj.s.db.s.client.s.options &&
+    obj.s.db.s.client.s.options.hosts &&
+    obj.s.db.s.client.s.options.hosts.length
   ) {
-    let { hostname: host, port } = new URL(obj.s.db.s.client.s.url)
-    if (host.endsWith('.sock')) {
-      // socket path is uri encoded
-      // decode it to properly name attrs
-      port = decodeURIComponent(host)
+    // hosts is an array but we will always pull the first for consistency
+    let [{ host, port, socketPath }] = obj.s.db.s.client.s.options.hosts
+
+    if (socketPath) {
+      port = socketPath
       host = 'localhost'
     }
     return {
@@ -160,12 +194,17 @@ function getInstanceAttributeParameters(shim, obj) {
   }
 
   function doCapture(conf, database) {
-    let host = conf.host
-    let port = conf.port
+    let host = null
+    let port = null
+
+    // servers is an array but we will always pull the first for consistency
+    if (conf.servers && conf.servers.length) {
+      ;[{ host, port }] = conf.servers
+    }
 
-    // If using a domain socket, mongo stores the path as the host name, but we
-    // pass it through the port value.
-    if ((conf.socketOptions && conf.socketOptions.domainSocket) || /\.sock$/.test(host)) {
+    // host is a domain socket. set host as localhost and use the domain
+    // socket host as the port
+    if (host && host.endsWith('.sock')) {
       port = host
       host = 'localhost'
     }

package/lib/instrumentation/mongodb/v3-mongo.js

@@ -9,7 +9,8 @@ const {
   captureAttributesOnStarted,
   instrumentCollection,
   instrumentCursor,
-  instrumentDb
+  instrumentDb,
+  NR_ATTRS
 } = require('./common')
 
 /**
@@ -30,6 +31,23 @@ function queryParser(operation) {
   return { operation, collection }
 }
 
+/**
+ * Records the `mongo.MongoClient.connect` operations. It also adds the first arg of connect(url)
+ * to a Symbol on the MongoClient to be used later to extract the host/port in cases where the topology
+ * is a cluster of domain sockets
+ *
+ * @param {Shim} shim
+ * @param {Object} mongodb resolved package
+ */
+function instrumentClient(shim, mongodb) {
+  shim.recordOperation(mongodb.MongoClient, 'connect', function wrappedConnect(shim, _, __, args) {
+    // Add the connection url to the MongoClient to retrieve later in the `lib/instrumentation/mongo/common`
+    // captureAttributesOnStarted listener
+    this[NR_ATTRS] = args[0]
+    return { callback: shim.LAST }
+  })
+}
+
 /**
  * Registers relevant instrumentation for mongo >= 3.0.6
  * In 3.0.6 they refactored their "APM" module which removed
@@ -44,6 +62,7 @@ function queryParser(operation) {
  */
 module.exports = function instrument(shim, mongodb) {
   shim.setParser(queryParser)
+  instrumentClient(shim, mongodb)
   const instrumenter = mongodb.instrument(Object.create(null), () => {})
   captureAttributesOnStarted(shim, instrumenter)
   instrumentCursor(shim, mongodb.Cursor)

package/lib/instrumentation/mongodb/v4-mongo.js

@@ -36,15 +36,14 @@ function cmdStartedHandler(shim, evnt) {
   if (evnt.connectionId) {
     let [host, port] = evnt.address.split(':')
 
-    // connection via socket get port from client.url
-    // which looks like "mongodb://%2Ftmp%2Fmongodb-27017.sock"
+    // connection via socket get port from 1st host
+    // socketPath property
+    // which looks like mongodb:///tmp/mongodb-27017.sock"
     if (['undefined'].includes(host, port)) {
       host = 'localhost'
-      // socket path is uri encoded
-      // decode it to properly name attrs
-      const socketPath = this.s.url.split(':')
-      if (socketPath.length && socketPath[1].startsWith('//')) {
-        port = decodeURIComponent(socketPath[1].substr(2))
+      const hosts = this.s.options.hosts
+      if (hosts && hosts.length && hosts[0].socketPath) {
+        port = hosts[0].socketPath
       }
     } else if (host === '127.0.0.1') {
       host = 'localhost'

package/lib/metrics/names.js

@@ -230,10 +230,13 @@ const DISTRIBUTED_TRACE = {
   TRANSPORT: 'TransportDuration'
 }
 
+const SPAN_EVENT_PREFIX = 'SpanEvent/'
+
 const SPAN_EVENTS = {
-  SEEN: SUPPORTABILITY.PREFIX + 'SpanEvent/TotalEventsSeen',
-  SENT: SUPPORTABILITY.PREFIX + 'SpanEvent/TotalEventsSent',
-  DROPPED: SUPPORTABILITY.PREFIX + 'SpanEvent/Discarded'
+  SEEN: SUPPORTABILITY.PREFIX + SPAN_EVENT_PREFIX + 'TotalEventsSeen',
+  SENT: SUPPORTABILITY.PREFIX + SPAN_EVENT_PREFIX + 'TotalEventsSent',
+  DROPPED: SUPPORTABILITY.PREFIX + SPAN_EVENT_PREFIX + 'Discarded',
+  LIMIT: SUPPORTABILITY.PREFIX + SPAN_EVENT_PREFIX + 'Limit'
 }
 
 const INFINITE_TRACING = {

package/lib/spans/span-event-aggregator.js

@@ -5,12 +5,14 @@
 
 'use strict'
 
-const logger = require('../logger')
-let spanLogger = null
+const logger = require('../logger').child({ component: 'span_aggregator' })
 const EventAggregator = require('../aggregators/event-aggregator')
 const SpanEvent = require('./span-event')
 const NAMES = require('../metrics/names')
-const LIMIT = 1000
+
+const DEFAULT_SPAN_EVENT_LIMIT = 2000
+// Used only when server value missing
+const SPAN_EVENT_FALLBACK_MAX_LIMIT = 10000
 
 class SpanEventAggregator extends EventAggregator {
   constructor(opts, collector, metrics) {
@@ -18,8 +20,6 @@ class SpanEventAggregator extends EventAggregator {
     opts.method = opts.method || 'span_event_data'
     opts.metricNames = opts.metricNames || NAMES.SPAN_EVENTS
 
-    spanLogger = logger.child({ component: 'span_aggregator' })
-
     super(opts, collector, metrics)
   }
 
@@ -27,7 +27,7 @@ class SpanEventAggregator extends EventAggregator {
     const events = this.events
 
     if (events.length === 0) {
-      spanLogger.debug('No span events to send.')
+      logger.debug('No span events to send.')
       return
     }
 
@@ -46,8 +46,8 @@ class SpanEventAggregator extends EventAggregator {
   }
 
   send() {
-    if (spanLogger.traceEnabled()) {
-      spanLogger.trace(
+    if (logger.traceEnabled()) {
+      logger.trace(
         {
           spansCollected: this.length,
           spansSeen: this.seen
@@ -64,7 +64,7 @@ class SpanEventAggregator extends EventAggregator {
    * @param {TraceSegment}  segment         - The segment to add.
    * @param {string}        [parentId=null] - The GUID of the parent span.
    *
-   * @return {bool} True if the segment was added, or false if it was discarded.
+   * @return {boolean} True if the segment was added, or false if it was discarded.
    */
   addSegment(segment, parentId, isRoot) {
     // Check if the priority would be accepted before creating the event object.
@@ -79,7 +79,59 @@ class SpanEventAggregator extends EventAggregator {
     const span = SpanEvent.fromSegment(segment, parentId || null, isRoot)
     return this.add(span, tx.priority)
   }
+
+  /**
+   * Reconfigure the `SpanEventAggregator` based on values from server
+   *
+   * @param {Config} config
+   */
+  reconfigure(config) {
+    super.reconfigure(config)
+
+    const { periodMs, limit } = this._getValidSpanConfiguration(config)
+
+    this.periodMs = periodMs
+    this.limit = limit
+    this._metrics.getOrCreateMetric(this._metricNames.LIMIT).recordValue(this.limit)
+    this._items.setLimit(this.limit)
+  }
+
+  /**
+   * Retrieves report period and harvest limits defined in `span_event_harvest_config`.
+   * When no `span_event_harvest_config` has been received from the server, applies an
+   * agent-defined fallback maximum to protect against collecting and sending too many spans.
+   *
+   * @param {Config} config
+   */
+  _getValidSpanConfiguration(config) {
+    const spanHarvestConfig = config.span_event_harvest_config
+    if (spanHarvestConfig) {
+      logger.trace('Using span_event_harvest_config values.')
+
+      return {
+        periodMs: spanHarvestConfig.report_period_ms,
+        limit: spanHarvestConfig.harvest_limit
+      }
+    }
+
+    const configuredLimit = config.span_events.max_samples_stored || DEFAULT_SPAN_EVENT_LIMIT
+
+    return {
+      periodMs: this.defaultPeriod,
+      limit: _enforceMaxLimit(configuredLimit, SPAN_EVENT_FALLBACK_MAX_LIMIT)
+    }
+  }
+}
+
+function _enforceMaxLimit(currentLimit, maxLimit) {
+  let spanLimit = currentLimit
+  if (spanLimit > maxLimit) {
+    spanLimit = maxLimit
+
+    logger.debug('Using maximum allowed span event limit of %s', maxLimit)
+  }
+
+  return spanLimit
 }
 
 module.exports = SpanEventAggregator
-module.exports.LIMIT = LIMIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "8.2.0",
+  "version": "8.3.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -186,7 +186,6 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.0",
     "express": "*",
-    "fastify": "^2.15.3",
     "generic-pool": "^3.6.1",
     "glob": "^7.1.2",
     "got": "^8.0.1",