Merge branch 'develop' into fix.transformerV0Metrics

rudderlabs · Apr 13, 2024 · bad0257 · bad0257
2 parents db27387 + 3721a44
commit bad0257
Show file tree

Hide file tree

Showing 43 changed files with 970 additions and 334 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -26,6 +26,7 @@
       "off",
       { "cases": { "camelCase": true, "pascalCase": true, "kebabCase": true } }
     ],
+    "import/no-import-module-exports": "off",
     "unicorn/no-instanceof-array": "error",
     "unicorn/no-static-only-class": "error",
     "unicorn/consistent-destructuring": "error",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,7 +64,7 @@
     "@koa/router": "^12.0.0",
     "@ndhoule/extend": "^2.0.0",
     "@pyroscope/nodejs": "^0.2.9",
-    "@rudderstack/integrations-lib": "^0.2.7",
+    "@rudderstack/integrations-lib": "^0.2.8",
     "@rudderstack/workflow-engine": "^0.7.5",
     "@shopify/jest-koa-mocks": "^5.1.1",
     "ajv": "^8.12.0",

diff --git a/src/cdk/v2/destinations/fullstory/procWorkflow.yaml b/src/cdk/v2/destinations/fullstory/procWorkflow.yaml
@@ -76,7 +76,7 @@ steps:
         "use_most_recent": .message.properties.useMostRecent,
       };
       $.context.payload.user = {
-        "id": .message.properties.userId ?? .message.userId,
+        "uid": .message.properties.userId ?? .message.userId,
       }
 
   - name: cleanPayload

diff --git a/src/cdk/v2/handler.ts b/src/cdk/v2/handler.ts
@@ -1,19 +1,19 @@
 import {
-  WorkflowEngine,
-  WorkflowEngineFactory,
-  TemplateType,
   ExecutionBindings,
   StepOutput,
+  TemplateType,
+  WorkflowEngine,
+  WorkflowEngineFactory,
 } from '@rudderstack/workflow-engine';
 import { FixMe } from '../../util/types';
 
 import tags from '../../v0/util/tags';
 
 import {
   getErrorInfo,
+  getPlatformBindingsPaths,
   getRootPathForDestination,
   getWorkflowPath,
-  getPlatformBindingsPaths,
   isCdkV2Destination,
 } from './utils';
 
@@ -82,10 +82,12 @@ export async function processCdkV2Workflow(
   destType: string,
   parsedEvent: FixMe,
   feature: string,
+  logger: FixMe,
   requestMetadata: NonNullable<unknown> = {},
   bindings: Record<string, FixMe> = {},
 ) {
   try {
+    logger.debug(`Processing cdkV2 workflow`);
     const workflowEngine = await getCachedWorkflowEngine(destType, feature, bindings);
     return await executeWorkflow(workflowEngine, parsedEvent, requestMetadata);
   } catch (error) {

diff --git a/src/controllers/bulkUpload.ts b/src/controllers/bulkUpload.ts
@@ -1,10 +1,10 @@
 /* eslint-disable global-require, import/no-dynamic-require, @typescript-eslint/no-unused-vars */
+import { structuredLogger as logger } from '@rudderstack/integrations-lib';
 import { client as errNotificationClient } from '../util/errorNotifier';
-import logger from '../logger';
 import {
+  getDestFileUploadHandler,
   getJobStatusHandler,
   getPollStatusHandler,
-  getDestFileUploadHandler,
 } from '../util/fetchDestinationHandlers';
 import { CatchErr, ContextBodySimple } from '../util/types';
 // TODO: To be refactored and redisgned
@@ -31,10 +31,7 @@ const getReqMetadata = (ctx) => {
 };
 
 export const fileUpload = async (ctx) => {
-  logger.debug(
-    'Native(Bulk-Upload): Request to transformer:: /fileUpload route',
-    JSON.stringify(ctx.request.body),
-  );
+  logger.debug('Native(Bulk-Upload): Request to transformer:: /fileUpload route', ctx.request.body);
   const getReqMetadataFileUpload = () => {
     try {
       const reqBody = ctx.request.body;
@@ -69,18 +66,12 @@ export const fileUpload = async (ctx) => {
     });
   }
   ctx.body = response;
-  logger.debug(
-    'Native(Bulk-Upload): Response from transformer:: /fileUpload route',
-    JSON.stringify(ctx.body),
-  );
+  logger.debug('Native(Bulk-Upload): Response from transformer:: /fileUpload route', ctx.body);
   return ctx.body;
 };
 
 export const pollStatus = async (ctx) => {
-  logger.debug(
-    'Native(Bulk-Upload): Request to transformer:: /pollStatus route',
-    JSON.stringify(ctx.request.body),
-  );
+  logger.debug('Native(Bulk-Upload): Request to transformer:: /pollStatus route', ctx.request.body);
 
   const { destType }: ContextBodySimple = ctx.request.body;
   const destFileUploadHandler = getPollStatusHandler('v0', destType.toLowerCase());
@@ -104,17 +95,14 @@ export const pollStatus = async (ctx) => {
     });
   }
   ctx.body = response;
-  logger.debug(
-    'Native(Bulk-Upload): Request from transformer:: /pollStatus route',
-    JSON.stringify(ctx.body),
-  );
+  logger.debug('Native(Bulk-Upload): Request from transformer:: /pollStatus route', ctx.body);
   return ctx.body;
 };
 
 export const getWarnJobStatus = async (ctx) => {
   logger.debug(
     'Native(Bulk-Upload): Request to transformer:: /getWarningJobs route',
-    JSON.stringify(ctx.request.body),
+    ctx.request.body,
   );
 
   const { destType }: ContextBodySimple = ctx.request.body;
@@ -140,17 +128,14 @@ export const getWarnJobStatus = async (ctx) => {
     });
   }
   ctx.body = response;
