Merge branch 'main' into fix/4115

open-telemetry · Oct 10, 2023 · 3690459 · 3690459
2 parents 5167f2f + c320c98
commit 3690459
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 188 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 
 ### :bug: (Bug Fix)
 
+* fix(sdk-trace-base): BatchSpanProcessor flushes when `maxExportBatchSize` is reached [#3958](https://github.com/open-telemetry/opentelemetry-js/pull/3958) @nordfjord
 * fix(sdk-metrics): allow instrument names to contain '/' [#4155](https://github.com/open-telemetry/opentelemetry-js/pull/4155)
 * fix(sdk-metrics): prevent per-reader storages from keeping unreported accumulations in memory [#4163](https://github.com/open-telemetry/opentelemetry-js/pull/4163) @pichlermarc
   * fixes a memory leak which occurred when two or more `MetricReader` instances are registered to a `MeterProvider`

diff --git a/doc/library-author.md b/doc/library-author.md
diff --git a/doc/metrics.md b/doc/metrics.md
@@ -1,6 +1,6 @@
 # Metrics
 
-This quick start is for end users of OpenTelemetry who wish to manually measure their applications. If you are a library author, please see the [Library Authors Guide](library-author.md). If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use.
+This quick start is for end users of OpenTelemetry who wish to manually measure their applications. If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use.
 
 For a high-level overview of OpenTelemetry metrics in general and definitions of some common terms, you can refer to the [OpenTelemetry Specification Overview][spec-overview]
 

diff --git a/doc/processor-api.md b/doc/processor-api.md
diff --git a/doc/tracing.md b/doc/tracing.md
@@ -1,6 +1,6 @@
 # Tracing
 
-This quick start is for end users of OpenTelemetry who wish to manually trace their applications. If you are a library author, please see the [Library Authors Guide](library-author.md). If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use.
+This quick start is for end users of OpenTelemetry who wish to manually trace their applications. If you wish to automatically instrument your application, see the automatic instrumentation documentation for the SDK you wish to use.
 
 For a high-level overview of OpenTelemetry tracing in general and definitions of some common terms, you can refer to the [OpenTelemetry Specification Overview][spec-overview]
 

diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.22.20",
-    "@grpc/proto-loader": "^0.7.3",
+    "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.6.0",
     "@opentelemetry/api-logs": "0.43.0",
     "@opentelemetry/otlp-exporter-base": "0.43.0",

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.22.20",
-    "@grpc/proto-loader": "^0.7.3",
+    "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.6.0",
     "@opentelemetry/otlp-exporter-base": "0.43.0",
     "@types/mocha": "10.0.2",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.22.20",
-    "@grpc/proto-loader": "^0.7.3",
+    "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.6.0",
     "@types/mocha": "10.0.2",
     "@types/node": "18.6.5",

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@bufbuild/buf": "1.21.0-1",
     "@grpc/grpc-js": "^1.7.1",
-    "@grpc/proto-loader": "^0.7.3",
+    "@grpc/proto-loader": "^0.7.10",
     "@opentelemetry/api": "1.6.0",
     "@opentelemetry/context-async-hooks": "1.17.0",
     "@opentelemetry/core": "1.17.0",

diff --git a/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts b/packages/opentelemetry-sdk-trace-base/src/export/BatchSpanProcessorBase.ts
@@ -41,6 +41,7 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
   private readonly _scheduledDelayMillis: number;
   private readonly _exportTimeoutMillis: number;
 
+  private _isExporting = false;
   private _finishedSpans: ReadableSpan[] = [];
   private _timer: NodeJS.Timeout | undefined;
   private _shutdownOnce: BindOnceFuture<void>;
@@ -216,19 +217,28 @@ export abstract class BatchSpanProcessorBase<T extends BufferConfig>
   }
 
   private _maybeStartTimer() {
-    if (this._timer !== undefined) return;
-    this._timer = setTimeout(() => {
+    if (this._isExporting) return;
+    const flush = () => {
+      this._isExporting = true;
       this._flushOneBatch()
         .then(() => {
+          this._isExporting = false;
           if (this._finishedSpans.length > 0) {
             this._clearTimer();
             this._maybeStartTimer();
           }
         })
         .catch(e => {
+          this._isExporting = false;
           globalErrorHandler(e);
         });
-    }, this._scheduledDelayMillis);
+    };
+    // we only wait if the queue doesn't have enough elements yet
+    if (this._finishedSpans.length >= this._maxExportBatchSize) {
+      return flush();
+    }
+    if (this._timer !== undefined) return;
+    this._timer = setTimeout(() => flush(), this._scheduledDelayMillis);
     unrefTimer(this._timer);
   }