chore: replace Promise.finally with two param .then

open-telemetry · Aug 10, 2021 · 9ba634e · 9ba634e
1 parent 3945af0
commit 9ba634e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector-grpc/src/CollectorExporterNodeBase.ts
@@ -67,10 +67,11 @@ export abstract class CollectorExporterNodeBase<
       .then(onSuccess, onError);
 
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    const popPromise = () => {
       const index = this._sendingPromises.indexOf(promise);
       this._sendingPromises.splice(index, 1);
-    });
+    }
+    promise.then(popPromise, popPromise);
   }
 
   onInit(config: CollectorExporterConfigNode): void {

diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts
@@ -53,10 +53,11 @@ export abstract class CollectorExporterNodeBase<
       .then(onSuccess, onError);
 
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    const popPromise = () => {
       const index = this._sendingPromises.indexOf(promise);
       this._sendingPromises.splice(index, 1);
-    });
+    }
+    promise.then(popPromise, popPromise);
   }
 
   override 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
@@ -86,9 +86,10 @@ export abstract class CollectorExporterBrowserBase<
       .then(onSuccess, onError);
 
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    const popPromise = () => {
       const index = this._sendingPromises.indexOf(promise);
       this._sendingPromises.splice(index, 1);
-    });
+    }
+    promise.then(popPromise, popPromise);
   }
 }
diff --git a/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector/src/platform/node/CollectorExporterNodeBase.ts
@@ -82,10 +82,11 @@ export abstract class CollectorExporterNodeBase<
       .then(onSuccess, onError);
 
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    const popPromise = () => {
       const index = this._sendingPromises.indexOf(promise);
       this._sendingPromises.splice(index, 1);
-    });
+    }
+    promise.then(popPromise, popPromise);
   }
 
   onShutdown(): void {}

diff --git a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts
@@ -87,11 +87,13 @@ export class ZipkinExporter implements SpanExporter {
       });
     });
 
+
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    const popPromise = () => {
       const index = this._sendingPromises.indexOf(promise);
       this._sendingPromises.splice(index, 1);
-    });
+    }
+    promise.then(popPromise, popPromise);
   }
 
   /**