fix: conflict resolved

.github/workflows/dt-test-and-report-code-coverage.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Checkout
         uses: actions/[email protected]
         with:
-          fetch-depth: 1
+          fetch-depth: 0
 
       - name: Setup Node
         uses: actions/[email protected]

.github/workflows/prepare-for-staging-deploy.yml

@@ -78,6 +78,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [generate-tag-names, build-transformer-image, build-user-transformer-image]
     env:
+      TF_IMAGE_REPOSITORY: rudderstack/rudder-transformer
       TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name }}
       UT_TAG_NAME: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
     steps:
@@ -113,6 +114,7 @@ jobs:
             git checkout -b $BRANCH_NAME
 
             cd helm-charts/shared-services/per-az/environment/staging
+            yq eval -i ".rudder-transformer.image.repository=\"$TF_IMAGE_REPOSITORY\"" staging.yaml
             yq eval -i ".rudder-transformer.image.tag=\"$TAG_NAME\"" staging.yaml
             yq eval -i ".user-transformer.image.tag=\"$TAG_NAME\"" staging.yaml
             git add staging.yaml

.github/workflows/verify.yml

@@ -35,8 +35,8 @@ jobs:
 
       - name: Filter JS/TS Files
         run: |
-          echo "${{ steps.files.outputs.added_modified }}" | tr ' ' '\n' | grep -E '\.(js|ts|jsx|tsx)$' > changed_files.txt
-          if [ ! -s changed_files.txt ]; then
+          changed_files=$(echo "${{ steps.files.outputs.added_modified }}" | tr ' ' '\n' | grep -E '\.(js|ts|jsx|tsx)$' || true)
+          if [ -z "$changed_files" ]; then
             echo "No JS/TS files to format or lint."
             exit 0
           fi

src/util/prometheus.js

@@ -532,6 +532,12 @@ class Prometheus {
         type: 'gauge',
         labelNames: ['destination_id'],
       },
+      {
+        name: 'mailjet_packing_size',
+        help: 'mailjet_packing_size',
+        type: 'gauge',
+        labelNames: ['group'],
+      },
       {
         name: 'hs_batch_size',
         help: 'hs_batch_size',

src/v0/destinations/google_adwords_offline_conversions/transform.js

@@ -18,6 +18,7 @@ const {
   getClickConversionPayloadAndEndpoint,
   getConsentsDataFromIntegrationObj,
   getCallConversionPayload,
+  updateConversion,
 } = require('./utils');
 const helper = require('./helper');
 
@@ -48,6 +49,9 @@ const getConversions = (message, metadata, { Config }, event, conversionType) =>
       filteredCustomerId,
       eventLevelConsentsData,
     );
