fix: ensure onError is only called once

open-telemetry · Aug 5, 2024 · c365399 · c365399
1 parent ec37153
commit c365399
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts b/experimental/packages/otlp-exporter-base/src/platform/browser/OTLPExporterBrowserBase.ts
@@ -98,15 +98,13 @@ export abstract class OTLPExporterBrowserBase<
       .then(response => {
         if (response.status === 'success') {
           onSuccess();
-          return;
-        }
-        if (response.status === 'failure' && response.error) {
+        } else if (response.status === 'failure' && response.error) {
           onError(response.error);
-        }
-        if (response.status === 'retryable') {
+        } else if (response.status === 'retryable') {
           onError(new OTLPExporterError('Export failed with retryable status'));
+        } else {
+          onError(new OTLPExporterError('Export failed with unknown error'));
         }
-        onError(new OTLPExporterError('Export failed with unknown error'));
       }, onError);
 
     this._sendingPromises.push(promise);

diff --git a/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts b/experimental/packages/otlp-exporter-base/src/platform/node/OTLPExporterNodeBase.ts
@@ -104,15 +104,13 @@ export abstract class OTLPExporterNodeBase<
       .then(response => {
         if (response.status === 'success') {
           onSuccess();
-          return;
-        }
-        if (response.status === 'failure' && response.error) {
+        } else if (response.status === 'failure' && response.error) {
           onError(response.error);
-        }
-        if (response.status === 'retryable') {
+        } else if (response.status === 'retryable') {
           onError(new OTLPExporterError('Export failed with retryable status'));
+        } else {
+          onError(new OTLPExporterError('Export failed with unknown error'));
         }
-        onError(new OTLPExporterError('Export failed with unknown error'));
       }, onError);
 
     this._sendingPromises.push(promise);

diff --git a/experimental/packages/otlp-grpc-exporter-base/src/OTLPGRPCExporterNodeBase.ts b/experimental/packages/otlp-grpc-exporter-base/src/OTLPGRPCExporterNodeBase.ts
@@ -130,15 +130,13 @@ export abstract class OTLPGRPCExporterNodeBase<
       .then(response => {
         if (response.status === 'success') {
           onSuccess();
-          return;
-        }
-        if (response.status === 'failure' && response.error) {
+        } else if (response.status === 'failure' && response.error) {
           onError(response.error);
-        }
-        if (response.status === 'retryable') {
+        } else if (response.status === 'retryable') {
           onError(new OTLPExporterError('Export failed with retryable status'));
+        } else {
+          onError(new OTLPExporterError('Export failed with unknown error'));
         }
-        onError(new OTLPExporterError('Export failed with unknown error'));
       }, onError);
 
     this._sendingPromises.push(promise);