chore: replace Promise.finally with .catch and .then

open-telemetry · Aug 9, 2021 · d6eb88c · d6eb88c
1 parent 3945af0
commit d6eb88c
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
@@ -64,10 +64,11 @@ export abstract class CollectorExporterNodeBase<
     const promise = new Promise<void>((resolve, reject) => {
       this._send(this, objects, resolve, reject);
     })
-      .then(onSuccess, onError);
+      .then(onSuccess, onError)
+      .catch(diag.debug);
 
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    promise.then(() => {
       const index = this._sendingPromises.indexOf(promise);
       this._sendingPromises.splice(index, 1);
     });

diff --git a/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts b/packages/opentelemetry-exporter-collector-proto/src/CollectorExporterNodeBase.ts
@@ -50,10 +50,11 @@ export abstract class CollectorExporterNodeBase<
     const promise = new Promise<void>((resolve, reject) => {
       this._send(this, objects, this.compression, resolve, reject);
     })
-      .then(onSuccess, onError);
+      .then(onSuccess, onError)
+      .catch(diag.debug);
 
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    promise.then(() => {
       const index = this._sendingPromises.indexOf(promise);
       this._sendingPromises.splice(index, 1);
     });

diff --git a/...ges/opentelemetry-exporter-collector/src/platform/browser/CollectorExporterBrowserBase.ts b/...ges/opentelemetry-exporter-collector/src/platform/browser/CollectorExporterBrowserBase.ts
@@ -83,10 +83,11 @@ export abstract class CollectorExporterBrowserBase<
         sendWithBeacon(body, this.url, resolve, reject);
       }
     })
-      .then(onSuccess, onError);
+      .then(onSuccess, onError)
+      .catch(diag.debug);
 
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    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
@@ -79,10 +79,11 @@ export abstract class CollectorExporterNodeBase<
         reject
       );
     })
-      .then(onSuccess, onError);
+      .then(onSuccess, onError)
+      .catch(diag.debug);
 
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    promise.then(() => {
       const index = this._sendingPromises.indexOf(promise);
       this._sendingPromises.splice(index, 1);
     });

diff --git a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts
@@ -85,10 +85,12 @@ export class ZipkinExporter implements SpanExporter {
         resolve();
         resultCallback(result);
       });
-    });
+    })
+      .catch(diag.debug);
+
 
     this._sendingPromises.push(promise);
-    promise.finally(() => {
+    promise.then(() => {
       const index = this._sendingPromises.indexOf(promise);
       this._sendingPromises.splice(index, 1);
     });