Merge branch 'develop' of github.com:rudderlabs/rudder-transformer in…

…to refactor.migrate-test-cases-to-new-format

.github/workflows/create-hotfix-branch.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     # Only allow these users to create new hotfix branch from 'main'
-    if: github.ref == 'refs/heads/main' && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' ||  github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507')
+    if: github.ref == 'refs/heads/main' && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823') && (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' ||  github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823')
     steps:
       - name: Create Branch
         uses: peterjgrainger/[email protected]

.github/workflows/draft-new-release.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     # Only allow release stakeholders to initiate releases
-    if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507') &&  (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507')
+    if: (github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/heads/hotfix/')) && (github.actor == 'ItsSudip' || github.actor == 'krishna2020' || github.actor == 'saikumarrs' || github.actor == 'sandeepdsvs' || github.actor == 'shrouti1507' || github.actor == 'anantjain45823') &&  (github.triggering_actor == 'ItsSudip' || github.triggering_actor == 'krishna2020' || github.triggering_actor == 'saikumarrs' || github.triggering_actor == 'sandeepdsvs' || github.triggering_actor == 'shrouti1507' || github.triggering_actor == 'anantjain45823')
     steps:
       - name: Checkout
         uses: actions/[email protected]

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.43.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.43.0...v1.43.1) (2023-09-26)
+
+
+### Bug Fixes
+
+* **dm:** updated the stats definition for the tracking plan service ([eb2724f](https://github.com/rudderlabs/rudder-transformer/commit/eb2724f135d2c3c2a1fb8a88051cfb0f2720b5ed))
+* **iterable:** event id mapping ([#2659](https://github.com/rudderlabs/rudder-transformer/issues/2659)) ([84083aa](https://github.com/rudderlabs/rudder-transformer/commit/84083aa671312e3934414b5534489fba87d9b29f))
+
 ## [1.43.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.42.0...v1.43.0) (2023-09-25)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rudder-transformer",
-  "version": "1.43.0",
+  "version": "1.43.1",
   "description": "",
   "homepage": "https://github.com/rudderlabs/rudder-transformer#readme",
   "bugs": {

src/util/prometheus.js

@@ -234,7 +234,7 @@ class Prometheus {
           'destinationType',
           'k8_namespace',
           'workspaceId',
-          'transformationId',
+          'trackingPlanId',
         ],
       },
       {
@@ -586,7 +586,7 @@ class Prometheus {
           'destinationType',
           'k8_namespace',
           'workspaceId',
-          'transformationId',
+          'trackingPlanId',
         ],
       },
       {
@@ -626,18 +626,6 @@ class Prometheus {
           'k8_namespace',
         ],
       },
-      {
-        name: 'user_transform_function_latency',
-        help: 'user_transform_function_latency',
-        type: 'histogram',
-        labelNames: [
-          'transformationVersionId',
-          'processSessions',
-          'sourceType',
-          'destinationType',
-          'k8_namespace',
-        ],
-      },
       {
         name: 'source_transform_request_latency',
         help: 'source_transform_request_latency',

src/v0/destinations/google_adwords_offline_conversions/transform.js

@@ -100,7 +100,9 @@ const trackResponseBuilder = (message, metadata, destination) => {
 
   const responseList = [];
   if (!eventsToConversionsNamesMapping[event] || !eventsToOfflineConversionsTypeMapping[event]) {
-    throw new ConfigurationError(`Event name '${event}' is not valid`);
+    throw new ConfigurationError(
+      `Event name '${event}' is not present in the mapping provided in the dashboard.`,
+    );
   }
   const conversionTypes = Array.from(eventsToOfflineConversionsTypeMapping[event]);
   conversionTypes.forEach((conversionType) => {

src/v0/destinations/google_adwords_offline_conversions/utils.js

@@ -76,7 +76,9 @@ const getConversionActionId = async (headers, params) => {
       'response.0.results.0.conversionAction.resourceName',
     );
     if (!conversionAction) {
-      throw new AbortedError(`Unable to find conversionActionId for conversion:${params.event}`);
+      throw new AbortedError(
+        `Unable to find conversionActionId for conversion:${params.event}. Most probably the conversion name in Google dashboard and Rudderstack dashboard are not same.`,
+      );
     }
     return conversionAction;
   });
@@ -172,7 +174,7 @@ const requestBuilder = (
       const filteredLoginCustomerId = removeHyphens(loginCustomerId);
       response.headers['login-customer-id'] = filteredLoginCustomerId;
     } else {
-      throw new ConfigurationError(`loginCustomerId is required as subAccount is enabled`);
+      throw new ConfigurationError(`"Login Customer ID" is required as "Sub Account" is enabled`);
     }
   }
   return response;

src/v0/destinations/iterable/data/IterableTrackConfig.json

@@ -23,8 +23,11 @@
   },
   {
     "destKey": "id",
-    "sourceKeys": ["properties.id", "properties.event_id"],
-    "required": false
+    "sourceKeys": "properties.event_id",
+    "required": false,
+    "metadata": {
+      "type": "toString"
+    }
   },
   {
     "destKey": "eventName",

src/v0/destinations/iterable/data/IterableTrackPurchaseConfig.json

@@ -6,13 +6,11 @@
   },
   {
     "destKey": "id",
-    "sourceKeys": [
-      "properties.order_id",
-      "properties.orderId",
-      "properties.id",
-      "properties.event_id"
-    ],
-    "required": false
+    "sourceKeys": ["properties.order_id", "properties.orderId", "properties.event_id"],
+    "required": false,
+    "metadata": {
+      "type": "toString"
+    }
   },
   {
     "destKey": "createdAt",

test/__tests__/data/google_adwords_offline_conversions.json

@@ -1622,7 +1622,7 @@
         }
       },
       "statusCode": 400,
-      "error": "Event name 'purchase' is not valid",
+      "error": "Event name 'purchase' is not present in the mapping provided in the dashboard.",
       "statTags": {
         "destination": "google_adwords_offline_conversions",
         "stage": "transform",
@@ -2948,7 +2948,7 @@
         "secret": null
       },
       "statusCode": 400,
-      "error": "loginCustomerId is required as subAccount is enabled",
+      "error": "\"Login Customer ID\" is required as \"Sub Account\" is enabled",
       "statTags": {
         "destination": "google_adwords_offline_conversions",
         "stage": "transform",

test/__tests__/data/google_adwords_offline_conversions_router_output.json

@@ -472,7 +472,7 @@
     ],
     "batched": false,
     "statusCode": 400,
-    "error": "Event name 'order completed' is not valid",
+    "error": "Event name 'order completed' is not present in the mapping provided in the dashboard.",
     "statTags": { "errorCategory": "dataValidation", "errorType": "configuration" },
     "destination": {
       "Config": {