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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google-cloud/nodejs-common",
-  "version": "1.5.4-beta",
+  "version": "1.5.6-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

@@ -25,10 +25,14 @@ const {
   getLogger,
   SendSingleBatch,
   BatchResult,
+  wait,
 } = require('../components/utils.js');
 /** Base URL for Google Analytics service. */
 const BASE_URL = 'https://www.google-analytics.com';
 
+/** @const{number} Times to retry when server responds an error. */
+const RETRY_TIMES = 2;
+
 /**
  * Configuration for Measurement Protocol GA4.
  * @see https://developers.google.com/analytics/devguides/collection/protocol/ga4/reference#payload_post_body
@@ -109,40 +113,50 @@ class MeasurementProtocolGA4 {
               .map((param) => `${param}=${params[param]}`)
               .join('&');
         },
+        validateStatus: () => true,
         body: JSON.stringify(hit),
-        headers: {'User-Agent': 'Tentacles/MeasurementProtocol-GA4'}
+        headers: { 'User-Agent': 'Tentacles/MeasurementProtocol-GA4' },
       };
-      const response = await request(requestOptions);
       /** @type {BatchResult} */ const batchResult = {
         numberOfLines: lines.length,
       };
-      if (response.status < 200 || response.status >= 300) {
-        const errorMessages = [
-          `Measurement Protocol GA4 [${batchId}] didn't succeed.`,
-          `Get response code: ${response.status}`,
-          `response: ${response.data}`,
-        ];
-        this.logger.error(errorMessages.join('\n'));
-        batchResult.errors = errorMessages;
-        batchResult.result = false;
-        return batchResult;
-      }
+      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);
+        retriedTimes++;
+        await wait(retriedTimes * 1000);
+      };
       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) {
-        batchResult.result = true;
+        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 = response.data.validationMessages.length === 0;
-        if (!batchResult.result) {
-          batchResult.failedLines = lines;
+        if (response.data.validationMessages.length === 0) {
+          batchResult.result = true;
+        } else {
+          batchResult.result = false;
           batchResult.errors = response.data.validationMessages.map(
-              ({description}) => description);
-          batchResult.groupedFailed = {[batchResult.errors.join()]: [lines[0]]};
+            ({ description }) => description);
         }
       }
+      if (!batchResult.result) {
+        batchResult.failedLines = [line];
+        batchResult.groupedFailed = { [batchResult.errors.join()]: [line] };
+      }
       return batchResult;
     };
   };