Merge pull request #622 from michaelgoin/stop-streaming-send-call

Stops calling send() on streaming span aggregator on initial harvest.
newrelic · Feb 23, 2021 · 02e0e45 · 02e0e45
2 parents a376993 + 95d33be
commit 02e0e45
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/agent.js b/lib/agent.js
@@ -293,8 +293,11 @@ Agent.prototype.forceHarvestAll = function forceHarvestAll(callback) {
   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) {
+  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.',

diff --git a/lib/spans/streaming-span-event-aggregator.js b/lib/spans/streaming-span-event-aggregator.js
@@ -55,8 +55,6 @@ class StreamingSpanEventAggregator extends Aggregator {
   }
 
   send() {
-    // Only log once started. This will get invoked on initial harvest
-    // prior to start which we'll just ignore.
     if (this.started) {
       logger.warnOnce('SEND_WARNING', SEND_WARNING)
     }