feat: shopify: ecom fix and enhancement

src/util/prometheus.js

@@ -449,13 +449,13 @@ class Prometheus {
         name: 'shopify_client_side_identifier_event',
         help: 'shopify_client_side_identifier_event',
         type: 'counter',
-        labelNames: ['writeKey', 'timestamp'],
+        labelNames: ['writeKey', 'timestamp', 'sourceId'],
       },
       {
         name: 'shopify_server_side_identifier_event',
         help: 'shopify_server_side_identifier_event',
         type: 'counter',
-        labelNames: ['writeKey', 'timestamp'],
+        labelNames: ['writeKey', 'timestamp', 'sourceId'],
       },
       {
         name: 'fb_pixel_timestamp_error',
@@ -485,19 +485,19 @@ class Prometheus {
         name: 'shopify_redis_failures',
         help: 'shopify_redis_failures',
         type: 'counter',
-        labelNames: ['type', 'writeKey', 'source'],
+        labelNames: ['type', 'writeKey', 'source', 'sourceId'],
       },
       {
         name: 'shopify_redis_calls',
         help: 'shopify_redis_calls',
         type: 'counter',
-        labelNames: ['type', 'writeKey', 'source', 'field'],
+        labelNames: ['type', 'writeKey', 'source', 'field', 'sourceId'],
       },
       {
         name: 'shopify_redis_no_val',
         help: 'shopify_redis_no_val',
         type: 'counter',
-        labelNames: ['writeKey', 'source'],
+        labelNames: ['writeKey', 'source', 'sourceId'],
       },
       {
         name: 'get_transformation_code',
@@ -515,7 +515,7 @@ class Prometheus {
         name: 'invalid_shopify_event',
         help: 'invalid_shopify_event',
         type: 'counter',
-        labelNames: ['writeKey', 'source', 'shopifyTopic'],
+        labelNames: ['writeKey', 'source', 'shopifyTopic', 'sourceId'],
       },
       {
         name: 'outgoing_request_count',
@@ -563,6 +563,18 @@ class Prometheus {
         type: 'histogram',
         labelNames: ['feature', 'destType', 'endpointPath'],
       },
+      {
+        name: 'shopify_store_data_latency',
+        help: 'shopify_store_data_latency',
+        type: 'histogram',
+        labelNames: ['writeKey', 'sourceId', 'source'],
+      },
+      {
+        name: 'shopify_fetch_data_latency',
+        help: 'shopify_fetch_data_latency',
+        type: 'histogram',
+        labelNames: ['writeKey', 'sourceId', 'source'],
+      },
       {
         name: 'http_request_duration',
         help: 'Incoming HTTP requests duration in seconds',
@@ -918,7 +930,7 @@ class Prometheus {
           'errored',
           'statusCode',
           'transformationId',
-          'workspaceId'
+          'workspaceId',
         ],
       },
       {
@@ -934,9 +946,9 @@ class Prometheus {
           'errored',
           'statusCode',
           'transformationId',
-          'workspaceId'
+          'workspaceId',
         ],
-      }
+      },
     ];
 
     metrics.forEach((metric) => {

src/util/redis/redisConnector.test.js

@@ -1,9 +1,11 @@
 const fs = require('fs');
 const path = require('path');
-const version = 'v0';
 const { RedisDB } = require('./redisConnector');
 jest.mock('ioredis', () => require('../../../test/__mocks__/redis'));
-const sourcesList = ['shopify'];
+const sourcesList = [
+  { fileName: 'shopify', name: 'shopify', sourceEndpointVersion: 'v0' },
+  { fileName: 'shopify_v1', name: 'shopify', sourceEndpointVersion: 'v1' },
+];
 process.env.USE_REDIS_DB = 'true';
 
 const timeoutPromise = () =>
@@ -43,16 +45,17 @@ describe('checkAndConnectConnection', () => {
     expect(RedisDB.client.status).toBe('ready');
   });
 });
+
 describe(`Source Tests`, () => {
   sourcesList.forEach((source) => {
     const testDataFile = fs.readFileSync(
-      path.resolve(__dirname, `./testData/${source}_source.json`),
+      path.resolve(__dirname, `./testData/${source.fileName}_source.json`),
     );
     const data = JSON.parse(testDataFile);
-    const transformer = require(`../../${version}/sources/${source}/transform`);
+    const transformer = require(`../../${source.sourceEndpointVersion}/sources/${source.name}/transform`);
 
     data.forEach((dataPoint, index) => {
-      it(`${index}. ${source} - ${dataPoint.description}`, async () => {
+      it(`${index}. ${source.fileName} - ${dataPoint.description}`, async () => {
         try {
           const output = await transformer.process(dataPoint.input);
           expect(output).toEqual(dataPoint.output);
@@ -70,7 +73,7 @@ describe(`Redis Class Get Tests`, () => {
   data.forEach((dataPoint, index) => {
     it(`${index}. Redis Get- ${dataPoint.description}`, async () => {
       try {
-        const output = await RedisDB.getVal(dataPoint.input.value, (isObjExpected = false));
+        const output = await RedisDB.getVal(dataPoint.input.value, false);
         expect(output).toEqual(dataPoint.output);
       } catch (error) {
         expect(error.message).toEqual(dataPoint.output.error);
@@ -111,4 +114,4 @@ describe(`Redis Disconnect`, () => {
     await RedisDB.disconnect();
     expect(result).toEqual('OK');
   });
-});
+});