@webex/internal-plugin-metrics 3.8.0-web-workers-keepalive.1 → 3.8.1-next.1

package/test/unit/spec/call-diagnostic/call-diagnostic-metrics.ts

@@ -13,9 +13,12 @@ import {
 } from '@webex/internal-plugin-metrics';
 import uuid from 'uuid';
 import {omit} from 'lodash';
-import { glob } from 'glob';
-import { expect } from 'chai';
-import { ClientEmailInput, ClientUserNameInput } from '@webex/internal-plugin-metrics/src/metrics.types';
+import {glob} from 'glob';
+import {expect} from 'chai';
+import {
+  ClientEmailInput,
+  ClientUserNameInput,
+} from '@webex/internal-plugin-metrics/src/metrics.types';
 
 //@ts-ignore
 global.window = {location: {hostname: 'whatever'}};
@@ -65,14 +68,14 @@ describe('internal-plugin-metrics', () => {
       ...fakeMeeting,
       id: '4',
       isoLocalClientMeetingJoinTime: 'testTimeString',
-    }
+    };
     const fakeMeeting5 = {
       ...fakeMeeting,
       id: '5',
       correlationId: 'correlationId5',
       sessionCorrelationId: 'sessionCorrelationId5',
       userNameInput: 'test',
-      emailInput: 'test@test.com'
+      emailInput: 'test@test.com',
     };
 
     const fakeMeetings = {
@@ -823,7 +826,147 @@ describe('internal-plugin-metrics', () => {
           meetingId: fakeMeeting.id,
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
         };
+        cd.setMercuryConnectedStatus(true);
+
+        cd.submitClientEvent({
+          name: 'client.alert.displayed',
+          options,
+        });
+
+        assert.called(getIdentifiersSpy);
+        assert.calledWith(getIdentifiersSpy, {
+          meeting: fakeMeeting,
+          mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
+          webexConferenceIdStr: undefined,
+          sessionCorrelationId: undefined,
+          globalMeetingId: undefined,
+        });
+        assert.notCalled(generateClientEventErrorPayloadSpy);
+        assert.calledWith(
+          prepareDiagnosticEventSpy,
+          {
+            canProceed: true,
+            eventData: {
+              webClientDomain: 'whatever',
+              isMercuryConnected: true,
+            },
+            identifiers: {
+              correlationId: 'correlationId',
+              deviceId: 'deviceUrl',
+              locusId: 'url',
+              locusStartTime: 'lastActive',
+              locusUrl: 'locus/url',
+              mediaAgentAlias: 'alias',
+              mediaAgentGroupId: '1',
+              orgId: 'orgId',
+              userId: 'userId',
+            },
+            loginType: 'login-ci',
+            name: 'client.alert.displayed',
+            userType: 'host',
+            isConvergedArchitectureEnabled: undefined,
+            webexSubServiceType: undefined,
+            webClientPreload: undefined,
+          },
+          options
+        );
+        assert.calledWith(submitToCallDiagnosticsSpy, {
+          event: {
+            canProceed: true,
+            eventData: {
+              webClientDomain: 'whatever',
+              isMercuryConnected: true,
+            },
+            identifiers: {
+              correlationId: 'correlationId',
+              deviceId: 'deviceUrl',
+              locusId: 'url',
+              locusStartTime: 'lastActive',
+              locusUrl: 'locus/url',
+              mediaAgentAlias: 'alias',
+              mediaAgentGroupId: '1',
+              orgId: 'orgId',
+              userId: 'userId',
+            },
+            loginType: 'login-ci',
+            name: 'client.alert.displayed',
+            userType: 'host',
+            isConvergedArchitectureEnabled: undefined,
+            webexSubServiceType: undefined,
+            webClientPreload: undefined,
+          },
+          eventId: 'my-fake-id',
+          origin: {
+            origin: 'fake-origin',
+          },
+          originTime: {
+            sent: 'not_defined_yet',
+            triggered: now.toISOString(),
+          },
+          senderCountryCode: 'UK',
+          version: 1,
+        });
+        assert.calledWith(validatorSpy, {
+          type: 'ce',
+          event: {
+            event: {
+              canProceed: true,
+              eventData: {
+                webClientDomain: 'whatever',
+                isMercuryConnected: true,
+              },
+              identifiers: {
+                correlationId: 'correlationId',
+                deviceId: 'deviceUrl',
+                locusId: 'url',
+                locusStartTime: 'lastActive',
+                locusUrl: 'locus/url',
+                mediaAgentAlias: 'alias',
+                mediaAgentGroupId: '1',
+                orgId: 'orgId',
+                userId: 'userId',
+              },
+              loginType: 'login-ci',
+              name: 'client.alert.displayed',
+              userType: 'host',
+              isConvergedArchitectureEnabled: undefined,
+              webexSubServiceType: undefined,
+              webClientPreload: undefined,
+            },
+            eventId: 'my-fake-id',
+            origin: {
+              origin: 'fake-origin',
+            },
+            originTime: {
+              sent: 'not_defined_yet',
+              triggered: now.toISOString(),
+            },
+            senderCountryCode: 'UK',
+            version: 1,
+          },
+        });
+
+        const webexLoggerLogCalls = webex.logger.log.getCalls();
+        assert.deepEqual(webexLoggerLogCalls[1].args, [
+          'call-diagnostic-events -> ',
+          'CallDiagnosticMetrics: @submitClientEvent. Submit Client Event CA event.',
+          `name: client.alert.displayed`,
+        ]);
+      });
 
