chore(release): pull main into develop post release v1.43.1 (#2662)

* fix(dm): updated the stats definition for the tracking plan service * fix(iterable): event id mapping (#2659) * chore(release): 1.43.1 * chore: update release owners (#2661) chore: update release stakeholder --------- Co-authored-by: Abhimanyu Babbar <[email protected]> Co-authored-by: Mihir Bhalala <[email protected]> Co-authored-by: GitHub Actions <[email protected]> Co-authored-by: Anant Jain <[email protected]> Co-authored-by: Sudip Paul <[email protected]>
rudderlabs · Sep 29, 2023 · 5dade9a · 5dade9a
1 parent f63b493
commit 5dade9a
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 29 deletions.
diff --git a/.github/workflows/create-hotfix-branch.yml b/.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]

diff --git a/.github/workflows/draft-new-release.yml b/.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]

diff --git a/CHANGELOG.md b/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)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/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": {

diff --git a/src/util/prometheus.js b/src/util/prometheus.js
@@ -229,7 +229,7 @@ class Prometheus {
         name: 'tp_errors',
         help: 'tp_errors',
         type: 'counter',
-        labelNames: ['sourceType', 'destinationType', 'k8_namespace', 'workspaceId', 'transformationId'],
+        labelNames: ['sourceType', 'destinationType', 'k8_namespace', 'workspaceId', 'trackingPlanId'],
       },
       {
         name: 'tp_events_count',
@@ -575,7 +575,7 @@ class Prometheus {
         name: 'tp_request_latency',
         help: 'tp_request_latency',
         type: 'histogram',
-        labelNames: ['sourceType', 'destinationType', 'k8_namespace', 'workspaceId', 'transformationId'],
+        labelNames: ['sourceType', 'destinationType', 'k8_namespace', 'workspaceId', 'trackingPlanId'],
       },
       {
         name: 'cdk_events_latency',
@@ -614,18 +614,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',

diff --git a/src/v0/destinations/iterable/data/IterableTrackConfig.json b/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",

diff --git a/src/v0/destinations/iterable/data/IterableTrackPurchaseConfig.json b/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",

diff --git a/test/__tests__/data/iterable.json b/test/__tests__/data/iterable.json
@@ -3103,7 +3103,6 @@
         "JSON_ARRAY": {},
         "FORM": {},
         "JSON": {
-          "id": "event1234",
           "userId": "abcdeeeeeeeexxxx102",
           "createdAt": 1598631966468,
           "dataFields": {