From eb2724f135d2c3c2a1fb8a88051cfb0f2720b5ed Mon Sep 17 00:00:00 2001
From: Abhimanyu Babbar <abhimanyu.babbar89@gmail.com>
Date: Tue, 26 Sep 2023 10:44:22 +0530
Subject: [PATCH 1/2] fix(dm): updated the stats definition for the tracking
 plan service

---
 src/util/prometheus.js | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/util/prometheus.js b/src/util/prometheus.js
index 2d781fb8629..0899590cd5f 100644
--- 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',

From 84083aa671312e3934414b5534489fba87d9b29f Mon Sep 17 00:00:00 2001
From: Mihir Bhalala <77438541+mihir-4116@users.noreply.github.com>
Date: Tue, 26 Sep 2023 12:24:29 +0530
Subject: [PATCH 2/2] fix(iterable): event id mapping (#2659)

---
 .../iterable/data/IterableTrackConfig.json           |  7 +++++--
 .../iterable/data/IterableTrackPurchaseConfig.json   | 12 +++++-------
 test/__tests__/data/iterable.json                    |  1 -
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/v0/destinations/iterable/data/IterableTrackConfig.json b/src/v0/destinations/iterable/data/IterableTrackConfig.json
index 28fdcaecc7e..5de4856b336 100644
--- 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
index 00e83d0125e..aa15d76a709 100644
--- 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
index 08e83a47a5d..f8147c74022 100644
--- 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": {