+      it('should submit client event correctly when mercury is not connected', () => {
+        const prepareDiagnosticEventSpy = sinon.spy(cd, 'prepareDiagnosticEvent');
+        const submitToCallDiagnosticsSpy = sinon.spy(cd, 'submitToCallDiagnostics');
+        const generateClientEventErrorPayloadSpy = sinon.spy(cd, 'generateClientEventErrorPayload');
+        const getIdentifiersSpy = sinon.spy(cd, 'getIdentifiers');
+        const getSubServiceTypeSpy = sinon.spy(cd, 'getSubServiceType');
+        sinon.stub(cd, 'getOrigin').returns({origin: 'fake-origin'});
+        const validatorSpy = sinon.spy(cd, 'validator');
+        const options = {
+          meetingId: fakeMeeting.id,
+          mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
+        };
+        cd.setMercuryConnectedStatus(false);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -844,6 +987,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: false,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -870,6 +1014,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: false,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -907,6 +1052,7 @@ describe('internal-plugin-metrics', () => {
               canProceed: true,
               eventData: {
                 webClientDomain: 'whatever',
+                isMercuryConnected: false,
               },
               identifiers: {
                 correlationId: 'correlationId',
@@ -959,7 +1105,7 @@ describe('internal-plugin-metrics', () => {
           meetingId: fakeMeeting3.id,
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -980,6 +1126,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId3',
@@ -1007,6 +1154,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId3',
@@ -1045,6 +1193,7 @@ describe('internal-plugin-metrics', () => {
               canProceed: true,
               eventData: {
                 webClientDomain: 'whatever',
+                isMercuryConnected: true,
               },
               identifiers: {
                 correlationId: 'correlationId3',
@@ -1097,7 +1246,7 @@ describe('internal-plugin-metrics', () => {
           meetingId: fakeMeeting4.id,
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -1119,6 +1268,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -1146,6 +1296,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -1184,6 +1335,7 @@ describe('internal-plugin-metrics', () => {
               canProceed: true,
               eventData: {
                 webClientDomain: 'whatever',
+                isMercuryConnected: true,
               },
               identifiers: {
                 correlationId: 'correlationId',
@@ -1235,7 +1387,7 @@ describe('internal-plugin-metrics', () => {
           meetingId: fakeMeeting5.id,
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -1256,6 +1408,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId5',
@@ -1285,6 +1438,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId5',
@@ -1325,6 +1479,7 @@ describe('internal-plugin-metrics', () => {
               canProceed: true,
               eventData: {
                 webClientDomain: 'whatever',
+                isMercuryConnected: true,
               },
               identifiers: {
                 correlationId: 'correlationId5',
@@ -1375,7 +1530,14 @@ describe('internal-plugin-metrics', () => {
         const getIdentifiersSpy = sinon.spy(cd, 'getIdentifiers');
         const getSubServiceTypeSpy = sinon.spy(cd, 'getSubServiceType');
         const validatorSpy = sinon.spy(cd, 'validator');
-        sinon.stub(window.navigator, 'userAgent').get(() => userAgent);
+
+        Object.defineProperty(global, 'navigator', {
+          value: {
+            userAgent,
+          },
+          configurable: true,
+        });
+
         sinon.stub(bowser, 'getParser').returns(userAgent);
 
         const options = {
@@ -1429,7 +1591,7 @@ describe('internal-plugin-metrics', () => {
           globalMeetingId: 'globalMeetingId1',
           sessionCorrelationId: 'sessionCorrelationId1',
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -1450,6 +1612,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -1463,7 +1626,7 @@ describe('internal-plugin-metrics', () => {
             },
             loginType: 'login-ci',
             name: 'client.alert.displayed',
-            webClientPreload: undefined
+            webClientPreload: undefined,
           },
           options
         );
@@ -1472,6 +1635,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -1485,7 +1649,7 @@ describe('internal-plugin-metrics', () => {
             },
             loginType: 'login-ci',
             name: 'client.alert.displayed',
-            webClientPreload: undefined
+            webClientPreload: undefined,
           },
           eventId: 'my-fake-id',
           origin: {
@@ -1517,7 +1681,7 @@ describe('internal-plugin-metrics', () => {
         const generateClientEventErrorPayloadSpy = sinon.spy(cd, 'generateClientEventErrorPayload');
         const getIdentifiersSpy = sinon.spy(cd, 'getIdentifiers');
         sinon.stub(cd, 'getOrigin').returns({origin: 'fake-origin'});
-
+        cd.setMercuryConnectedStatus(true);
         const options = {
           correlationId: 'correlationId',
           webexConferenceIdStr: 'webexConferenceIdStr1',
@@ -1546,6 +1710,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -1585,7 +1750,7 @@ describe('internal-plugin-metrics', () => {
                 webexConferenceIdStr: 'webexConferenceIdStr1',
                 globalMeetingId: 'globalMeetingId1',
               },
-              eventData: {webClientDomain: 'whatever'},
+              eventData: {webClientDomain: 'whatever', isMercuryConnected: true},
               loginType: 'login-ci',
               webClientPreload: undefined,
             },
@@ -1603,7 +1768,7 @@ describe('internal-plugin-metrics', () => {
         const generateClientEventErrorPayloadSpy = sinon.spy(cd, 'generateClientEventErrorPayload');
         const getIdentifiersSpy = sinon.spy(cd, 'getIdentifiers');
         sinon.stub(cd, 'getOrigin').returns({origin: 'fake-origin'});
-
+        cd.setMercuryConnectedStatus(true);
         const options = {
           correlationId: 'correlationId',
           webexConferenceIdStr: 'webexConferenceIdStr1',
@@ -1634,6 +1799,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -1675,7 +1841,7 @@ describe('internal-plugin-metrics', () => {
                 webexConferenceIdStr: 'webexConferenceIdStr1',
                 globalMeetingId: 'globalMeetingId1',
               },
-              eventData: {webClientDomain: 'whatever'},
+              eventData: {webClientDomain: 'whatever', isMercuryConnected: true},
               loginType: 'login-ci',
               userNameInput: 'current',
               emailInput: 'current',
@@ -1693,7 +1859,7 @@ describe('internal-plugin-metrics', () => {
           meetingId: fakeMeeting2.id,
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -1704,6 +1870,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId2',
@@ -1745,7 +1912,7 @@ describe('internal-plugin-metrics', () => {
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
           sessionCorrelationId: 'sessionCorrelationId1',
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -1756,6 +1923,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId2',
@@ -1804,7 +1972,7 @@ describe('internal-plugin-metrics', () => {
           globalMeetingId: 'globalMeetingId1',
           sessionCorrelationId: 'sessionCorrelationId1',
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -1817,6 +1985,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -1839,6 +2008,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -1882,7 +2052,7 @@ describe('internal-plugin-metrics', () => {
             },
           },
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -1893,6 +2063,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -1948,7 +2119,7 @@ describe('internal-plugin-metrics', () => {
         assert.deepEqual(webexLoggerLogCalls[2].args, [
           'call-diagnostic-events -> ',
           'CallDiagnosticMetrics: @prepareClientEvent. Generated errors:',
-          `generatedError: {"fatal":true,"shownToUser":false,"name":"other","category":"expected","errorCode":4029,"serviceErrorCode":2409005,"errorDescription":"StartRecordingFailed"}`,
+          `generatedError (cached: false): {"fatal":true,"shownToUser":false,"name":"other","category":"expected","errorCode":4029,"serviceErrorCode":2409005,"errorDescription":"StartRecordingFailed"}`,
         ]);
       });
 
@@ -1961,7 +2132,7 @@ describe('internal-plugin-metrics', () => {
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
           rawError: new Error('bad times'),
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -1972,6 +2143,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -2028,7 +2200,7 @@ describe('internal-plugin-metrics', () => {
         assert.deepEqual(webexLoggerLogCalls[2].args, [
           'call-diagnostic-events -> ',
           'CallDiagnosticMetrics: @prepareClientEvent. Generated errors:',
-          `generatedError: {"fatal":true,"shownToUser":false,"name":"other","category":"other","errorCode":9999,"errorData":{"errorName":"Error"},"serviceErrorCode":9999,"rawErrorMessage":"bad times","errorDescription":"UnknownError"}`,
+          `generatedError (cached: false): {"fatal":true,"shownToUser":false,"name":"other","category":"other","errorCode":9999,"errorData":{"errorName":"Error"},"serviceErrorCode":9999,"rawErrorMessage":"bad times","errorDescription":"UnknownError"}`,
         ]);
       });
 
@@ -2040,7 +2212,7 @@ describe('internal-plugin-metrics', () => {
           correlationId: 'correlationId',
           rawError: new Error('bad times'),
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -2051,6 +2223,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -2101,7 +2274,7 @@ describe('internal-plugin-metrics', () => {
         assert.deepEqual(webexLoggerLogCalls[2].args, [
           'call-diagnostic-events -> ',
           'CallDiagnosticMetrics: @prepareClientEvent. Generated errors:',
-          `generatedError: {"fatal":true,"shownToUser":false,"name":"other","category":"other","errorCode":9999,"errorData":{"errorName":"Error"},"serviceErrorCode":9999,"rawErrorMessage":"bad times","errorDescription":"UnknownError"}`,
+          `generatedError (cached: false): {"fatal":true,"shownToUser":false,"name":"other","category":"other","errorCode":9999,"errorData":{"errorName":"Error"},"serviceErrorCode":9999,"rawErrorMessage":"bad times","errorDescription":"UnknownError"}`,
         ]);
       });
 
@@ -2117,7 +2290,7 @@ describe('internal-plugin-metrics', () => {
             },
           },
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           options,
@@ -2128,6 +2301,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -2175,7 +2349,7 @@ describe('internal-plugin-metrics', () => {
         assert.deepEqual(webexLoggerLogCalls[2].args, [
           'call-diagnostic-events -> ',
           'CallDiagnosticMetrics: @prepareClientEvent. Generated errors:',
-          `generatedError: {"fatal":true,"shownToUser":false,"name":"other","category":"expected","errorCode":4029,"serviceErrorCode":2409005,"errorDescription":"StartRecordingFailed"}`,
+          `generatedError (cached: false): {"fatal":true,"shownToUser":false,"name":"other","category":"expected","errorCode":4029,"serviceErrorCode":2409005,"errorDescription":"StartRecordingFailed"}`,
         ]);
       });
 
@@ -2187,7 +2361,7 @@ describe('internal-plugin-metrics', () => {
           meetingId: fakeMeeting.id,
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
         };
-
+        cd.setMercuryConnectedStatus(true);
         cd.submitClientEvent({
           name: 'client.alert.displayed',
           payload: {
@@ -2208,6 +2382,7 @@ describe('internal-plugin-metrics', () => {
             canProceed: true,
             eventData: {
               webClientDomain: 'whatever',
+              isMercuryConnected: true,
             },
             identifiers: {
               correlationId: 'correlationId',
@@ -2555,8 +2730,37 @@ describe('internal-plugin-metrics', () => {
         rawErrorMessage: 'bad times',
       };
 
+      it('should be cached if called twice with the same payload', () => {
+        const error = new Error('bad times');
+        const expectedPayload = {
+          category: 'other',
+          errorCode: 9999,
+          errorData: {errorName: 'Error'},
+          serviceErrorCode: 9999,
+          fatal: true,
+          shownToUser: false,
+          name: 'other',
+          rawErrorMessage: 'bad times',
+          errorDescription: 'UnknownError',
+        };
+
+        const [res, cached] = cd.generateClientEventErrorPayload(error);
+        assert.isFalse(cached);
+        assert.deepEqual(res, expectedPayload);
+
+        const [res2, cached2] = cd.generateClientEventErrorPayload(error);
+        assert.isTrue(cached2);
+        assert.deepEqual(res2, expectedPayload);
+
+        // after clearing the cache, it should be false again
+        cd.clearErrorCache();
+        const [res3, cached3] = cd.generateClientEventErrorPayload(error);
+        assert.isFalse(cached3);
+        assert.deepEqual(res3, expectedPayload);
+      });
+
       const checkNameError = (payload: any, isExpectedToBeCalled: boolean) => {
-        const res = cd.generateClientEventErrorPayload(payload);
+        const [res, cached] = cd.generateClientEventErrorPayload(payload);
         const expectedResult = {
           category: 'expected',
           errorDescription: 'CameraPermissionDenied',
@@ -2585,7 +2789,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       const checkCodeError = (payload: any, expetedRes: any) => {
-        const res = cd.generateClientEventErrorPayload(payload);
+        const [res, cached] = cd.generateClientEventErrorPayload(payload);
         assert.deepEqual(res, expetedRes);
       };
       it('should generate event error payload correctly', () => {
@@ -2611,7 +2815,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       const checkLocusError = (payload: any, isExpectedToBeCalled: boolean) => {
-        const res = cd.generateClientEventErrorPayload(payload);
+        const [res, cached] = cd.generateClientEventErrorPayload(payload);
         const expectedResult = {
           category: 'signaling',
           errorDescription: 'NewLocusError',
@@ -2639,7 +2843,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       const checkMeetingInfoError = (payload: any, isExpectedToBeCalled: boolean) => {
-        const res = cd.generateClientEventErrorPayload(payload);
+        const [res, cached] = cd.generateClientEventErrorPayload(payload);
         const expectedResult = {
           category: 'signaling',
           errorDescription: 'MeetingInfoLookupError',
@@ -2680,7 +2884,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('should return NetworkError code for a NetworkOrCORSERror', () => {
-        const res = cd.generateClientEventErrorPayload(
+        const [res, cached] = cd.generateClientEventErrorPayload(
           new WebexHttpError.NetworkOrCORSError({
             url: 'https://example.com',
             statusCode: 0,
@@ -2724,7 +2928,7 @@ describe('internal-plugin-metrics', () => {
               message: 'No codecs present in m-line with MID 0 after filtering.',
             },
           };
-          const res = cd.generateClientEventErrorPayload(error);
+          const [res, cached] = cd.generateClientEventErrorPayload(error);
           assert.deepEqual(res, {
             category: 'expected',
             errorCode: 2051,
@@ -2750,7 +2954,7 @@ describe('internal-plugin-metrics', () => {
               message: 'empty local SDP',
             },
           };
-          const res = cd.generateClientEventErrorPayload(error);
+          const [res, cached] = cd.generateClientEventErrorPayload(error);
           assert.deepEqual(res, {
             category: 'media',
             errorCode: 2050,
@@ -2775,7 +2979,7 @@ describe('internal-plugin-metrics', () => {
           category: 'expected',
         };
 
-        const res = cd.generateClientEventErrorPayload(error);
+        const [res, cached] = cd.generateClientEventErrorPayload(error);
         assert.deepEqual(res, {
           category: 'expected',
           errorDescription: 'UnknownError',
@@ -2804,7 +3008,7 @@ describe('internal-plugin-metrics', () => {
           category: 'expected',
         };
 
-        const res = cd.generateClientEventErrorPayload(error);
+        const [res, cached] = cd.generateClientEventErrorPayload(error);
         assert.deepEqual(res, {
           category: 'expected',
           errorDescription: 'NetworkError',
@@ -2819,7 +3023,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('should return AuthenticationFailed code for an Unauthorized error', () => {
-        const res = cd.generateClientEventErrorPayload(
+        const [res, cached] = cd.generateClientEventErrorPayload(
           new WebexHttpError.Unauthorized({
             url: 'https://example.com',
             statusCode: 0,
@@ -2852,7 +3056,7 @@ describe('internal-plugin-metrics', () => {
           category: 'expected',
         };
 
-        const res = cd.generateClientEventErrorPayload(error);
+        const [res, cached] = cd.generateClientEventErrorPayload(error);
         assert.deepEqual(res, {
           category: 'expected',
           errorDescription: 'AuthenticationFailed',
@@ -2867,7 +3071,10 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('should return unknown error otherwise', () => {
-        const res = cd.generateClientEventErrorPayload({something: 'new', message: 'bad times'});
+        const [res, cached] = cd.generateClientEventErrorPayload({
+          something: 'new',
+          message: 'bad times',
+        });
         assert.deepEqual(res, {
           category: 'other',
           errorDescription: 'UnknownError',
@@ -2881,7 +3088,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('should generate event error payload correctly for locus error 2423012', () => {
-        const res = cd.generateClientEventErrorPayload({
+        const [res, cached] = cd.generateClientEventErrorPayload({
           body: {errorCode: 2423012},
           message: 'bad times',
         });
@@ -2897,7 +3104,7 @@ describe('internal-plugin-metrics', () => {
         });
       });
       it('should generate event error payload correctly for locus error 2409062', () => {
-        const res = cd.generateClientEventErrorPayload({
+        const [res, cached] = cd.generateClientEventErrorPayload({
           body: {errorCode: 2409062},
           message: 'bad times',
         });
@@ -2914,7 +3121,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('should generate event error payload correctly for locus error 2423021', () => {
-        const res = cd.generateClientEventErrorPayload({
+        const [res, cached] = cd.generateClientEventErrorPayload({
           body: {errorCode: 2423021},
           message: 'bad times',
         });
@@ -2931,7 +3138,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('should generate event error payload correctly for wdm error 4404002', () => {
-        const res = cd.generateClientEventErrorPayload({
+        const [res, cached] = cd.generateClientEventErrorPayload({
           body: {errorCode: 4404002},
           message: 'Operation denied due to region restriction',
         });
@@ -2948,7 +3155,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('should generate event error payload correctly for wdm error 4404003', () => {
-        const res = cd.generateClientEventErrorPayload({
+        const [res, cached] = cd.generateClientEventErrorPayload({
           body: {errorCode: 4404003},
           message: 'Operation denied due to region restriction',
         });
@@ -2966,7 +3173,7 @@ describe('internal-plugin-metrics', () => {
 
       describe('httpStatusCode', () => {
         it('should include httpStatusCode for browser media errors', () => {
-          const res = cd.generateClientEventErrorPayload({
+          const [res, cached] = cd.generateClientEventErrorPayload({
             name: 'PermissionDeniedError',
             message: 'bad times',
             statusCode: 401,
@@ -2988,7 +3195,7 @@ describe('internal-plugin-metrics', () => {
         });
 
         it('should include httpStatusCode for SdpOfferCreationErrors', () => {
-          const res = cd.generateClientEventErrorPayload({
+          const [res, cached] = cd.generateClientEventErrorPayload({
             name: 'SdpOfferCreationError',
             message: 'bad times',
             statusCode: 404,
@@ -3010,7 +3217,7 @@ describe('internal-plugin-metrics', () => {
         });
 
         it('should include httpStatusCode for service error codes', () => {
-          const res = cd.generateClientEventErrorPayload({
+          const [res, cached] = cd.generateClientEventErrorPayload({
             body: {errorCode: 58400},
             message: 'bad times',
             statusCode: 400,
@@ -3029,7 +3236,7 @@ describe('internal-plugin-metrics', () => {
         });
 
         it('should include httpStatusCode for locus service error codes', () => {
-          const res = cd.generateClientEventErrorPayload({
+          const [res, cached] = cd.generateClientEventErrorPayload({
             body: {errorCode: 2403001},
             message: 'bad times',
             statusCode: 400,
@@ -3048,7 +3255,7 @@ describe('internal-plugin-metrics', () => {
         });
 
         it('should include httpStatusCode for meetingInfo service error codes', () => {
-          const res = cd.generateClientEventErrorPayload({
+          const [res, cached] = cd.generateClientEventErrorPayload({
             body: {data: {meetingInfo: {}}},
             message: 'bad times',
             statusCode: 400,
@@ -3071,7 +3278,7 @@ describe('internal-plugin-metrics', () => {
             statusCode: 400,
             options: {service: '', headers: {}},
           });
-          const res = cd.generateClientEventErrorPayload(error);
+          const [res, cached] = cd.generateClientEventErrorPayload(error);
           assert.deepEqual(res, {
             category: 'network',
             errorCode: 1026,
@@ -3090,7 +3297,7 @@ describe('internal-plugin-metrics', () => {
             statusCode: 401,
             options: {service: '', headers: {}},
           });
-          const res = cd.generateClientEventErrorPayload(error);
+          const [res, cached] = cd.generateClientEventErrorPayload(error);
           assert.deepEqual(res, {
             category: 'network',
             errorCode: 1010,
@@ -3105,7 +3312,7 @@ describe('internal-plugin-metrics', () => {
         });
 
         it('should include httpStatusCode for unknown errors', () => {
-          const res = cd.generateClientEventErrorPayload({
+          const [res, cached] = cd.generateClientEventErrorPayload({
             message: 'bad times',
             statusCode: 404,
           });
@@ -3215,7 +3422,7 @@ describe('internal-plugin-metrics', () => {
             meetingId: fakeMeeting.id,
             preLoginId,
           };
-
+          cd.setMercuryConnectedStatus(true);
           const triggered = new Date();
           const fetchOptions = await cd.buildClientEventFetchRequestOptions({
             name: 'client.exit.app',
@@ -3231,6 +3438,7 @@ describe('internal-plugin-metrics', () => {
                     canProceed: false,
                     eventData: {
                       webClientDomain: 'whatever',
+                      isMercuryConnected: true,
                     },
                     identifiers: {
                       correlationId: 'correlationId',
@@ -3462,6 +3670,7 @@ describe('internal-plugin-metrics', () => {
         const submitToCallDiagnosticsSpy = sinon.spy(cd, 'submitToCallDiagnostics');
 
         const options = {
+          meetingId: 'meetingId',
           correlationId: 'correlationId',
         };
 
@@ -3494,6 +3703,7 @@ describe('internal-plugin-metrics', () => {
           name: 'client.alert.displayed',
           payload: undefined,
           options: {
+            meetingId: 'meetingId',
             correlationId: 'correlationId',
             triggeredTime: now.toISOString(),
           },
@@ -3502,6 +3712,7 @@ describe('internal-plugin-metrics', () => {
           name: 'client.alert.removed',
           payload: undefined,
           options: {
+            meetingId: 'meetingId',
             correlationId: 'correlationId',
             triggeredTime: now.toISOString(),
           },
@@ -3510,6 +3721,7 @@ describe('internal-plugin-metrics', () => {
           name: 'client.call.aborted',
           payload: undefined,
           options: {
+            meetingId: 'meetingId',
             correlationId: 'correlationId',
             triggeredTime: now.toISOString(),
           },
@@ -3521,6 +3733,79 @@ describe('internal-plugin-metrics', () => {
         // should not call submitClientEvent again if delayedClientEvents was cleared
         assert.notCalled(submitClientEventSpy);
       });
+
+      it('calls submitClientEvent for every delayed event with overrides and clears delayedClientEvents array', () => {
+        const submitClientEventSpy = sinon.spy(cd, 'submitClientEvent');
+        const submitToCallDiagnosticsSpy = sinon.spy(cd, 'submitToCallDiagnostics');
+
+        const options = {
+          meetingId: 'meetingId',
+          correlationId: 'correlationId',
+        };
+
+        const overrides = {
+          correlationId: 'newCorrelationId',
+        };
+
+        cd.submitClientEvent({
+          name: 'client.alert.displayed',
+          options,
+          delaySubmitEvent: true,
+        });
+
+        cd.submitClientEvent({
+          name: 'client.alert.removed',
+          options,
+          delaySubmitEvent: true,
+        });
+
+        cd.submitClientEvent({
+          name: 'client.call.aborted',
+          options,
+          delaySubmitEvent: true,
+        });
+
+        assert.notCalled(submitToCallDiagnosticsSpy);
+        assert.calledThrice(submitClientEventSpy);
+        submitClientEventSpy.resetHistory();
+
+        cd.submitDelayedClientEvents(overrides);
+
+        assert.calledThrice(submitClientEventSpy);
+        assert.calledWith(submitClientEventSpy.firstCall, {
+          name: 'client.alert.displayed',
+          payload: undefined,
+          options: {
+            meetingId: 'meetingId',
+            correlationId: 'newCorrelationId',
+            triggeredTime: now.toISOString(),
+          },
+        });
+        assert.calledWith(submitClientEventSpy.secondCall, {
+          name: 'client.alert.removed',
+          payload: undefined,
+          options: {
+            meetingId: 'meetingId',
+            correlationId: 'newCorrelationId',
+            triggeredTime: now.toISOString(),
+          },
+        });
+        assert.calledWith(submitClientEventSpy.thirdCall, {
+          name: 'client.call.aborted',
+          payload: undefined,
+          options: {
+            meetingId: 'meetingId',
+            correlationId: 'newCorrelationId',
+            triggeredTime: now.toISOString(),
+          },
+        });
+        submitClientEventSpy.resetHistory();
+
+        cd.submitDelayedClientEvents();
+
+        // should not call submitClientEvent again if delayedClientEvents was cleared
+        assert.notCalled(submitClientEventSpy);
+      });
     });
   });
 });