chore(release): pull main into develop post release v1.85.1 (#3902)

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.85.1](https://github.com/rudderlabs/rudder-transformer/compare/v1.85.0...v1.85.1) (2024-11-21)
+
+
+### Bug Fixes
+
+* braze subscription batch size ([#3897](https://github.com/rudderlabs/rudder-transformer/issues/3897)) ([ca71a31](https://github.com/rudderlabs/rudder-transformer/commit/ca71a318e4d8d098116fe539964b699254f58617))
+* stringifying session ID for airship ([#3896](https://github.com/rudderlabs/rudder-transformer/issues/3896)) ([bb0b9dc](https://github.com/rudderlabs/rudder-transformer/commit/bb0b9dc1e5a56e8141c6cb56e89835ba61ee7761))
+
 ## [1.85.0](https://github.com/rudderlabs/rudder-transformer/compare/v1.84.0...v1.85.0) (2024-11-18)
 
 

package.json

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

src/v0/destinations/airship/data/airshipTrackConfig.json

@@ -22,7 +22,10 @@
   {
     "destKey": "session_id",
     "sourceKeys": ["properties.sessionId", "context.sessionId"],
-    "required": false
+    "required": false,
+    "metadata": {
+      "type": "toString"
+    }
   },
   {
     "destKey": "transaction",

src/v0/destinations/airship/transform.js

@@ -22,12 +22,20 @@ const {
   extractCustomFields,
   isEmptyObject,
   simpleProcessRouterDest,
+  convertToUuid,
 } = require('../../util');
 const { JSON_MIME_TYPE } = require('../../util/constant');
-const { transformSessionId } = require('./utils');
 
 const DEFAULT_ACCEPT_HEADER = 'application/vnd.urbanairship+json; version=3';
 
+const transformSessionId = (rawSessionId) => {
+  try {
+    return convertToUuid(rawSessionId);
+  } catch (error) {
+    throw new InstrumentationError(`Failed to transform session ID: ${error.message}`);
+  }
+};
+
 const identifyResponseBuilder = (message, { Config }) => {
   const tagPayload = constructPayload(message, identifyMapping);
   const { apiKey, dataCenter } = Config;
@@ -129,6 +137,8 @@ const trackResponseBuilder = async (message, { Config }) => {
 
   name = name.toLowerCase();
   const payload = constructPayload(message, trackMapping);
+
+  // ref : https://docs.airship.com/api/ua/#operation-api-custom-events-post
   if (isDefinedAndNotNullAndNotEmpty(payload.session_id)) {
     payload.session_id = transformSessionId(payload.session_id);
   }

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

@@ -982,7 +982,7 @@ describe('processBatch', () => {
     expect(result[0].batchedRequest[1].body.JSON.events.length).toBe(25); // Second batch contains remaining 25 events
     expect(result[0].batchedRequest[1].body.JSON.purchases.length).toBe(25); // Second batch contains remaining 25 purchases
     expect(result[0].batchedRequest[2].body.JSON.subscription_groups.length).toBe(50); // First batch contains 50 subscription group
-    expect(result[0].batchedRequest[3].body.JSON.subscription_groups.length).toBe(50); // First batch contains 25 subscription group
+    expect(result[0].batchedRequest[3].body.JSON.subscription_groups.length).toBe(50);
     expect(result[0].batchedRequest[4].body.JSON.merge_updates.length).toBe(50); // First batch contains 50 merge_updates
     expect(result[0].batchedRequest[5].body.JSON.merge_updates.length).toBe(50); // First batch contains 25 merge_updates
   });
@@ -1104,8 +1104,8 @@ describe('processBatch', () => {
     expect(result[0].batchedRequest[1].body.JSON.purchases.length).toBe(75); // Second batch contains remaining 75 purchases
     expect(result[0].batchedRequest[2].body.JSON.purchases.length).toBe(10); // Third batch contains remaining 10 purchases
     expect(result[0].batchedRequest[3].body.JSON.subscription_groups.length).toBe(50); // First batch contains 50 subscription group
-    expect(result[0].batchedRequest[4].body.JSON.subscription_groups.length).toBe(20); // First batch contains 20 subscription group
-    expect(result[0].batchedRequest[5].body.JSON.merge_updates.length).toBe(40); // First batch contains 50 merge_updates
+    expect(result[0].batchedRequest[4].body.JSON.subscription_groups.length).toBe(20); // Second batch contains 20 subscription group
+    expect(result[0].batchedRequest[5].body.JSON.merge_updates.length).toBe(40); // First batch contains 40 merge_updates
   });
 
   test('check success and failure scenarios both for processBatch', () => {

src/v0/util/index.js

@@ -16,6 +16,7 @@ const uaParser = require('ua-parser-js');
 const moment = require('moment-timezone');
 const sha256 = require('sha256');
 const crypto = require('crypto');
+const { v5 } = require('uuid');
 const {
   InstrumentationError,
   BaseError,
@@ -2330,6 +2331,29 @@ const isEventSentByVDMV1Flow = (event) => event?.message?.context?.mappedToDesti
 
 const isEventSentByVDMV2Flow = (event) =>
   event?.connection?.config?.destination?.schemaVersion === VDM_V2_SCHEMA_VERSION;
+
+const convertToUuid = (input) => {
+  const NAMESPACE = v5.DNS;
+
+  if (!isDefinedAndNotNull(input)) {
+    throw new InstrumentationError('Input is undefined or null.');
+  }
+
+  try {
+    // Stringify and trim the input
+    const trimmedInput = String(input).trim();
+
+    // Check for empty input after trimming
+    if (!trimmedInput) {
+      throw new InstrumentationError('Input is empty or invalid.');
+    }
+    // Generate and return UUID
+    return v5(trimmedInput, NAMESPACE);
+  } catch (error) {
+    const errorMessage = `Failed to transform input to uuid: ${error.message}`;
+    throw new InstrumentationError(errorMessage);
+  }
+};
 // ========================================================================
 // EXPORTS
 // ========================================================================
@@ -2456,4 +2480,5 @@ module.exports = {
   getRelativePathFromURL,
   removeEmptyKey,
   isAxiosError,
+  convertToUuid,
 };

src/v0/util/index.test.js

@@ -2,6 +2,7 @@ const { InstrumentationError } = require('@rudderstack/integrations-lib');
 const utilities = require('.');
 const { getFuncTestData } = require('../../../test/testHelper');
 const { FilteredEventsError } = require('./errorTypes');
+const { v5 } = require('uuid');
 const {
   hasCircularReference,
   flattenJson,
@@ -11,6 +12,7 @@ const {
   groupRouterTransformEvents,
   isAxiosError,
   removeHyphens,
+  convertToUuid,
 } = require('./index');
 const exp = require('constants');
 
@@ -985,3 +987,65 @@ describe('removeHyphens', () => {
     });
   });
 });
+
+describe('convertToUuid', () => {
+  const NAMESPACE = v5.DNS;
+
+  test('should generate UUID for valid string input', () => {
+    const input = 'testInput';
+    const expectedUuid = '7ba1e88f-acf9-5528-9c1c-0c897ed80e1e';
+    const result = convertToUuid(input);
+    expect(result).toBe(expectedUuid);
+  });
+
+  test('should generate UUID for valid numeric input', () => {
+    const input = 123456;
+    const expectedUuid = 'a52b2702-9bcf-5701-852a-2f4edc640fe1';
+    const result = convertToUuid(input);
+    expect(result).toBe(expectedUuid);
+  });
+
+  test('should trim spaces and generate UUID', () => {
+    const input = '   testInput   ';
+    const expectedUuid = '7ba1e88f-acf9-5528-9c1c-0c897ed80e1e';
+    const result = convertToUuid(input);
+    expect(result).toBe(expectedUuid);
+  });
+
+  test('should throw an error for empty input', () => {
+    const input = '';
+    expect(() => convertToUuid(input)).toThrow(InstrumentationError);
+    expect(() => convertToUuid(input)).toThrow('Input is empty or invalid.');
+  });
+
+  test('to throw an error for null input', () => {
+    const input = null;
+    expect(() => convertToUuid(input)).toThrow(InstrumentationError);
+    expect(() => convertToUuid(input)).toThrow('Input is undefined or null');
+  });
+
+  test('to throw an error for undefined input', () => {
+    const input = undefined;
+    expect(() => convertToUuid(input)).toThrow(InstrumentationError);
+    expect(() => convertToUuid(input)).toThrow('Input is undefined or null');
+  });
+
+  test('should throw an error for input that is whitespace only', () => {
+    const input = '   ';
+    expect(() => convertToUuid(input)).toThrow(InstrumentationError);
+    expect(() => convertToUuid(input)).toThrow('Input is empty or invalid.');
+  });
+
+  test('should handle long string input gracefully', () => {
+    const input = 'a'.repeat(1000);
+    const expectedUuid = v5(input, NAMESPACE);
+    const result = convertToUuid(input);
+    expect(result).toBe(expectedUuid);
+  });
+
+  test('any invalid input if stringified does not throw error', () => {
+    const input = {};
+    const result = convertToUuid(input);
+    expect(result).toBe('672ca00c-37f4-5d71-b8c3-6ae0848080ec');
+  });
+});