Merge branch 'develop' into fix.marketo-jobStatus

rudderlabs · Jan 30, 2024 · 67ac4bb · 67ac4bb
2 parents 952fda6 + 5ad55a2
commit 67ac4bb
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 50 deletions.
diff --git a/src/v0/destinations/mp/transform.js b/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') {

diff --git a/src/v0/destinations/mp/util.js b/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') {

diff --git a/src/v0/util/index.js b/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();
@@ -2194,6 +2197,7 @@ module.exports = {
   stripTrailingSlash,
   toTitleCase,
   toUnixTimestamp,
+  toUnixTimestampInMS,
   updatePayload,
   checkInvalidRtTfEvents,
   simpleProcessRouterDest,