fix(@opentelemetry/exporter-collector): remove fulfilled promises cor…

…rectly
open-telemetry · Feb 23, 2021 · 81fb7a6 · 81fb7a6
1 parent 9a67045
commit 81fb7a6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 28 deletions.
diff --git a/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts
@@ -58,22 +58,21 @@ export abstract class CollectorExporterNodeBase<
     const promise = new Promise<void>(resolve => {
       const _onSuccess = (): void => {
         onSuccess();
-        _onFinish();
+        resolve();
       };
       const _onError = (error: collectorTypes.CollectorExporterError): void => {
         onError(error);
-        _onFinish();
-      };
-      const _onFinish = () => {
         resolve();
-        const index = this._sendingPromises.indexOf(promise);
-        this._sendingPromises.splice(index, 1);
       };
 
       this._send(this, objects, _onSuccess, _onError);
     });
 
     this._sendingPromises.push(promise);
+    promise.then(() => {
+      const index = this._sendingPromises.indexOf(promise);
+      this._sendingPromises.splice(index, 1);
+    });
   }
 
   onInit(config: CollectorExporterConfigNode): void {

diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts
@@ -39,22 +39,20 @@ export abstract class CollectorExporterNodeBase<
     const promise = new Promise<void>(resolve => {
       const _onSuccess = (): void => {
         onSuccess();
-        _onFinish();
+        resolve();
       };
       const _onError = (error: collectorTypes.CollectorExporterError): void => {
         onError(error);
-        _onFinish();
-      };
-      const _onFinish = () => {
         resolve();
-        const index = this._sendingPromises.indexOf(promise);
-        this._sendingPromises.splice(index, 1);
       };
 
       this._send(this, objects, _onSuccess, _onError);
     });
-
     this._sendingPromises.push(promise);
+    promise.then(() => {
+      const index = this._sendingPromises.indexOf(promise);
+      this._sendingPromises.splice(index, 1);
+    });
   }
 
   onInit(config: CollectorExporterNodeConfigBase): void {

diff --git a/...ges/opentelemetry-exporter-collector/src/platform/browser/CollectorExporterBrowserBase.ts b/...ges/opentelemetry-exporter-collector/src/platform/browser/CollectorExporterBrowserBase.ts
@@ -72,16 +72,11 @@ export abstract class CollectorExporterBrowserBase<
     const promise = new Promise<void>(resolve => {
       const _onSuccess = (): void => {
         onSuccess();
-        _onFinish();
+        resolve();
       };
       const _onError = (error: collectorTypes.CollectorExporterError): void => {
         onError(error);
-        _onFinish();
-      };
-      const _onFinish = () => {
         resolve();
-        const index = this._sendingPromises.indexOf(promise);
-        this._sendingPromises.splice(index, 1);
       };
 
       if (this._useXHR) {
@@ -91,5 +86,9 @@ export abstract class CollectorExporterBrowserBase<
       }
     });
     this._sendingPromises.push(promise);
+    promise.then(() => {
+      const index = this._sendingPromises.indexOf(promise);
+      this._sendingPromises.splice(index, 1);
+    });
   }
 }
diff --git a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporterNodeBase.ts
@@ -65,16 +65,11 @@ export abstract class CollectorExporterNodeBase<
     const promise = new Promise<void>(resolve => {
       const _onSuccess = (): void => {
         onSuccess();
-        _onFinish();
+        resolve();
       };
       const _onError = (error: collectorTypes.CollectorExporterError): void => {
         onError(error);
-        _onFinish();
-      };
-      const _onFinish = () => {
         resolve();
-        const index = this._sendingPromises.indexOf(promise);
-        this._sendingPromises.splice(index, 1);
       };
       sendWithHttp(
         this,
@@ -84,8 +79,11 @@ export abstract class CollectorExporterNodeBase<
         _onError
       );
     });
-
     this._sendingPromises.push(promise);
+    promise.then(() => {
+      const index = this._sendingPromises.indexOf(promise);
+      this._sendingPromises.splice(index, 1);
+    });
   }
 
   onShutdown(): void {}

diff --git a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts
@@ -76,11 +76,13 @@ export class ZipkinExporter implements SpanExporter {
       this._sendSpans(spans, this._serviceName!, result => {
         resolve();
         resultCallback(result);
-        const index = this._sendingPromises.indexOf(promise);
-        this._sendingPromises.splice(index, 1);
       });
     });
     this._sendingPromises.push(promise);
+    promise.then(() => {
+      const index = this._sendingPromises.indexOf(promise);
+      this._sendingPromises.splice(index, 1);
+    });
   }
 
   /**