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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google-cloud/nodejs-common",
-  "version": "1.5.6-beta",
+  "version": "1.5.8-beta",
   "description": "A NodeJs common library for solutions based on Cloud Functions",
   "author": "Google Inc.",
   "license": "Apache-2.0",
@@ -16,21 +16,21 @@
   },
   "homepage": "https://github.com/GoogleCloudPlatform/cloud-for-marketing/blob/master/marketing-analytics/activation/common-libs/nodejs-common/README.md",
   "dependencies": {
-    "@google-cloud/aiplatform": "^2.3.0",
-    "@google-cloud/automl": "^3.1.0",
-    "@google-cloud/bigquery": "^6.0.3",
-    "@google-cloud/datastore": "^7.0.0",
-    "@google-cloud/firestore": "^6.3.0",
-    "@google-cloud/logging-winston": "^5.1.5",
-    "@google-cloud/pubsub": "^3.2.0",
-    "@google-cloud/storage": "^6.5.2",
-    "@google-cloud/scheduler": "^3.0.4",
-    "@google-cloud/secret-manager": "^4.1.3",
+    "@google-cloud/aiplatform": "^2.5.0",
+    "@google-cloud/automl": "^3.1.2",
+    "@google-cloud/bigquery": "^6.1.0",
+    "@google-cloud/datastore": "^7.1.0",
+    "@google-cloud/firestore": "^6.4.2",
+    "@google-cloud/logging-winston": "^5.3.0",
+    "@google-cloud/pubsub": "^3.3.0",
+    "@google-cloud/storage": "^6.9.2",
+    "@google-cloud/scheduler": "^3.2.0",
+    "@google-cloud/secret-manager": "^4.2.0",
     "gaxios": "^5.0.2",
-    "google-ads-api": "^11.1.0",
-    "google-ads-node": "^9.1.0",
-    "google-auth-library": "^8.5.2",
-    "googleapis": "^108.0.0",
+    "google-ads-api": "^12.0.1",
+    "google-ads-node": "^10.0.0",
+    "google-auth-library": "^8.7.0",
+    "googleapis": "^110.0.0",
     "winston": "^3.8.2",
     "lodash": "^4.17.21"
   },

package/src/apis/google_ads.js

@@ -77,6 +77,8 @@ const PICKED_PROPERTIES = [
   'external_attribution_data',
   'cart_data',
   'user_identifiers',
+  'gbraid',
+  'wbraid',
   'gclid',
   'caller_id',
   'call_start_date_time',

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) {

package/src/components/firestore/datastore_mode_access.js

@@ -115,6 +115,7 @@ class DatastoreModeAccess {
         .save({
           key: key,
           data: data,
+          excludeLargeProperties: true,
         })
         .then((apiResponse) => {
           // Default key in Datastore is a number in response like following.