+    convertedPayload.payload.conversions[0] = updateConversion(
+      convertedPayload.payload.conversions[0],
+    );
     payload = convertedPayload.payload;
     endpoint = convertedPayload.endpoint;
   } else if (conversionType === 'store') {

src/v0/destinations/google_adwords_offline_conversions/utils.js

@@ -317,6 +317,35 @@ const getStoreConversionPayload = (message, Config, event) => {
   return payload;
 };
 
+const hasClickId = (conversion) => {
+  const { gbraid, wbraid, gclid } = conversion;
+  return gclid || wbraid || gbraid;
+};
+const populateUserIdentifier = ({ email, phone, properties, payload, UserIdentifierSource }) => {
+  const copiedPayload = cloneDeep(payload);
+  // userIdentifierSource
+  // if userIdentifierSource doesn't exist in properties
+  // then it is taken from the webapp config
+  if (!properties.userIdentifierSource && UserIdentifierSource !== 'none') {
+    set(
+      copiedPayload,
+      'conversions[0].userIdentifiers[0].userIdentifierSource',
+      UserIdentifierSource,
+    );
+    // one of email or phone must be provided when none of gclid, wbraid and gbraid provided
+  }
+  if (!email && !phone) {
+    if (!hasClickId(copiedPayload.conversions[0])) {
+      throw new InstrumentationError(
+        `Either an email address or a phone number is required for user identification when none of gclid, wbraid, or gbraid is provided.`,
+      );
+    } else {
+      // we are deleting userIdentifiers if any one of gclid, wbraid and gbraid is there but email or phone is not present
+      delete copiedPayload.conversions[0].userIdentifiers;
+    }
+  }
+  return copiedPayload;
+};
 const getClickConversionPayloadAndEndpoint = (
   message,
   Config,
@@ -335,7 +364,7 @@ const getClickConversionPayloadAndEndpoint = (
     updatedClickMapping = removeHashToSha256TypeFromMappingJson(updatedClickMapping);
   }
 
-  const payload = constructPayload(message, updatedClickMapping);
+  let payload = constructPayload(message, updatedClickMapping);
 
   const endpoint = CLICK_CONVERSION.replace(':customerId', filteredCustomerId);
 
@@ -353,17 +382,8 @@ const getClickConversionPayloadAndEndpoint = (
     set(payload, 'conversions[0].cartData.items', itemList);
   }
 
-  // userIdentifierSource
-  // if userIdentifierSource doesn't exist in properties
-  // then it is taken from the webapp config
-  if (!properties.userIdentifierSource && UserIdentifierSource !== 'none') {
-    set(payload, 'conversions[0].userIdentifiers[0].userIdentifierSource', UserIdentifierSource);
+  payload = populateUserIdentifier({ email, phone, properties, payload, UserIdentifierSource });
 
-    // one of email or phone must be provided
-    if (!email && !phone) {
-      throw new InstrumentationError(`Either of email or phone is required for user identifier`);
-    }
-  }
   // either of email or phone should be passed
   // defaultUserIdentifier depends on the webapp configuration
   // Ref - https://developers.google.com/google-ads/api/rest/reference/rest/v11/customers/uploadClickConversions#ClickConversion
@@ -411,6 +431,25 @@ const getConsentsDataFromIntegrationObj = (message) => {
   return integrationObj?.consents || {};
 };
 
+/**
+ * remove redundant ids
+ * @param {*} conversionCopy
+ */
+const updateConversion = (conversion) => {
+  const conversionCopy = cloneDeep(conversion);
+  if (conversionCopy.gclid) {
+    delete conversionCopy.wbraid;
+    delete conversionCopy.gbraid;
+  }
+  if (conversionCopy.wbraid && conversionCopy.gbraid) {
+    throw new InstrumentationError(`You can't use both wbraid and gbraid.`);
+  }
+  if (conversionCopy.wbraid || conversionCopy.gbraid) {
+    delete conversionCopy.userIdentifiers;
+  }
+  return conversionCopy;
+};
+
 module.exports = {
   validateDestinationConfig,
   generateItemListFromProducts,
@@ -423,4 +462,5 @@ module.exports = {
   getExisitingUserIdentifier,
   getConsentsDataFromIntegrationObj,
   getCallConversionPayload,
+  updateConversion,
 };

src/v0/destinations/google_adwords_offline_conversions/utils.test.js

@@ -244,7 +244,9 @@ describe('getClickConversionPayloadAndEndpoint util tests', () => {
     };
     expect(() =>
       getClickConversionPayloadAndEndpoint(fittingPayload, config, '9625812972'),
-    ).toThrow('Either of email or phone is required for user identifier');
+    ).toThrow(
+      'Either an email address or a phone number is required for user identification when none of gclid, wbraid, or gbraid is provided.',
+    );
   });
 
   it('finaliseConsent', () => {

src/v0/destinations/mailjet/transform.js

@@ -1,5 +1,6 @@
 const lodash = require('lodash');
 const { TransformationError, InstrumentationError } = require('@rudderstack/integrations-lib');
+const stats = require('../../../util/stats');
 const {
   getSuccessRespEvents,
   defaultRequestConfig,
@@ -105,6 +106,9 @@ const batchEvents = (successRespList) => {
     const eventChunks = lodash.chunk(eventGroups[combination], MAX_BATCH_SIZE);
     // eventChunks = [[e1,e2,e3,..batchSize],[e1,e2,e3,..batchSize]..]
     eventChunks.forEach((chunk) => {
+      stats.gauge('mailjet_packing_size', chunk.length, {
+        group: combination,
+      });
       const batchEventResponse = generateBatchedPaylaodForArray(chunk, combination);
       batchedResponseList.push(
         getSuccessRespEvents(

src/v0/util/facebookUtils/networkHandler.js

@@ -85,7 +85,10 @@ const errorDetailsMap = {
         "Object with ID 'PIXEL_ID' / 'DATASET_ID' / 'AUDIENCE_ID' does not exist, cannot be loaded due to missing permissions, or does not support this operation",
       )
       .build(),
-    default: new ErrorDetailsExtractorBuilder().setStatus(400).setMessageField('message').build(),
+    default: new ErrorDetailsExtractorBuilder()
+      .setStatus(400)
+      .setMessageField('error_user_msg')
+      .build(),
   },
   1: {
     // An unknown error occurred.
@@ -107,66 +110,64 @@ const errorDetailsMap = {
       .setStat({
         [TAG_NAMES.ERROR_TYPE]: ERROR_TYPES.AUTH,
       })
-      .setMessage(
-        'The session has been invalidated because the user changed their password or Facebook has changed the session for security reasons',
-      )
+      .setMessageField('error_user_msg')
       .build(),
 
     463: new ErrorDetailsExtractorBuilder()
       .setStatus(400)
       .setStat({
         [TAG_NAMES.ERROR_TYPE]: ERROR_TYPES.AUTH,
       })
-      .setMessageField('message')
+      .setMessageField('error_user_msg')
       .build(),
     default: new ErrorDetailsExtractorBuilder()
       .setStatus(400)
       .setStat({
         [TAG_NAMES.ERROR_TYPE]: ERROR_TYPES.AUTH,
       })
-      .setMessage('Invalid OAuth 2.0 access token')
+      .setMessageField('error_user_msg')
       .build(),
   },
   3: {
     default: new ErrorDetailsExtractorBuilder()
       .setStatus(400)
-      .setMessage('Capability or permissions issue.')
+      .setMessageField('error_user_msg')
       .build(),
   },
   2: {
     default: new ErrorDetailsExtractorBuilder()
       .setStatus(500)
-      .setMessage('Temporary issue due to downtime.')
+      .setMessageField('error_user_msg')
       .build(),
   },
   341: {
     default: new ErrorDetailsExtractorBuilder()
       .setStatus(500)
-      .setMessage('Application limit reached: Temporary issue due to downtime or throttling')
+      .setMessageField('error_user_msg')
       .build(),
   },
   368: {
     default: new ErrorDetailsExtractorBuilder()
       .setStatus(500)
-      .setMessage('Temporarily blocked for policies violations.')
+      .setMessageField('error_user_msg')
       .build(),
   },
   5000: {
     default: new ErrorDetailsExtractorBuilder()
       .setStatus(500)
-      .setMessage('Unknown Error Code')
+      .setMessageField('error_user_msg')
       .build(),
   },
   4: {
     default: new ErrorDetailsExtractorBuilder()
       .setStatus(429)
-      .setMessage('API Too Many Calls')
+      .setMessageField('error_user_msg')
       .build(),
   },
   17: {
     default: new ErrorDetailsExtractorBuilder()
       .setStatus(429)
-      .setMessage('API User Too Many Calls')
+      .setMessageField('error_user_msg')
       .build(),
   },
   // facebook custom audience related error codes
@@ -176,9 +177,7 @@ const errorDetailsMap = {
   294: {
     default: new ErrorDetailsExtractorBuilder()
       .setStatus(400)
-      .setMessage(
-        'Missing permission. Please make sure you have ads_management permission and the application is included in the allowlist',
-      )
+      .setMessageField('error_user_msg')
       .build(),
   },
   1487301: {
@@ -214,7 +213,10 @@ const errorDetailsMap = {
       .build(),
   },
   200: {
-    default: new ErrorDetailsExtractorBuilder().setStatus(403).setMessageField('message').build(),
+    default: new ErrorDetailsExtractorBuilder()
+      .setStatus(403)
+      .setMessageField('error_user_msg')
+      .build(),
   },
   21009: {
     default: new ErrorDetailsExtractorBuilder().setStatus(500).setMessageField('message').build(),
@@ -236,9 +238,11 @@ const getStatus = (error) => {
   const isErrorDetailEmpty = isEmpty(errorDetail);
   if (isErrorDetailEmpty) {
     // Unhandled error response
+    const errorMessage = get(error?.error || error, 'error_user_msg');
     return {
       status: errorStatus,
       stats: { [TAG_NAMES.META]: METADATA.UNHANDLED_STATUS_CODE },
+      errorMessage: errorMessage || JSON.stringify(error),
     };
   }
   errorStatus = errorDetail.status;

src/v1/sources/shopify/webhookTransformations/serverSideTransform.js

@@ -1,18 +1,9 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 const lodash = require('lodash');
 const get = require('get-value');
-// const { RedisError } = require('@rudderstack/integrations-lib');
 const stats = require('../../../../util/stats');
-const {
-  getShopifyTopic,
-  // createPropertiesForEcomEvent,
-  extractEmailFromPayload,
-  getAnonymousIdAndSessionId,
-  // getHashLineItems,
-} = require('../../../../v0/sources/shopify/util');
-// const logger = require('../../../logger');
+const { getShopifyTopic, extractEmailFromPayload } = require('../../../../v0/sources/shopify/util');
 const { removeUndefinedAndNullValues, isDefinedAndNotNull } = require('../../../../v0/util');
-// const { RedisDB } = require('../../../util/redis/redisConnector');
 const Message = require('../../../../v0/sources/message');
 const { EventType } = require('../../../../constants');
 const {
@@ -28,6 +19,7 @@ const {
 const {
   createPropertiesForEcomEventFromWebhook,
   getProductsFromLineItems,
+  getAnonymousIdFromAttributes,
 } = require('./serverSideUtlis');
 
 const NO_OPERATION_SUCCESS = {
@@ -128,12 +120,9 @@ const processEvent = async (inputEvent, metricMetadata) => {
       message.setProperty('traits.email', email);
     }
   }
+  // attach anonymousId if the event is track event using note_attributes
   if (message.type !== EventType.IDENTIFY) {
-    const { anonymousId } = await getAnonymousIdAndSessionId(
-      message,
-      { shopifyTopic, ...metricMetadata },
-      null,
-    );
+    const anonymousId = getAnonymousIdFromAttributes(event);
     if (isDefinedAndNotNull(anonymousId)) {
       message.setProperty('anonymousId', anonymousId);
     }

src/v1/sources/shopify/webhookTransformations/serverSideUtils.test.js

@@ -1,6 +1,7 @@
 const {
   getProductsFromLineItems,
   createPropertiesForEcomEventFromWebhook,
+  getAnonymousIdFromAttributes,
 } = require('./serverSideUtlis');
 
 const { constructPayload } = require('../../../../v0/util');
@@ -109,4 +110,21 @@ describe('serverSideUtils.js', () => {
       });
     });
   });
+
+  describe('getAnonymousIdFromAttributes', () => {
+    // Handles empty note_attributes array gracefully
+    it('should return null when note_attributes is an empty array', async () => {
+      const event = { note_attributes: [] };
+      const result = await getAnonymousIdFromAttributes(event);
+      expect(result).toBeNull();
+    });
+
+    it('get anonymousId from noteAttributes', async () => {
+      const event = {
+        note_attributes: [{ name: 'rudderAnonymousId', value: '123456' }],
+      };
+      const result = await getAnonymousIdFromAttributes(event);
+      expect(result).toEqual('123456');
+    });
+  });
 });