@forge/storage 1.5.15 → 1.6.0-next.1

package/out/__test__/global-storage.test.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const errors_1 = require("../errors");
 const global_storage_1 = require("../global-storage");
 const gql_queries_1 = require("../gql-queries");
+const mocks_1 = require("@atlassian/metrics-interface/dist/mocks");
 const contextAri = 'app-ari';
-const getStorage = (apiClientMock) => new global_storage_1.GlobalStorage(() => contextAri, apiClientMock);
+const getStorage = (apiClientMock, metrics) => new global_storage_1.GlobalStorage(() => contextAri, apiClientMock, () => metrics);
 const getApiClientMock = (response, statusCode = 200) => {
     return jest.fn().mockReturnValue({
         ok: statusCode === 200,
@@ -12,6 +13,36 @@ const getApiClientMock = (response, statusCode = 200) => {
         text: jest.fn().mockResolvedValue(JSON.stringify(response))
     });
 };
+const getMetricMock = () => {
+    const mockMetrics = new mocks_1.MockMetrics();
+    const mockCounter = new mocks_1.MockCounter('');
+    const mockTiming = new mocks_1.MockTiming('');
+    const mockStopTiming = jest.fn();
+    const mockMeasure = {
+        stop: mockStopTiming
+    };
+    mockMetrics.counter.mockReturnValue(mockCounter);
+    mockMetrics.timing.mockReturnValue(mockTiming);
+    mockTiming.measure.mockReturnValue(mockMeasure);
+    return {
+        mockMetrics,
+        mockCounter,
+        mockStopTiming
+    };
+};
+const checkMetricsFired = ({ mockMetrics, mockCounter, mockStopTiming }, { encrypted, ...restTags }, success) => {
+    expect(mockMetrics.counter).toHaveBeenCalledWith('forge.runtime.storage.operation', {
+        ...restTags,
+        encrypted: String(encrypted),
+        success: String(success)
+    });
+    expect(mockCounter.incr).toHaveBeenCalled();
+    expect(mockMetrics.timing).toHaveBeenCalledWith('forge.runtime.storage.operation.latency', {
+        ...restTags,
+        encrypted: String(encrypted)
+    });
+    expect(mockStopTiming).toHaveBeenCalledWith({ success: String(success) });
+};
 const getApiClientMockInvalidJson = (response, statusCode = 200) => {
     return jest.fn().mockReturnValue({
         ok: statusCode === 200,
@@ -25,7 +56,10 @@ const INVALID_CURSOR_ERROR = {
         errorType: 'INVALID_CURSOR'
     }
 };
-describe('GlobalStorage', () => {
+describe.each([
+    ['with metrics', true],
+    ['no metrics', false]
+])('GlobalStorage - %s', (_, passMetrics) => {
     function verifyApiClientCalledWith(apiClientMock, variables, query) {
         expect(apiClientMock).toHaveBeenCalledWith('/forge/entities/graphql', expect.objectContaining({
             method: 'POST',
@@ -52,7 +86,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -60,6 +95,9 @@ describe('GlobalStorage', () => {
                 encrypted: false
             });
             expect(returnedValue).toEqual('testValue');
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'get', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should call the storage API, passing the provided key and returning undefined if the key doesnt exist', async () => {
             const apiClientMock = getApiClientMock({
@@ -69,7 +107,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -77,6 +116,9 @@ describe('GlobalStorage', () => {
                 encrypted: false
             });
             expect(returnedValue).toEqual(undefined);
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'get', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should call the storage API, passing the provided key and returning the stored falsey value 0', async () => {
             const apiClientMock = getApiClientMock({
@@ -86,7 +128,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -94,6 +137,9 @@ describe('GlobalStorage', () => {
                 encrypted: false
             });
             expect(returnedValue).toEqual(0);
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'get', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should call the storage API, passing the provided key and returning the stored empty string', async () => {
             const apiClientMock = getApiClientMock({
@@ -103,7 +149,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -111,29 +158,44 @@ describe('GlobalStorage', () => {
                 encrypted: false
             });
             expect(returnedValue).toEqual('');
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'get', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error with the returned status for non-200 status codes', async () => {
             const apiClientMock = getApiClientMock(undefined, 400);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.get('testKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forStatus(400));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'get', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error with the returned error message for failed responses', async () => {
             const apiClientMock = getApiClientMock({
                 errors: [INVALID_CURSOR_ERROR]
             }, 200);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.get('testKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forErrorCode('CURSOR_INVALID', 'error message'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'get', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the response is not a valid JSON', async () => {
             const apiClientMock = getApiClientMockInvalidJson('test', 200);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.get('testKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forUnexpected('Response text was not a valid JSON: test'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'get', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('get secret', () => {
@@ -145,7 +207,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getSecret('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -153,6 +216,9 @@ describe('GlobalStorage', () => {
                 encrypted: true
             });
             expect(returnedValue).toEqual('testValue');
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'get', encrypted: true }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('set', () => {
@@ -166,7 +232,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await globalStorage.set('testKey', 'testValue');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
@@ -176,6 +243,9 @@ describe('GlobalStorage', () => {
                     encrypted: false
                 }
             });
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'set', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns successful = false', async () => {
             const apiClientMock = getApiClientMock({
@@ -188,17 +258,25 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.set('testKey', 'testValue');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forErrorCode('INVALID_CURSOR', 'error message'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'set', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns a non 200 status code', async () => {
             const apiClientMock = getApiClientMockInvalidJson('', 400);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.set('testKey', 'testValue');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forStatus(400));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'set', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw a 500 error if success=false but no errors were returned', async () => {
             const apiClientMock = getApiClientMock({
@@ -210,7 +288,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await expect(globalStorage.set('testKey', 'testValue')).rejects.toThrow(errors_1.APIError.forStatus(500));
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
@@ -220,6 +299,9 @@ describe('GlobalStorage', () => {
                     encrypted: false
                 }
             });
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'set', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('set secret', () => {
@@ -233,7 +315,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await globalStorage.setSecret('testKey', 'testValue');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
@@ -243,6 +326,9 @@ describe('GlobalStorage', () => {
                     encrypted: true
                 }
             });
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'set', encrypted: true }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('delete', () => {
@@ -256,7 +342,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await globalStorage.delete('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
@@ -265,6 +352,9 @@ describe('GlobalStorage', () => {
                     encrypted: false
                 }
             });
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'delete', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns successful = false', async () => {
             const apiClientMock = getApiClientMock({
@@ -277,17 +367,25 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.delete('testKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forErrorCode('CURSOR_INVALID', 'error message'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'delete', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns a non 200 status code and has no body', async () => {
             const apiClientMock = getApiClientMockInvalidJson('', 400);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.delete('testKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forStatus(400));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'delete', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('delete secret', () => {
@@ -301,7 +399,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await globalStorage.deleteSecret('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
@@ -310,6 +409,9 @@ describe('GlobalStorage', () => {
                     encrypted: true
                 }
             });
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'delete', encrypted: true }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('getEntity', () => {
@@ -321,7 +423,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -329,6 +432,9 @@ describe('GlobalStorage', () => {
                 key: 'testEntityKey'
             });
             expect(returnedValue).toEqual('testValue');
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'get', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should call the storage API, passing the provided entity key and returning undefined if the key doesnt exist', async () => {
             const apiClientMock = getApiClientMock({
@@ -338,7 +444,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -346,6 +453,9 @@ describe('GlobalStorage', () => {
                 key: 'testEntityKey'
             });
             expect(returnedValue).toEqual(undefined);
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'get', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should call the storage API, passing the provided key and returning the stored falsey value 0', async () => {
             const apiClientMock = getApiClientMock({
@@ -355,7 +465,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -363,6 +474,9 @@ describe('GlobalStorage', () => {
                 key: 'testEntityKey'
             });
             expect(returnedValue).toEqual(0);
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'get', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should call the storage API, passing the provided key and returning the stored empty string', async () => {
             const apiClientMock = getApiClientMock({
@@ -372,7 +486,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -380,29 +495,44 @@ describe('GlobalStorage', () => {
                 key: 'testEntityKey'
             });
             expect(returnedValue).toEqual('');
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'get', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error with the returned status for non-200 status codes', async () => {
             const apiClientMock = getApiClientMock(undefined, 400);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.getEntity('testEntityName', 'testEntityKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forStatus(400));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'get', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error with the returned error message for failed responses', async () => {
             const apiClientMock = getApiClientMock({
                 errors: [INVALID_CURSOR_ERROR]
             }, 200);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.getEntity('testEntityName', 'testEntityKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forErrorCode('CURSOR_INVALID', 'error message'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'get', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the response is not a valid JSON', async () => {
             const apiClientMock = getApiClientMockInvalidJson('test', 200);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.getEntity('testEntityName', 'testEntityKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forUnexpected('Response text was not a valid JSON: test'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'get', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('setEntity', () => {
@@ -416,7 +546,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await globalStorage.setEntity('testEntityName', 'testEntityKey', 'testValue');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
@@ -426,6 +557,9 @@ describe('GlobalStorage', () => {
                     value: 'testValue'
                 }
             });
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'set', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns successful = false', async () => {
             const apiClientMock = getApiClientMock({
@@ -438,17 +572,25 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.setEntity('testEntityName', 'testEntityKey', 'testValue');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forErrorCode('INVALID_CURSOR', 'error message'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'set', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns a non 200 status code', async () => {
             const apiClientMock = getApiClientMockInvalidJson('', 400);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.setEntity('testEntityName', 'testEntityKey', 'testValue');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forStatus(400));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'set', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw a 500 error if success=false but no errors were returned', async () => {
             const apiClientMock = getApiClientMock({
@@ -460,7 +602,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await expect(globalStorage.setEntity('testEntityName', 'testEntityKey', 'testValue')).rejects.toThrow(errors_1.APIError.forStatus(500));
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
@@ -470,6 +613,9 @@ describe('GlobalStorage', () => {
                     value: 'testValue'
                 }
             });
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'set', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('deleteEntity', () => {
@@ -483,7 +629,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await globalStorage.deleteEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
@@ -492,6 +639,9 @@ describe('GlobalStorage', () => {
                     key: 'testEntityKey'
                 }
             });
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'delete', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns successful = false', async () => {
             const apiClientMock = getApiClientMock({
@@ -504,17 +654,25 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.deleteEntity('testEntityKey', 'testEntityKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forErrorCode('CURSOR_INVALID', 'error message'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'delete', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns a non 200 status code and has no body', async () => {
             const apiClientMock = getApiClientMockInvalidJson('', 400);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.deleteEntity('testEntityKey', 'testEntityKey');
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forStatus(400));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'delete', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('list', () => {
@@ -529,7 +687,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const where = [
                 {
                     field: 'key',
@@ -553,6 +712,9 @@ describe('GlobalStorage', () => {
                 ],
                 nextCursor: 'cursor2'
             }));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'query', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should query the appStoredEntitiesForCleanup endpoint given process.env.IS_CLEANUP_FUNCTION is set to true', async () => {
             process.env.IS_CLEANUP_FUNCTION = 'true';
@@ -566,7 +728,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const where = [
                 {
                     field: 'key',
@@ -590,6 +753,9 @@ describe('GlobalStorage', () => {
                 ],
                 nextCursor: 'cursor2'
             }));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'query', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
             process.env.IS_CLEANUP_FUNCTION = '';
         });
         it('should use default values', async () => {
@@ -600,7 +766,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await globalStorage.list({});
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
@@ -608,6 +775,9 @@ describe('GlobalStorage', () => {
                 cursor: null,
                 limit: null
             }, gql_queries_1.UntypedQueries.listQuery(contextAri, {}).query);
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'query', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should handle an empty result set', async () => {
             const apiClientMock = getApiClientMock({
@@ -617,7 +787,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const where = [
                 {
                     field: 'key',
@@ -630,22 +801,33 @@ describe('GlobalStorage', () => {
                 results: [],
                 nextCursor: undefined
             }));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'query', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns an error', async () => {
             const apiClientMock = getApiClientMock({
                 errors: [INVALID_CURSOR_ERROR]
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.list({});
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forErrorCode('CURSOR_INVALID', 'error message'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'query', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should throw an error if the storage API returns a non 200 status code and has no body', async () => {
             const apiClientMock = getApiClientMockInvalidJson('', 400);
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = globalStorage.list({});
             expect(apiClientMock).toHaveBeenCalled();
             await expect(response).rejects.toThrow(errors_1.APIError.forStatus(400));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'query', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
     describe('listCustomEntities', () => {
@@ -657,7 +839,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = await globalStorage.listCustomEntities({});
             expect(response).toMatchObject({
                 results: [],
@@ -666,6 +849,9 @@ describe('GlobalStorage', () => {
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri
             }, gql_queries_1.CustomEntityQueries.listQuery(contextAri, {}).query);
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'query', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
         it('should return cursor when results are not present', async () => {
             const apiClientMock = getApiClientMock({
@@ -676,7 +862,8 @@ describe('GlobalStorage', () => {
                     }
                 }
             });
-            const globalStorage = getStorage(apiClientMock);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const response = await globalStorage.listCustomEntities({});
             expect(response).toMatchObject({
                 results: [],
@@ -685,6 +872,33 @@ describe('GlobalStorage', () => {
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri
             }, gql_queries_1.CustomEntityQueries.listQuery(contextAri, {}).query);
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'query', encrypted: false }, true)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
+        });
+        it('should throw an error if the storage API returns an error', async () => {
+            const apiClientMock = getApiClientMock({
+                errors: [INVALID_CURSOR_ERROR]
+            });
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
+            const response = globalStorage.listCustomEntities({});
+            expect(apiClientMock).toHaveBeenCalled();
+            await expect(response).rejects.toThrow(errors_1.APIError.forErrorCode('CURSOR_INVALID', 'error message'));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'query', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
+        });
+        it('should throw an error if the storage API returns a non 200 status code and has no body', async () => {
+            const apiClientMock = getApiClientMockInvalidJson('', 400);
+            const metricMocks = getMetricMock();
+            const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
+            const response = globalStorage.listCustomEntities({});
+            expect(apiClientMock).toHaveBeenCalled();
+            await expect(response).rejects.toThrow(errors_1.APIError.forStatus(400));
+            passMetrics
+                ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'query', encrypted: false }, false)
+                : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
         });
     });
 });