Allow BatchSpanProcessor to send early when a full batch is ready

coralogix · Sep 25, 2023 · b05ebf7 · b05ebf7
1 parent 2c9d613
commit b05ebf7
Showing 1 changed file with 27 additions and 11 deletions.
diff --git a/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts b/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts
@@ -136,7 +136,11 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
     }
 
     this._finishedSpans.push(span);
-    this._maybeStartTimer();
+    if (this._finishedSpans.length == this._maxExportBatchSize) {
+      this._flushOneBatchAndContinue()
+    } else {
+      this._maybeStartTimer();
+    }
   }
 
   /**
@@ -215,16 +219,7 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
   private _maybeStartTimer() {
     if (this._timer !== undefined) return;
     this._timer = setTimeout(() => {
-      this._flushOneBatch()
-        .then(() => {
-          if (this._finishedSpans.length > 0) {
-            this._clearTimer();
-            this._maybeStartTimer();
-          }
-        })
-        .catch(e => {
-          globalErrorHandler(e);
-        });
+      this._flushOneBatchAndContinue()
     }, this._scheduledDelayMillis);
     unrefTimer(this._timer);
   }
@@ -236,5 +231,26 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
     }
   }
 
+  private _flushOneBatchAndContinue() {
+    this._flushOneBatch()
+      .then(() => {
+        if (this._finishedSpans.length >= this._maxExportBatchSize) {
+          this._flushOneBatchAndContinue()
+        } else if (this._finishedSpans.length > 0) {
+          this._clearTimer();
+          this._maybeStartTimer();
+        }
+      })
+      .catch(e => {
+        globalErrorHandler(e);
+        if (this._finishedSpans.length >= this._maxExportBatchSize) {
+          this._flushOneBatchAndContinue()
+        } else if (this._finishedSpans.length > 0) {
+          this._clearTimer();
+          this._maybeStartTimer();
+        }
+      });
+  }
+
   protected abstract onShutdown(): void;
 }