chore(release): pull hotfix-release/v1.53.1 into main

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.53.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.53.0...v1.53.1) (2024-01-16)
+
+
+### Bug Fixes
+
+* mixpanel timestamp in ms ([#2990](https://github.com/rudderlabs/rudder-transformer/issues/2990)) ([0da63a4](https://github.com/rudderlabs/rudder-transformer/commit/0da63a4e368e59d46c1eaa4a77d4ac81e686183a))
+* klaviyo: Event validation to be string before operating on it ([#2994](https://github.com/rudderlabs/rudder-transformer/issues/2994)) ([cd68d7c](https://github.com/rudderlabs/rudder-transformer/commit/cd68d7c4068588a325029e0cc523b74c3d3ccb1a))
+
 ## [1.53.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.52.4...v1.53.0) (2024-01-08)
 
 

package.json

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

src/v0/destinations/klaviyo/transform.js

@@ -36,6 +36,7 @@ const {
   handleRtTfSingleEventError,
   flattenJson,
   isNewStatusCodesAccepted,
+  validateEventName,
 } = require('../../util');
 const { JSON_MIME_TYPE, HTTP_STATUS_CODES } = require('../../util/constant');
 
@@ -156,7 +157,8 @@ const trackRequestHandler = (message, category, destination) => {
   const payload = {};
   const { privateApiKey, flattenProperties } = destination.Config;
   let event = get(message, 'event');
-  event = event ? event.trim().toLowerCase() : event;
+  validateEventName(event);
+  event = event.trim().toLowerCase();
   let attributes = {};
   if (ecomEvents.includes(event) && message.properties) {
     const eventName = eventNameMapping[event];

src/v0/destinations/mp/transform.js

@@ -12,7 +12,7 @@ const {
   getTimeDifference,
   getValuesAsArrayFromConfig,
   removeUndefinedValues,
-  toUnixTimestamp,
+  toUnixTimestampInMS,
   getFieldValueFromMessage,
   checkInvalidRtTfEvents,
   handleRtTfSingleEventError,
@@ -174,7 +174,8 @@ const getEventValueForTrackEvent = (message, destination) => {
   if (mappedProperties.$insert_id) {
     mappedProperties.$insert_id = mappedProperties.$insert_id.slice(-36);
   }
-  const unixTimestamp = toUnixTimestamp(message.timestamp);
+
+  const unixTimestamp = toUnixTimestampInMS(message.timestamp || message.originalTimestamp);
   let properties = {
     ...message.properties,
     ...get(message, 'context.traits'),
@@ -304,7 +305,7 @@ const processPageOrScreenEvents = (message, type, destination) => {
     ...mappedProperties,
     token: destination.Config.token,
     distinct_id: message.userId || message.anonymousId,
-    time: toUnixTimestamp(message.timestamp),
+    time: toUnixTimestampInMS(message.timestamp || message.originalTimestamp),
     ...buildUtmParams(message.context?.campaign),
   };
   if (destination.Config?.identityMergeApi === 'simplified') {

src/v0/destinations/mp/util.js

@@ -9,7 +9,7 @@ const {
   extractCustomFields,
   isAppleFamily,
   getBrowserInfo,
-  toUnixTimestamp,
+  toUnixTimestampInMS,
   batchMultiplexedEvents,
   getSuccessRespEvents,
   defaultBatchRequestConfig,
@@ -113,7 +113,7 @@ const createIdentifyResponse = (message, type, destination, responseBuilderSimpl
     $token: token,
     $distinct_id: message.userId || message.anonymousId,
     $ip: get(message, 'context.ip') || message.request_ip,
-    $time: toUnixTimestamp(message.timestamp),
+    $time: toUnixTimestampInMS(message.timestamp || message.originalTimestamp),
   };
 
   if (destination?.Config.identityMergeApi === 'simplified') {

src/v0/util/index.js

@@ -1232,6 +1232,9 @@ function toUnixTimestamp(timestamp) {
   return unixTimestamp;
 }
 
+// Accepts a timestamp and returns the corresponding unix timestamp in milliseconds
+const toUnixTimestampInMS = (timestamp) => new Date(timestamp).getTime();
+
 // Accecpts timestamp as a parameter and returns the difference of the same with current time.
 function getTimeDifference(timestamp) {
   const currentTime = Date.now();
@@ -2193,6 +2196,7 @@ module.exports = {
   stripTrailingSlash,
   toTitleCase,
   toUnixTimestamp,
+  toUnixTimestampInMS,
   updatePayload,
   checkInvalidRtTfEvents,
   simpleProcessRouterDest,

test/integrations/destinations/klaviyo/network.ts

@@ -1,75 +1,73 @@
 export const networkCallsData = [
-    {
-        httpReq: {
-            url: 'https://a.klaviyo.com/api/v2/list/XUepkK/subscribe',
-            method: 'GET',
-        },
-        httpRes: {
-            status: 200
-        },
+  {
+    httpReq: {
+      url: 'https://a.klaviyo.com/api/v2/list/XUepkK/subscribe',
+      method: 'GET',
     },
-    {
-        httpReq: {
-            url: 'https://a.klaviyo.com/api/v2/list/XUepkK/members',
-            method: 'GET',
-        },
-        httpRes: {
-            status: 200
-        },
+    httpRes: {
+      status: 200,
     },
-    {
-        httpReq: {
-            url: 'https://a.klaviyo.com/api/profiles',
-            method: 'GET',
-            data: {
-                attributes: {
-                    email: "[email protected]"
-                }
-            }
-        },
-        httpRes: {
-            status: 409,
-            data: {
-            }
-        },
+  },
+  {
+    httpReq: {
+      url: 'https://a.klaviyo.com/api/v2/list/XUepkK/members',
+      method: 'GET',
     },
-    {
-        httpReq: {
-            url: 'https://a.klaviyo.com/api/profiles',
-            method: 'GET',
-        },
-        httpRes: {
-            status: 201,
-            data: {
-                data: {
-                    id: '01GW3PHVY0MTCDGS0A1612HARX',
-                    attributes: {}
-                },
-            }
-        },
+    httpRes: {
+      status: 200,
     },
-    {
-        httpReq: {
-            url: 'https://a.klaviyo.com/api/profiles',
-            method: 'POST',
-            headers: { Authorization: 'Klaviyo-API-Key dummyPrivateApiKeyforfailure' }
-        },
-        httpRes: {
+  },
+  {
+    httpReq: {
+      url: 'https://a.klaviyo.com/api/profiles',
+      method: 'GET',
+      data: {
+        attributes: {
+          email: '[email protected]',
         },
+      },
+    },
+    httpRes: {
+      status: 409,
+      data: {},
     },
-    {
-        httpReq: {
-            url: 'https://a.klaviyo.com/api/profiles',
-            method: 'POST',
+  },
+  {
+    httpReq: {
+      url: 'https://a.klaviyo.com/api/profiles',
+      method: 'GET',
+    },
+    httpRes: {
+      status: 201,
+      data: {
+        data: {
+          id: '01GW3PHVY0MTCDGS0A1612HARX',
+          attributes: {},
         },
-        httpRes: {
-            status: 201,
-            data: {
-                data: {
-                    id: '01GW3PHVY0MTCDGS0A1612HARX',
-                    attributes: {}
-                },
-            }
+      },
+    },
+  },
+  {
+    httpReq: {
+      url: 'https://a.klaviyo.com/api/profiles',
+      method: 'POST',
+      headers: { Authorization: 'Klaviyo-API-Key dummyPrivateApiKeyforfailure' },
+    },
+    httpRes: {},
+  },
+  {
+    httpReq: {
+      url: 'https://a.klaviyo.com/api/profiles',
+      method: 'POST',
+    },
+    httpRes: {
+      status: 201,
+      data: {
+        data: {
+          id: '01GW3PHVY0MTCDGS0A1612HARX',
+          attributes: {},
         },
-    }
+      },
+    },
+  },
 ];

test/integrations/destinations/klaviyo/processor/data.ts

@@ -1491,6 +1491,115 @@ export const data = [
 			}
 		}
 	},
+	{
+		"name": "klaviyo",
+		"description": "Track event call -> Invalid event i.e. sent as non-string",
+		"feature": "processor",
+		"module": "destination",
+		"version": "v0",
+		"input": {
+			"request": {
+				"body": [
+					{
+						"destination": {
+							"Config": {
+								"publicApiKey": "dummyPublicApiKey",
+								"privateApiKey": "dummyPrivateApiKey"
+							}
+						},
+						"message": {
+							"type": "track",
+							"event": { "name": "TestEven002" },
+							"sentAt": "2021-01-25T16:12:02.048Z",
+							"userId": "sajal12",
+							"channel": "mobile",
+							"context": {
+								"os": {
+									"name": "Android",
+									"version": "10"
+								},
+								"app": {
+									"name": "KlaviyoTest",
+									"build": "1",
+									"version": "1.0",
+									"namespace": "com.rudderstack.android.rudderstack.sampleAndroidApp"
+								},
+								"device": {
+									"id": "9c6bd77ea9da3e68",
+									"name": "raphaelin",
+									"type": "android",
+									"model": "Redmi K20 Pro",
+									"manufacturer": "Xiaomi"
+								},
+								"locale": "en-IN",
+								"screen": {
+									"width": 1080,
+									"height": 2210,
+									"density": 440
+								},
+								"traits": {
+									"id": "user@1",
+									"age": "22",
+									"name": "Test",
+									"email": "[email protected]",
+									"phone": "9112340375",
+									"anonymousId": "9c6bd77ea9da3e68",
+									"description": "Sample description"
+								},
+								"library": {
+									"name": "com.rudderstack.android.sdk.core",
+									"version": "1.0.2"
+								},
+								"network": {
+									"wifi": true,
+									"carrier": "airtel",
+									"cellular": true,
+									"bluetooth": false
+								},
+								"timezone": "Asia/Kolkata",
+								"userAgent": "Dalvik/2.1.0 (Linux; U; Android 10; Redmi K20 Pro MIUI/V12.0.4.0.QFKINXM)"
+							},
+							"rudderId": "b7b24f86-f7bf-46d8-b2b4-ccafc080239c",
+							"messageId": "1611588776408-ee5a3212-fbf9-4cbb-bbad-3ed0f7c6a2ce",
+							"properties": {
+								"PreviouslyVicePresident": true,
+								"YearElected": 1801,
+								"VicePresidents": [
+									"Aaron Burr",
+									"George Clinton"
+								],
+								"revenue": 3000
+							},
+							"anonymousId": "9c6bd77ea9da3e68",
+							"integrations": {
+								"All": true
+							},
+							"originalTimestamp": "2021-01-25T15:32:56.409Z"
+						}
+					}
+				]
+			}
+		},
+		"output": {
+			"response": {
+				"status": 200,
+				"body": [
+					{
+						"error": "Event is a required field and should be a string",
+						"statTags": {
+							"destType": "KLAVIYO",
+							"errorCategory": "dataValidation",
+							"errorType": "instrumentation",
+							"feature": "processor",
+							"implementation": "native",
+							"module": "destination",
+						},
+						"statusCode": 400
+					}
+				]
+			}
+		}
+	},
 	{
 		"name": "klaviyo",
 		"description": "Track event call, with make email or phone as primary identifier toggle on",