-  logger.debug(
-    'Native(Bulk-Upload): Request from transformer:: /getWarningJobs route',
-    JSON.stringify(ctx.body),
-  );
+  logger.debug('Native(Bulk-Upload): Request from transformer:: /getWarningJobs route', ctx.body);
   return ctx.body;
 };
 
 export const getFailedJobStatus = async (ctx) => {
   logger.debug(
     'Native(Bulk-Upload): Request to transformer:: /getFailedJobs route',
-    JSON.stringify(ctx.request.body),
+    ctx.request.body,
   );
 
   const { destType }: ContextBodySimple = ctx.request.body;
@@ -176,9 +161,6 @@ export const getFailedJobStatus = async (ctx) => {
     });
   }
   ctx.body = response;
-  logger.debug(
-    'Native(Bulk-Upload): Request from transformer:: /getFailedJobs route',
-    JSON.stringify(ctx.body),
-  );
+  logger.debug('Native(Bulk-Upload): Request from transformer:: /getFailedJobs route', ctx.body);
   return ctx.body;
 };
diff --git a/src/controllers/delivery.ts b/src/controllers/delivery.ts
@@ -1,28 +1,30 @@
 /* eslint-disable prefer-destructuring */
 /* eslint-disable sonarjs/no-duplicate-string */
+import {
+  isDefinedAndNotNullAndNotEmpty,
+  structuredLogger as logger,
+} from '@rudderstack/integrations-lib';
 import { Context } from 'koa';
-import { isDefinedAndNotNullAndNotEmpty } from '@rudderstack/integrations-lib';
+import { ServiceSelector } from '../helpers/serviceSelector';
+import { DeliveryTestService } from '../services/delivertTest/deliveryTest';
+import { DestinationPostTransformationService } from '../services/destination/postTransformation';
 import { MiscService } from '../services/misc';
 import {
-  DeliveryV1Response,
   DeliveryV0Response,
+  DeliveryV1Response,
   ProcessorTransformationOutput,
   ProxyV0Request,
   ProxyV1Request,
 } from '../types/index';
-import { ServiceSelector } from '../helpers/serviceSelector';
-import { DeliveryTestService } from '../services/delivertTest/deliveryTest';
-import { ControllerUtility } from './util';
-import logger from '../logger';
-import { DestinationPostTransformationService } from '../services/destination/postTransformation';
-import tags from '../v0/util/tags';
 import { FixMe } from '../util/types';
+import tags from '../v0/util/tags';
+import { ControllerUtility } from './util';
 
 const NON_DETERMINABLE = 'Non-determinable';
 
 export class DeliveryController {
   public static async deliverToDestination(ctx: Context) {
-    logger.debug('Native(Delivery):: Request to transformer::', JSON.stringify(ctx.request.body));
+    logger.info('Native(Delivery):: Request to transformer::', ctx.request.body);
     let deliveryResponse: DeliveryV0Response;
     const requestMetadata = MiscService.getRequestMetadata(ctx);
     const deliveryRequest = ctx.request.body as ProxyV0Request;
@@ -52,12 +54,12 @@ export class DeliveryController {
     ctx.body = { output: deliveryResponse };
     ControllerUtility.deliveryPostProcess(ctx, deliveryResponse.status);
 
-    logger.debug('Native(Delivery):: Response from transformer::', JSON.stringify(ctx.body));
+    logger.debug('Native(Delivery):: Response from transformer::', ctx.body);
     return ctx;
   }
 
   public static async deliverToDestinationV1(ctx: Context) {
-    logger.debug('Native(Delivery):: Request to transformer::', JSON.stringify(ctx.request.body));
+    logger.debug('Native(Delivery):: Request to transformer::', ctx.request.body);
     let deliveryResponse: DeliveryV1Response;
     const requestMetadata = MiscService.getRequestMetadata(ctx);
     const deliveryRequest = ctx.request.body as ProxyV1Request;
@@ -91,15 +93,12 @@ export class DeliveryController {
       ControllerUtility.deliveryPostProcess(ctx);
     }
 
-    logger.debug('Native(Delivery):: Response from transformer::', JSON.stringify(ctx.body));
+    logger.debug('Native(Delivery):: Response from transformer::', ctx.body);
     return ctx;
   }
 
   public static async testDestinationDelivery(ctx: Context) {
-    logger.debug(
-      'Native(Delivery-Test):: Request to transformer::',
-      JSON.stringify(ctx.request.body),
-    );
+    logger.debug('Native(Delivery-Test):: Request to transformer::', ctx.request.body);
     const { destination }: { destination: string } = ctx.params;
     const { version }: { version: string } = ctx.params;
     const {
@@ -117,7 +116,7 @@ export class DeliveryController {
     );
     ctx.body = { output: response };
     ControllerUtility.postProcess(ctx);
-    logger.debug('Native(Delivery-Test):: Response from transformer::', JSON.stringify(ctx.body));
+    logger.debug('Native(Delivery-Test):: Response from transformer::', ctx.body);
     return ctx;
   }
 }