@google-cloud/nodejs-common 1.5.6-beta → 1.5.7-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google-cloud/nodejs-common",
-  "version": "1.5.6-beta",
+  "version": "1.5.7-beta",
   "description": "A NodeJs common library for solutions based on Cloud Functions",
   "author": "Google Inc.",
   "license": "Apache-2.0",

package/src/apis/measurement_protocol_ga4.js

@@ -123,34 +123,47 @@ class MeasurementProtocolGA4 {
       let retriedTimes = 0;
       let response;
       while (retriedTimes <= RETRY_TIMES) {
-        response = await request(requestOptions);
-        if (response.status < 500) break; // Only retry when server errors.
-        this.logger.warn('Got an 5XX error', response);
+        try {
+          response = await request(requestOptions);
+          if (response.status < 500) break; // Only retry when server errors.
+          this.logger.warn('Got a 5XX error', response);
+        } catch (error) {
+          this.logger.warn('Got an error', error);
+          if (retriedTimes === RETRY_TIMES) {
+            this.logger.error('Maximum retry times exceeded.');
+            batchResult.result = false;
+            batchResult.errors = [error.toString()];
+            break;
+          }
+        }
         retriedTimes++;
         await wait(retriedTimes * 1000);
+        this.logger.warn('Will retry now...');
       };
-      this.logger.debug('Configuration:', config);
-      this.logger.debug('Input Data:   ', lines);
-      this.logger.debug(`Batch[${batchId}] status: ${response.status}`);
-      this.logger.debug(response.data);
-      // There is not enough information from the non-debug mode.
-      if (!this.debugMode) {
-        if (response.status >= 200 && response.status < 300) {
-          batchResult.result = true;
-        } else {
-          batchResult.result = false;
-          const errorMessage =
-            `MP GA4 [${batchId}] http status ${response.status}.`;
-          this.logger.error(errorMessage, line);
-          batchResult.errors = [errorMessage];
-        }
-      } else {
-        if (response.data.validationMessages.length === 0) {
-          batchResult.result = true;
+      if (response) {
+        this.logger.debug('Configuration:', config);
+        this.logger.debug('Input Data:   ', lines);
+        this.logger.debug(`Batch[${batchId}] status: ${response.status}`);
+        this.logger.debug(response.data);
+        // There is not enough information from the non-debug mode.
+        if (!this.debugMode) {
+          if (response.status >= 200 && response.status < 300) {
+            batchResult.result = true;
+          } else {
+            batchResult.result = false;
+            const errorMessage =
+              `MP GA4 [${batchId}] http status ${response.status}.`;
+            this.logger.error(errorMessage, line);
+            batchResult.errors = [errorMessage];
+          }
         } else {
-          batchResult.result = false;
-          batchResult.errors = response.data.validationMessages.map(
-            ({ description }) => description);
+          if (response.data.validationMessages.length === 0) {
+            batchResult.result = true;
+          } else {
+            batchResult.result = false;
+            batchResult.errors = response.data.validationMessages.map(
+              ({ description }) => description);
+          }
         }
       }
       if (!batchResult.result) {