newrelic 11.10.3 → 11.10.4

package/NEWS.md

@@ -1,3 +1,23 @@
+### v11.10.4 (2024-02-13)
+
+#### Bug fixes
+
+* Resolved application logs getting blocked when an excessive payload is encountered ([#2013](https://github.com/newrelic/node-newrelic/pull/2013)) ([365ded4](https://github.com/newrelic/node-newrelic/commit/365ded432b7781ee9c896bf0e067dac8cc2c45cc))
+* Updated Shim to properly calculate the `_moduleRoot` on windows environments ([#2014](https://github.com/newrelic/node-newrelic/pull/2014)) ([ab0bd7f](https://github.com/newrelic/node-newrelic/commit/ab0bd7f87a5ed6ea38f51f068a2fc066af8f8d74))
+
+#### Code refactoring
+
+* Abstracted registering of new aggregators into a Harvester class that is responsible for starting, stopping, updating all registered aggregators. ([#1994](https://github.com/newrelic/node-newrelic/pull/1994)) ([1fb85a6](https://github.com/newrelic/node-newrelic/commit/1fb85a6f97c522ce2951911c670fcbddaa218049))
+* Refactored specs into classes for easier code navigation ([#2004](https://github.com/newrelic/node-newrelic/pull/2004)) ([4daedc0](https://github.com/newrelic/node-newrelic/commit/4daedc08c707bec22056466ef15a45b50f20026f))
+
+#### Miscellaneous chores
+
+* **deps:** Updated @newrelic/security agent to v1.0.1 ([#2002](https://github.com/newrelic/node-newrelic/pull/2002)) ([b460c7b](https://github.com/newrelic/node-newrelic/commit/b460c7be589dd6fa801285b756bf66f62e0f10aa))
+
+#### Tests
+
+* Updated smoke tests to send data to the appropriate collector method ([#2005](https://github.com/newrelic/node-newrelic/pull/2005)) ([6130486](https://github.com/newrelic/node-newrelic/commit/6130486514268b02f68dccceb9b1e29d1e99c78e))
+
 ### v11.10.3 (2024-02-07)
 
 #### Features

package/README.md

@@ -242,7 +242,9 @@ To [all contributors](https://github.com/newrelic/node-newrelic/graphs/contribut
 
 ## License
 
-The Node.js agent is licensed under the [Apache 2.0](https://apache.org/licenses/LICENSE-2.0.txt) License.
+Except as noted below, the Node.js agent is licensed under the [Apache 2.0](https://apache.org/licenses/LICENSE-2.0.txt) License.
+
+The New Relic [security agent](https://github.com/newrelic/csec-node-agent) is licensed under the New Relic Software License v1.0.  The New Relic security agent module may be integrated like the New Relic Node.js agent.
 
 The Node.js agent also uses source code from third-party libraries. You can find full details on which libraries are used and the terms under which they are licensed in [the third-party notices document](https://github.com/newrelic/node-newrelic/blob/main/THIRD_PARTY_NOTICES.md).
 

package/THIRD_PARTY_NOTICES.md

@@ -921,52 +921,47 @@ Apache License
 
 ### @newrelic/security-agent
 
-This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v0.7.0](https://github.com/newrelic/csec-node-agent/tree/v0.7.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v0.7.0/LICENSE):
+This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.0.1](https://github.com/newrelic/csec-node-agent/tree/v1.0.1)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.0.1/LICENSE):
 
 ```
-## New Relic Pre-Release Software Notice
+## New Relic Software License v1.0
 
 ### Acceptance
 
-This software license applies to the repositories, directories, or files that it has been associated with (referred to here as the “Pre-Release Software”). In order to get any license under these terms, you must agree to them as both strict obligations and conditions to all your licenses.
-License
+This software license applies to the repositories, directories, or files that it has been associated with (referred to here as “the Software”). In order to get any license under these terms, you must agree to them as both strict obligations and conditions to all your licenses.
 
-New Relic, Inc. (“New Relic”) grants you a license under its copyrights and patents to do everything necessary for you to use the Pre-Release Software for the Permitted Purposes and subject to your compliance with the Confidentiality terms and all other Restrictions on Use.  All other uses are prohibited.
+### License
 
-### Permitted Purposes
-
-The Pre-Release Software is solely for use with New Relic’s proprietary SaaS service (“New Relic Service”).   To use the Pre-Release Software you must have a valid and active  subscription agreement to the New Relic Service. You may not use the Pre-Release Software in conjunction with any other similar service. 
-
-Use of the Pre-Release Software is limited to evaluation and feedback, including pull requests, of the pre-release features and capabilities. The use of the Pre-Release Software requires a signed New Relic Pre-Release Agreement.  The New Relic Pre-Release Agreement will control in event of a conflict with this license.  The Pre-Release Software is also subject to the New Relic pre-release policy.  A copy of the New Relic Pre-release policy available at https://docs.newrelic.com/docs/licenses/license-information/referenced-policies/new-relic-pre-release-policy/.
+New Relic grants you a license for the Software to do everything you might do with the Software that would otherwise infringe the New Relic’s copyrights or patent rights, conditional on only using the Software for Permitted Purposes and compliance with all other Restrictions on Use. All other uses are prohibited. 
 
-### Confidentiality
+### Permitted Purposes
 
-Any Pre-Release Software not posted publicly contains New Relic Trade Secrets. You may not disclose the features and capabilities of the Pre-Release Software to any third party by any means. You will use commercially reasonable measures to maintain the secrecy of the features and capabilities of the Pre-Release Software. Without limiting the permissions you receive under any open source software (“OSS”) license, you may not disclose the source code of any OSS included as part of the Pre-Release Software in a way that discloses the New Relic Trade Secrets.
+The Software is solely for use with New Relic’s proprietary SaaS service (“New Relic Service”). To use the Software you must have a valid and active subscription agreement to the New Relic Service. You may not use the Software in conjunction with any other similar service.
 
-### Restrictions on Use 
+### Restrictions on Use
 
-1. The use of the Pre-Release Software is limited to you and your organization. You cannot expose the Pre-Release Software to third parties via the network or use the Pre-Release Software on behalf of anyone else.
-2. You cannot modify the Pre-Release Software. You can compile or link the Pre-Release Software into your programs as described in the New Relic Documentation, but you cannot otherwise make any derivative works of the Pre-Release Software.
-3. You cannot reverse engineer or decompile the Pre-Release Software. 
-4. You cannot use the Pre-Release Software for competitive analysis, benchmarking, or any purposes that compete with or are intended to compete with New Relic.
-5. You cannot remove or obscure any proprietary notices in the Pre-Release Software.
-6. You can only copy the Software to the extent needed to use the Pre-Release Software within your organization. You cannot distribute the Software to any third parties.
-7. You can only use the New Relic Services and the Pre-Release Software consistent with New Relic’s product Documentation and Acceptable Use Policy.
+1. The use of the Software is limited to you and your organization. You cannot expose the Software to third parties via the network or use the Software on behalf of anyone else.
+2. You cannot modify the Software. You can compile or link the Software into your programs as described in the New Relic Documentation, but you cannot otherwise make any derivative works of the Software.
+3. You cannot reverse engineer or decompile the Software. 
+4. You cannot use the Software for competitive analysis, benchmarking, or any purposes that compete with or are intended to compete with New Relic.
+5. You cannot remove or obscure any proprietary notices in the Software.
+6. You can only copy the Software to the extent needed to use the Software within your organization. You cannot distribute the Software to any third parties.
+7. You can only use the New Relic Services and the Software consistent with your subscription agreement with New Relic, New Relic’s product Documentation and Acceptable Use Policy.
 
 ### Intellectual Property
 
-Any feedback provided to New Relic about the Pre-Release Software, including feedback provided as source code, comments, or other copyrightable or patentable material, is provided to New Relic under the terms of the Apache Software License, version 2. If you do not provide attribution information or a copy of the license with your feedback, you waive the performance of those requirements of the Apache License with respect to New Relic. The license grant regarding any feedback is irrevocable and persists past the termination of this license.
+Any feedback provided to New Relic about the Software, including feedback provided as source code, comments, or other copyrightable or patentable material, is provided to New Relic under the terms of the Apache Software License, version 2. If you do not provide attribution information or a copy of the license with your feedback, you waive the performance of those requirements of the Apache License with respect to New Relic. The license grant regarding any feedback is irrevocable and persists past the termination of this license.
 
 ### Termination
 
-This license terminates when the Pre-Release Software stops being provided by New Relic or when described by the New Relic Pre-Release Agreement, whichever comes first. When this license terminates, you have a commercially reasonable time to either remove the Pre-Release Software from your systems or to upgrade to a publicly released version of the Software.
+This license terminates when the Software stops being provided by New Relic or when described by the New Relic subscription agreement, whichever comes first. When this license terminates, you have a commercially reasonable time to either remove the Software from your systems.
 
 ### Other Terms
 
-1. The Pre-Release Software is provided “AS IS.” New Relic disclaims all warranties, whether express, implied, statutory or otherwise, including warranties of merchantability, fitness for a particular purpose, title and noninfringement.
-2. The Pre-Release Software has known flaws.  You use the Pre-Release Software at your own risk.
-3. To the full extent permitted by law, New Relic will have no liability arising from or related to the Pre-Release Software or from this license for any direct, indirect, special, incidental, or consequential damages of any kind, even if advised of their possibility in advance, and regardless of legal theory (whether contract, tort, negligence, strict liability or otherwise).
-4. The Pre-Release Software may contain third-party software, including open source software. The third party software is governed by its own license and subject to its own terms, disclosed in the provided licensing information associated with the third party components.   If a source code disclosure is required under the terms of the license covering any OSS component, the source code can be requested of New Relic by emailing opensource@newrelic.com. 
+1. The Software is provided “AS IS.”  New Relic disclaims all warranties, whether express, implied, statutory or otherwise, including warranties of merchantability, fitness for a particular purpose, title, and noninfringement.
+2. To the full extent permitted by law, New Relic will have no liability arising from or related to the Software or from this license for any direct, indirect, special, incidental, or consequential damages of any kind, even if advised of their possibility in advance, and regardless of legal theory (whether contract, tort, negligence, strict liability or otherwise).
+3. The Software may contain third-party software, including open source software (“OSS”). The third party software is governed by its own license and subject to its own terms, disclosed in the provided licensing information associated with the third party components. If a source code disclosure is required under the terms of the license covering any OSS component, the source code can be requested of New Relic by emailing opensource@newrelic.com.   
+
 
 ```
 
@@ -2431,7 +2426,7 @@ THE SOFTWARE.
 
 ### eslint-plugin-jsdoc
 
-This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v39.9.1](https://github.com/gajus/eslint-plugin-jsdoc/tree/v39.9.1)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v39.9.1/LICENSE):
+This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.0.5](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.0.5)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.0.5/LICENSE):
 
 ```
 Copyright (c) 2018, Gajus Kuizinas (http://gajus.com/)

package/lib/agent.js

@@ -39,6 +39,7 @@ const {
   maybeAddQueueAttributes
 } = require('./util/attributes')
 const synthetics = require('./synthetics')
+const Harvester = require('./harvester')
 
 // Map of valid states to whether or not data collection is valid
 const STATES = {
@@ -77,7 +78,7 @@ function Agent(config) {
   this._state = 'stopped'
   this.config = config
   this.environment = require('./environment')
-  this.version = this.config.version
+  this.version = config.version
 
   if (config.serverless_mode.enabled) {
     this.collector = new ServerlessCollector(this)
@@ -87,6 +88,7 @@ function Agent(config) {
 
   this.mapper = new MetricMapper()
   this.metricNameNormalizer = new MetricNormalizer(this.config, 'metric name')
+  this.harvester = new Harvester()
 
   this.metrics = new MetricAggregator(
     {
@@ -95,12 +97,13 @@ function Agent(config) {
       mapper: this.mapper,
       normalizer: this.metricNameNormalizer
     },
-    this.collector
+    this.collector,
+    this.harvester
   )
 
   this.metrics.on('starting metric_data data send.', this._beforeMetricDataSend.bind(this))
 
-  this.spanEventAggregator = createSpanEventAggregator(config, this.collector, this.metrics)
+  this.spanEventAggregator = createSpanEventAggregator(config, this)
 
   this.transactionNameNormalizer = new MetricNormalizer(this.config, 'transaction name')
   // Segment term based tx renaming for MGI mitigation.
@@ -114,45 +117,53 @@ function Agent(config) {
   this.transactionEventAggregator = new TransactionEventAggregator(
     {
       periodMs: config.event_harvest_config.report_period_ms,
-      limit: config.event_harvest_config.harvest_limits.analytic_event_data
+      limit: config.event_harvest_config.harvest_limits.analytic_event_data,
+      config,
+      enabled: (config) => config.transaction_events.enabled
     },
-    this.collector,
-    this.metrics
+    this
   )
 
   this.customEventAggregator = new CustomEventAggregator(
     {
       periodMs: config.event_harvest_config.report_period_ms,
-      limit: config.event_harvest_config.harvest_limits.custom_event_data
+      limit: config.event_harvest_config.harvest_limits.custom_event_data,
+      metricNames: NAMES.CUSTOM_EVENTS,
+      config,
+      enabled: (config) => config.custom_insights_events.enabled
     },
-    this.collector,
-    this.metrics
+    this
   )
 
   const errorTraceAggregator = new ErrorTraceAggregator(
     {
       periodMs: DEFAULT_HARVEST_INTERVAL_MS,
-      limit: MAX_ERROR_TRACES_DEFAULT
+      limit: MAX_ERROR_TRACES_DEFAULT,
+      config,
+      enabled: (config) => config.error_collector.enabled && config.collect_errors
     },
-    this.collector
+    this.collector,
+    this.harvester
   )
 
   const errorEventAggregator = new ErrorEventAggregator(
     {
       periodMs: config.event_harvest_config.report_period_ms,
-      limit: config.event_harvest_config.harvest_limits.error_event_data
+      limit: config.event_harvest_config.harvest_limits.error_event_data,
+      config,
+      enabled: (config) => config.error_collector.enabled && config.error_collector.capture_events
     },
-    this.collector,
-    this.metrics
+    this
   )
 
   this.logs = new LogAggregator(
     {
       periodMs: config.event_harvest_config.report_period_ms,
-      limit: config.event_harvest_config.harvest_limits.log_event_data
+      limit: config.event_harvest_config.harvest_limits.log_event_data,
+      config,
+      enabled: (config) =>
+        config.application_logging.enabled && config.application_logging.forwarding.enabled
     },
-    this.collector,
-    this.metrics,
     this
   )
 
@@ -164,11 +175,13 @@ function Agent(config) {
   this.traces = new TransactionTraceAggregator(
     {
       periodMs: DEFAULT_HARVEST_INTERVAL_MS,
-      config: this.config,
+      config,
       isAsync: !config.serverless_mode.enabled,
-      method: 'transaction_sample_data'
+      method: 'transaction_sample_data',
+      enabled: (config) => config.transaction_tracer.enabled && config.collect_traces
     },
-    this.collector
+    this.collector,
+    this.harvester
   )
   this.transactionSampler = new AdaptiveSampler({
     agent: this,
@@ -179,12 +192,14 @@ function Agent(config) {
 
   this.queries = new QueryTraceAggregator(
     {
-      config: this.config,
+      config,
       periodMs: DEFAULT_HARVEST_INTERVAL_MS,
       method: 'sql_trace_data',
-      isAsync: !config.serverless_mode.enabled
+      isAsync: !config.serverless_mode.enabled,
+      enabled: (config) => config.slow_sql.enabled
     },
-    this.collector
+    this.collector,
+    this.harvester
   )
 
   // Set up all the configuration events the agent needs to listen for.
@@ -276,190 +291,15 @@ Agent.prototype.start = function start(callback) {
  * @param {Function} callback The callback to invoke when all data types have been sent.
  */
 Agent.prototype.forceHarvestAll = function forceHarvestAll(callback) {
-  const agent = this
-  const promises = []
-
-  const metricPromise = new Promise((resolve) => {
-    agent.metrics.once('finished metric_data data send.', function onMetricsFinished() {
-      resolve()
-    })
-    agent.metrics.send()
-  })
-
-  promises.push(metricPromise)
-
-  // TODO: plumb config through to aggregators so they can do their own checking.
-  if (
-    agent.config.distributed_tracing.enabled &&
-    agent.config.span_events.enabled &&
-    !agent.spanEventAggregator.isStream // Not valid to send on streaming aggregator
-  ) {
-    const spanPromise = new Promise((resolve) => {
-      agent.spanEventAggregator.once(
-        'finished span_event_data data send.',
-        function onSpansFinished() {
-          resolve()
-        }
-      )
-      agent.spanEventAggregator.send()
-    })
-
-    promises.push(spanPromise)
-  }
-
-  if (agent.config.custom_insights_events.enabled) {
-    const customEventPromise = new Promise((resolve) => {
-      agent.customEventAggregator.once(
-        'finished custom_event_data data send.',
-        function onCustomEventsFinished() {
-          resolve()
-        }
-      )
-      agent.customEventAggregator.send()
-    })
-
-    promises.push(customEventPromise)
-  }
-
-  if (agent.config.transaction_events.enabled) {
-    const transactionEventPromise = new Promise((resolve) => {
-      agent.transactionEventAggregator.once(
-        'finished analytic_event_data data send.',
-        function onTransactionEventsFinished() {
-          resolve()
-        }
-      )
-      agent.transactionEventAggregator.send()
-    })
-
-    promises.push(transactionEventPromise)
-  }
-
-  if (agent.config.transaction_tracer.enabled && agent.config.collect_traces) {
-    const transactionTracePromise = new Promise((resolve) => {
-      agent.traces.once('finished transaction_sample_data data send.', function onTracesFinished() {
-        resolve()
-      })
-      agent.traces.send()
-    })
-
-    promises.push(transactionTracePromise)
-  }
-
-  if (agent.config.slow_sql.enabled) {
-    const sqlTracePromise = new Promise((resolve) => {
-      agent.queries.once('finished sql_trace_data data send.', function onSqlTracesFinished() {
-        resolve()
-      })
-      agent.queries.send()
-    })
-
-    promises.push(sqlTracePromise)
-  }
-
-  const errorCollectorEnabled = agent.config.error_collector && agent.config.error_collector.enabled
-
-  if (errorCollectorEnabled && agent.config.collect_errors) {
-    const errorTracePromise = new Promise((resolve) => {
-      agent.errors.traceAggregator.once(
-        'finished error_data data send.',
-        function onErrorTracesFinished() {
-          resolve()
-        }
-      )
-      agent.errors.traceAggregator.send()
-    })
-
-    promises.push(errorTracePromise)
-  }
-
-  if (errorCollectorEnabled && agent.config.error_collector.capture_events) {
-    const errorEventPromise = new Promise((resolve) => {
-      agent.errors.eventAggregator.once(
-        'finished error_event_data data send.',
-        function onErrorEventsFinished() {
-          resolve()
-        }
-      )
-      agent.errors.eventAggregator.send()
-    })
-
-    promises.push(errorEventPromise)
-  }
-
-  if (
-    agent.config.application_logging.enabled &&
-    agent.config.application_logging.forwarding.enabled
-  ) {
-    const logEventPromise = new Promise((resolve) => {
-      agent.logs.once('finished log_event_data data send.', function onLogEventsFinished() {
-        resolve()
-      })
-      agent.logs.send()
-    })
-
-    promises.push(logEventPromise)
-  }
-
-  Promise.all(promises).then(() => {
-    // Get out of the promise so callback errors aren't treated as
-    // promise rejections.
-    setImmediate(callback)
-  })
-}
-
-Agent.prototype.stopAggregators = function stopAggregators() {
-  this.metrics.stop()
-  this.errors.stop()
-  this.traces.stop()
-  this.queries.stop()
-  this.spanEventAggregator.stop()
-  this.transactionEventAggregator.stop()
-  this.customEventAggregator.stop()
-  this.logs.stop()
+  this.harvester.clear(callback)
 }
 
 Agent.prototype.startStreaming = function startStreaming() {
-  if (
-    this.spanEventAggregator.isStream &&
-    this.config.distributed_tracing.enabled &&
-    this.config.span_events.enabled
-  ) {
+  if (this.spanEventAggregator.isStream && this.spanEventAggregator.enabled) {
     this.spanEventAggregator.start()
   }
 }
 
-Agent.prototype.startAggregators = function startAggregators() {
-  this.metrics.start()
-  this.errors.start()
-  if (this.config.transaction_tracer.enabled && this.config.collect_traces) {
-    this.traces.start()
-  }
-
-  if (this.config.slow_sql.enabled) {
-    this.queries.start()
-  }
-
-  if (this.config.distributed_tracing.enabled && this.config.span_events.enabled) {
-    this.spanEventAggregator.start()
-  }
-
-  if (this.config.transaction_events.enabled) {
-    this.transactionEventAggregator.start()
-  }
-
-  if (this.config.custom_insights_events.enabled) {
-    this.customEventAggregator.start()
-  }
-
-  if (
-    this.config.application_logging.enabled &&
-    this.config.application_logging.forwarding.enabled
-  ) {
-    this.logs.start()
-  }
-}
-
 /**
  * Completes any final setup upon full connection to New Relic
  * servers and sets the agent state to 'started'.
@@ -468,8 +308,7 @@ Agent.prototype.startAggregators = function startAggregators() {
  * @param {Function} callback callback function that executes after harvest completes (now if immediate, otherwise later)
  */
 Agent.prototype.onConnect = function onConnect(shouldImmediatelyHarvest, callback) {
-  this._reconfigureAggregators(this.config)
-
+  this.harvester.update(this.config)
   generateLoggingSupportMetrics(this)
 
   if (this.config.certificates && this.config.certificates.length > 0) {
@@ -481,20 +320,9 @@ Agent.prototype.onConnect = function onConnect(shouldImmediatelyHarvest, callbac
   this.setState('started')
 }
 
-Agent.prototype._reconfigureAggregators = function _reconfigureAggregators(config) {
-  this.metrics.reconfigure(config)
-  this.errors.reconfigure(config)
-  this.traces.reconfigure(config)
-  this.queries.reconfigure(config)
-  this.spanEventAggregator.reconfigure(config)
-  this.transactionEventAggregator.reconfigure(config)
-  this.customEventAggregator.reconfigure(config)
-  this.logs.reconfigure(config)
-}
-
 Agent.prototype._scheduleHarvests = function _scheduleHarvests(shouldImmediatelyHarvest, callback) {
   if (!shouldImmediatelyHarvest) {
-    this.startAggregators()
+    this.harvester.start()
     setImmediate(callback)
     return
   }
@@ -514,7 +342,7 @@ Agent.prototype._scheduleHarvests = function _scheduleHarvests(shouldImmediately
     logger.info(`Starting initial ${INITIAL_HARVEST_DELAY_MS}ms harvest.`)
 
     agent.forceHarvestAll(function afterAllAggregatorsSend() {
-      agent.startAggregators()
+      agent.harvester.start()
       callback()
     })
   }, INITIAL_HARVEST_DELAY_MS)
@@ -550,7 +378,7 @@ Agent.prototype.stop = function stop(callback) {
 
   this.setState('stopping')
 
-  this.stopAggregators()
+  this.harvester.stop()
 
   sampler.stop()
 
@@ -585,7 +413,8 @@ Agent.prototype._resetErrors = function resetErrors() {
 
   // TODO: is this still necessary?
   // Likely do more direct with new config
-  this.errors.reconfigure(this.config)
+  this.errors.traceAggregator.reconfigure(this.config)
+  this.errors.eventAggregator.reconfigure(this.config)
 }
 
 /**

package/lib/aggregators/base-aggregator.js

@@ -9,18 +9,32 @@ const EventEmitter = require('events').EventEmitter
 const logger = require('../logger').child({ component: 'base_aggregator' })
 
 class Aggregator extends EventEmitter {
-  constructor(opts, collector) {
+  constructor(opts, collector, harvester) {
     super()
 
     this.defaultPeriod = this.periodMs = opts.periodMs
     this.defaultLimit = this.limit = opts.limit
     this.runId = opts.runId
     this.isAsync = opts.isAsync || false
+    // function to pass in to determine if we can start a given aggregator
+    this.isEnabled =
+      opts.enabled ||
+      function defaultEnabled() {
+        return true
+      }
+    this.enabled = this.isEnabled(opts.config)
     this.method = opts.method
-
     this.collector = collector
-
     this.sendTimer = null
+    harvester.add(this)
+  }
+
+  get enabled() {
+    return this._enabled
+  }
+
+  set enabled(condition) {
+    this._enabled = condition
   }
 
   start() {
@@ -81,7 +95,7 @@ class Aggregator extends EventEmitter {
     }
 
     // This can be synchronous for the serverless collector.
-    this.collector[this.method](payload, (error, response) => {
+    this.collector.send(this.method, payload, (error, response) => {
       if (response && response.retainData) {
         this._merge(data)
       }
@@ -110,6 +124,7 @@ class Aggregator extends EventEmitter {
 
   reconfigure(config) {
     this.runId = config.run_id
+    this.enabled = this.isEnabled(config)
   }
 }
 

package/lib/aggregators/event-aggregator.js

@@ -16,12 +16,13 @@ const PriorityQueue = require('../priority-queue')
  * @class
  */
 class EventAggregator extends Aggregator {
-  constructor(opts, collector, metricsAggregator) {
-    super(opts, collector)
+  constructor(opts, agent) {
+    const { metrics, collector, harvester } = agent
+    super(opts, collector, harvester)
     // EventEmitter inits an _events collection. So we have to avoid collision
     this._items = new PriorityQueue(opts.limit)
     this._metricNames = opts.metricNames
-    this._metrics = metricsAggregator
+    this._metrics = metrics
   }
 
   get seen() {

package/lib/aggregators/log-aggregator.js

@@ -17,12 +17,12 @@ const NAMES = require('../metrics/names')
  * @class
  */
 class LogAggregator extends EventAggregator {
-  constructor(opts, collector, metrics, agent) {
+  constructor(opts, agent) {
     opts = opts || {}
     opts.method = opts.method || 'log_event_data'
     opts.metricNames = NAMES.LOGGING
 
-    super(opts, collector, metrics)
+    super(opts, agent)
     this.agent = agent
   }
 

package/lib/aggregators/trace-aggregator.js

@@ -8,8 +8,8 @@
 const Aggregator = require('./base-aggregator')
 
 class TraceAggregator extends Aggregator {
-  constructor(opts, collector) {
-    super(opts, collector)
+  constructor(opts, collector, harvester) {
+    super(opts, collector, harvester)
   }
 }