chore(release): pull main into develop post release v1.62.1 (#3293)

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.62.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.62.0...v1.62.1) (2024-04-18)
+
+
+### Bug Fixes
+
+* revert mixpanel deprecate /track ([#3291](https://github.com/rudderlabs/rudder-transformer/issues/3291)) ([ec068b4](https://github.com/rudderlabs/rudder-transformer/commit/ec068b49bd4a5652a762c60a8257c883e4709d1a))
+
 ## [1.62.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.61.1...v1.62.0) (2024-04-15)
 
 

package.json

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

src/util/prometheus.js

@@ -587,6 +587,12 @@ class Prometheus {
         type: 'gauge',
         labelNames: ['destination_id'],
       },
+      {
+        name: 'mixpanel_batch_track_pack_size',
+        help: 'mixpanel_batch_track_pack_size',
+        type: 'gauge',
+        labelNames: ['destination_id'],
+      },
       {
         name: 'mixpanel_batch_import_pack_size',
         help: 'mixpanel_batch_import_pack_size',

src/v0/destinations/mp/config.js

@@ -49,6 +49,7 @@ const MP_IDENTIFY_EXCLUSION_LIST = [
 ];
 
 const GEO_SOURCE_ALLOWED_VALUES = [null, 'reverse_geocoding'];
+const TRACK_MAX_BATCH_SIZE = 50;
 const IMPORT_MAX_BATCH_SIZE = 2000;
 const ENGAGE_MAX_BATCH_SIZE = 2000;
 const GROUPS_MAX_BATCH_SIZE = 200;
@@ -67,6 +68,7 @@ module.exports = {
   MP_IDENTIFY_EXCLUSION_LIST,
   getCreateDeletionTaskEndpoint,
   DISTINCT_ID_MAX_BATCH_SIZE,
+  TRACK_MAX_BATCH_SIZE,
   IMPORT_MAX_BATCH_SIZE,
   ENGAGE_MAX_BATCH_SIZE,
   GROUPS_MAX_BATCH_SIZE,

src/v0/destinations/mp/transform.js

@@ -24,6 +24,7 @@ const {
   mappingConfig,
   BASE_ENDPOINT,
   BASE_ENDPOINT_EU,
+  TRACK_MAX_BATCH_SIZE,
   IMPORT_MAX_BATCH_SIZE,
   ENGAGE_MAX_BATCH_SIZE,
   GROUPS_MAX_BATCH_SIZE,
@@ -46,19 +47,21 @@ const mPEventPropertiesConfigJson = mappingConfig[ConfigCategory.EVENT_PROPERTIE
 const setImportCredentials = (destConfig) => {
   const endpoint =
     destConfig.dataResidency === 'eu' ? `${BASE_ENDPOINT_EU}/import/` : `${BASE_ENDPOINT}/import/`;
+  const headers = { 'Content-Type': 'application/json' };
   const params = { strict: destConfig.strictMode ? 1 : 0 };
-  const { serviceAccountUserName, serviceAccountSecret, projectId, token } = destConfig;
-  let credentials;
-  if (token) {
-    credentials = `${token}:`;
+  const { apiSecret, serviceAccountUserName, serviceAccountSecret, projectId } = destConfig;
+  if (apiSecret) {
+    headers.Authorization = `Basic ${base64Convertor(`${apiSecret}:`)}`;
   } else if (serviceAccountUserName && serviceAccountSecret && projectId) {
-    credentials = `${serviceAccountUserName}:${serviceAccountSecret}`;
+    headers.Authorization = `Basic ${base64Convertor(
+      `${serviceAccountUserName}:${serviceAccountSecret}`,
+    )}`;
     params.projectId = projectId;
+  } else {
+    throw new InstrumentationError(
+      'Event timestamp is older than 5 days and no API secret or service account credentials (i.e. username, secret and projectId) are provided in destination configuration',
+    );
   }
-  const headers = {
-    'Content-Type': 'application/json',
-    Authorization: `Basic ${base64Convertor(credentials)}`,
-  };
   return { endpoint, headers, params };
 };
 
@@ -67,26 +70,37 @@ const responseBuilderSimple = (payload, message, eventType, destConfig) => {
   response.method = defaultPostRequestConfig.requestMethod;
   response.userId = message.userId || message.anonymousId;
   response.body.JSON_ARRAY = { batch: JSON.stringify([removeUndefinedValues(payload)]) };
-  const { dataResidency } = destConfig;
+  const { apiSecret, serviceAccountUserName, serviceAccountSecret, projectId, dataResidency } =
+    destConfig;
   const duration = getTimeDifference(message.timestamp);
   switch (eventType) {
     case EventType.ALIAS:
     case EventType.TRACK:
     case EventType.SCREEN:
-    case EventType.PAGE: {
-      if (duration.years > 5) {
+    case EventType.PAGE:
+      if (
+        !apiSecret &&
+        !(serviceAccountUserName && serviceAccountSecret && projectId) &&
+        duration.days <= 5
+      ) {
+        response.endpoint =
+          dataResidency === 'eu' ? `${BASE_ENDPOINT_EU}/track/` : `${BASE_ENDPOINT}/track/`;
+        response.headers = {};
+      } else if (duration.years > 5) {
         throw new InstrumentationError('Event timestamp should be within last 5 years');
+      } else {
+        const credentials = setImportCredentials(destConfig);
+        response.endpoint = credentials.endpoint;
+        response.headers = credentials.headers;
+        response.params = {
+          project_id: credentials.params?.projectId,
+          strict: credentials.params.strict,
+        };
+        break;
       }
-      const credentials = setImportCredentials(destConfig);
-      response.endpoint = credentials.endpoint;
-      response.headers = credentials.headers;
-      response.params = {
-        project_id: credentials.params?.projectId,
-        strict: credentials.params.strict,
-      };
       break;
-    }
-    case 'merge': {
+    case 'merge':
+      // eslint-disable-next-line no-case-declarations
       const credentials = setImportCredentials(destConfig);
       response.endpoint = credentials.endpoint;
       response.headers = credentials.headers;
@@ -95,7 +109,7 @@ const responseBuilderSimple = (payload, message, eventType, destConfig) => {
         strict: credentials.params.strict,
       };
       break;
-    }
+
     default:
       response.endpoint =
         dataResidency === 'eu' ? `${BASE_ENDPOINT_EU}/engage/` : `${BASE_ENDPOINT}/engage/`;
@@ -470,6 +484,7 @@ const processRouterDest = async (inputs, reqMetadata) => {
   const batchSize = {
     engage: 0,
     groups: 0,
+    track: 0,
     import: 0,
   };
 
@@ -501,16 +516,23 @@ const processRouterDest = async (inputs, reqMetadata) => {
       );
 
       transformedPayloads = lodash.flatMap(transformedPayloads);
-      const { engageEvents, groupsEvents, importEvents, batchErrorRespList } =
+      const { engageEvents, groupsEvents, trackEvents, importEvents, batchErrorRespList } =
         groupEventsByEndpoint(transformedPayloads);
 
       const engageRespList = batchEvents(engageEvents, ENGAGE_MAX_BATCH_SIZE, reqMetadata);
       const groupsRespList = batchEvents(groupsEvents, GROUPS_MAX_BATCH_SIZE, reqMetadata);
+      const trackRespList = batchEvents(trackEvents, TRACK_MAX_BATCH_SIZE, reqMetadata);
       const importRespList = batchEvents(importEvents, IMPORT_MAX_BATCH_SIZE, reqMetadata);
-      const batchSuccessRespList = [...engageRespList, ...groupsRespList, ...importRespList];
+      const batchSuccessRespList = [
+        ...engageRespList,
+        ...groupsRespList,
+        ...trackRespList,
+        ...importRespList,
+      ];
 
       batchSize.engage += engageRespList.length;
       batchSize.groups += groupsRespList.length;
+      batchSize.track += trackRespList.length;
       batchSize.import += importRespList.length;
 
       return [...batchSuccessRespList, ...batchErrorRespList];

src/v0/destinations/mp/util.js

@@ -136,7 +136,7 @@ const createIdentifyResponse = (message, type, destination, responseBuilderSimpl
  * @returns
  */
 const isImportAuthCredentialsAvailable = (destination) =>
-  destination.Config.token ||
+  destination.Config.apiSecret ||
   (destination.Config.serviceAccountSecret &&
     destination.Config.serviceAccountUserName &&
     destination.Config.projectId);
@@ -179,6 +179,7 @@ const groupEventsByEndpoint = (events) => {
   const eventMap = {
     engage: [],
     groups: [],
+    track: [],
     import: [],
   };
   const batchErrorRespList = [];
@@ -203,6 +204,7 @@ const groupEventsByEndpoint = (events) => {
   return {
     engageEvents: eventMap.engage,
     groupsEvents: eventMap.groups,
+    trackEvents: eventMap.track,
     importEvents: eventMap.import,
     batchErrorRespList,
   };
@@ -347,6 +349,7 @@ const generatePageOrScreenCustomEventName = (message, userDefinedEventTemplate)
  * @param {Object} batchSize - The object containing the batch size for different endpoints.
  * @param {number} batchSize.engage - The batch size for engage endpoint.
  * @param {number} batchSize.groups - The batch size for group endpoint.
+ * @param {number} batchSize.track - The batch size for track endpoint.
  * @param {number} batchSize.import - The batch size for import endpoint.
  * @param {string} destinationId - The ID of the destination.
  * @returns {void}
@@ -358,6 +361,9 @@ const recordBatchSizeMetrics = (batchSize, destinationId) => {
   stats.gauge('mixpanel_batch_group_pack_size', batchSize.groups, {
     destination_id: destinationId,
   });
+  stats.gauge('mixpanel_batch_track_pack_size', batchSize.track, {
+    destination_id: destinationId,
+  });
   stats.gauge('mixpanel_batch_import_pack_size', batchSize.import, {
     destination_id: destinationId,
   });

src/v0/destinations/mp/util.test.js

@@ -18,6 +18,7 @@ describe('Unit test cases for groupEventsByEndpoint', () => {
     expect(result).toEqual({
       engageEvents: [],
       groupsEvents: [],
+      trackEvents: [],
       importEvents: [],
       batchErrorRespList: [],
     });
@@ -121,6 +122,19 @@ describe('Unit test cases for groupEventsByEndpoint', () => {
           },
         },
       ],
+      trackEvents: [
+        {
+          message: {
+            endpoint: '/track',
+            body: {
+              JSON_ARRAY: {
+                batch: '[{prop:4}]',
+              },
+            },
+            userId: 'user1',
+          },
+        },
+      ],
       importEvents: [
         {
           message: {

test/integrations/destinations/mp/common.ts

@@ -7,7 +7,7 @@ const defaultMockFns = () => {
 const sampleDestination: Destination = {
   Config: {
     apiKey: 'dummyApiKey',
-    token: 'test_api_token',
+    token: 'dummyApiKey',
     prefixProperties: true,
     useNativeSDK: false,
   },