@webex/internal-plugin-metrics 3.5.0-next.8 → 3.5.0-wxcc.1

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

@@ -1,9 +1,7 @@
 import sinon from 'sinon';
-import bowser from 'bowser';
 import {assert} from '@webex/test-helper-chai';
 import {WebexHttpError} from '@webex/webex-core';
 import {BrowserDetection} from '@webex/common';
-import window from 'global/window';
 import {
   CallDiagnosticLatencies,
   CallDiagnosticMetrics,
@@ -42,6 +40,9 @@ describe('internal-plugin-metrics', () => {
       },
       meetingInfo: {},
       getCurUserType: () => 'host',
+      statsAnalyzer: {
+        getLocalIpAddress: () => '192.168.1.90',
+      },
     };
 
     const fakeMeeting2 = {
@@ -51,17 +52,9 @@ describe('internal-plugin-metrics', () => {
       callStateForMetrics: {loginType: 'fakeLoginType'},
     };
 
-    const fakeMeeting3 = {
-      ...fakeMeeting,
-      id: '3',
-      correlationId: 'correlationId3',
-      sessionCorrelationId: 'sessionCorrelationId3',
-    }
-
     const fakeMeetings = {
       1: fakeMeeting,
       2: fakeMeeting2,
-      3: fakeMeeting3,
     };
 
     let webex;
@@ -93,19 +86,8 @@ describe('internal-plugin-metrics', () => {
               clientName: 'Cantina',
             },
           },
-          getBasicMeetingInformation: (id) => fakeMeetings[id],
           meetingCollection: {
-            get: (meetingId) => {
-              return {
-                statsAnalyzer: {
-                  getLocalIpAddress: () => {
-                    if (meetingId) {
-                      return '192.168.1.90';
-                    }
-                  },
-                }
-              }
-            },
+            get: (id) => fakeMeetings[id],
           },
           geoHintInfo: {
             clientAddress: '1.3.4.5',
@@ -384,94 +366,6 @@ describe('internal-plugin-metrics', () => {
         });
       });
 
-      [undefined, null, '', false, 0].forEach((sessionCorrelationId) => {
-        it(`should build identifiers correctly and not add session correlation id if it is falsy: ${sessionCorrelationId}`, () => {
-          cd.device = {
-            ...cd.device,
-            config: {installationId: 'installationId'},
-          };
-
-          const res = cd.getIdentifiers({
-            mediaConnections: [
-              {mediaAgentAlias: 'mediaAgentAlias', mediaAgentGroupId: 'mediaAgentGroupId'},
-            ],
-            meeting: {...fakeMeeting, sessionCorrelationId},
-            sessionCorrelationId: sessionCorrelationId as any,
-          });
-
-          assert.deepEqual(res, {
-            correlationId: 'correlationId',
-            deviceId: 'deviceUrl',
-            locusId: 'url',
-            locusStartTime: 'lastActive',
-            locusUrl: 'locus/url',
-            machineId: 'installationId',
-            mediaAgentAlias: 'mediaAgentAlias',
-            mediaAgentGroupId: 'mediaAgentGroupId',
-            orgId: 'orgId',
-            userId: 'userId',
-          });
-        });
-      });
-
-      it('should build identifiers correctly with sessionCorrelationID as a param', () => {
-        cd.device = {
-          ...cd.device,
-          config: {installationId: 'installationId'},
-        };
-
-        const res = cd.getIdentifiers({
-          mediaConnections: [
-            {mediaAgentAlias: 'mediaAgentAlias', mediaAgentGroupId: 'mediaAgentGroupId'},
-          ],
-          meeting: fakeMeeting,
-          sessionCorrelationId: 'sessionCorrelationId',
-        });
-
-        assert.deepEqual(res, {
-          correlationId: 'correlationId',
-          sessionCorrelationId: 'sessionCorrelationId',
-          deviceId: 'deviceUrl',
-          locusId: 'url',
-          locusStartTime: 'lastActive',
-          locusUrl: 'locus/url',
-          machineId: 'installationId',
-          mediaAgentAlias: 'mediaAgentAlias',
-          mediaAgentGroupId: 'mediaAgentGroupId',
-          orgId: 'orgId',
-          userId: 'userId',
-        });
-      });
-
-      it('should build identifiers correctly with sessionCorrelationID as a param and a meeting with session correlation id, and the param should take precedence', () => {
-        cd.device = {
-          ...cd.device,
-          config: {installationId: 'installationId'},
-        };
-
-        const res = cd.getIdentifiers({
-          mediaConnections: [
-            {mediaAgentAlias: 'mediaAgentAlias', mediaAgentGroupId: 'mediaAgentGroupId'},
-          ],
-          meeting: {...fakeMeeting, sessionCorrelationId: 'sessionCorrelationId1'},
-          sessionCorrelationId: 'sessionCorrelationId',
-        });
-
-        assert.deepEqual(res, {
-          correlationId: 'correlationId',
-          sessionCorrelationId: 'sessionCorrelationId',
-          deviceId: 'deviceUrl',
-          locusId: 'url',
-          locusStartTime: 'lastActive',
-          locusUrl: 'locus/url',
-          machineId: 'installationId',
-          mediaAgentAlias: 'mediaAgentAlias',
-          mediaAgentGroupId: 'mediaAgentGroupId',
-          orgId: 'orgId',
-          userId: 'userId',
-        });
-      });
-
       it('should build identifiers correctly with a meeting that has meetingInfo with a webexConferenceIdStr and globalMeetingId, and that should take precedence over the options passed to it', () => {
         const res = cd.getIdentifiers({
           mediaConnections: [
@@ -572,42 +466,6 @@ describe('internal-plugin-metrics', () => {
         });
       });
 
-      it('should build identifiers correctly with a meeting that has sessionCorrelationId', () => {
-        const res = cd.getIdentifiers({
-          mediaConnections: [
-            {mediaAgentAlias: 'mediaAgentAlias', mediaAgentGroupId: 'mediaAgentGroupId'},
-          ],
-          webexConferenceIdStr: 'webexConferenceIdStr',
-          globalMeetingId: 'globalMeetingId',
-          meeting: {
-            ...fakeMeeting,
-            sessionCorrelationId: 'sessionCorrelationId1',
-            meetingInfo: {
-              ...fakeMeeting.meetingInfo,
-              confIdStr: 'webexConferenceIdStr1',
-              meetingId: 'globalMeetingId1',
-              siteName: 'siteName1',
-            },
-          },
-        });
-
-        assert.deepEqual(res, {
-          correlationId: 'correlationId',
-          sessionCorrelationId: 'sessionCorrelationId1',
-          webexConferenceIdStr: 'webexConferenceIdStr1',
-          globalMeetingId: 'globalMeetingId1',
-          deviceId: 'deviceUrl',
-          locusId: 'url',
-          locusStartTime: 'lastActive',
-          locusUrl: 'locus/url',
-          mediaAgentAlias: 'mediaAgentAlias',
-          mediaAgentGroupId: 'mediaAgentGroupId',
-          orgId: 'orgId',
-          userId: 'userId',
-          webexSiteName: 'siteName1',
-        });
-      });
-
       it('should build identifiers correctly given webexConferenceIdStr', () => {
         const res = cd.getIdentifiers({
           correlationId: 'correlationId',
@@ -654,22 +512,6 @@ describe('internal-plugin-metrics', () => {
         });
       });
 
-      it('should build identifiers correctly given sessionCorrelationId', () => {
-        const res = cd.getIdentifiers({
-          correlationId: 'correlationId',
-          sessionCorrelationId: 'sessionCorrelationId',
-        });
-
-        assert.deepEqual(res, {
-          correlationId: 'correlationId',
-          sessionCorrelationId: 'sessionCorrelationId',
-          deviceId: 'deviceUrl',
-          locusUrl: 'locus-url',
-          orgId: 'orgId',
-          userId: 'userId',
-        });
-      });
-
       it('should throw Error if correlationId is missing', () => {
         assert.throws(() =>
           cd.getIdentifiers({
@@ -764,13 +606,12 @@ describe('internal-plugin-metrics', () => {
           options,
         });
 
-        assert.called(getIdentifiersSpy);
         assert.calledWith(getIdentifiersSpy, {
           meeting: fakeMeeting,
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
           webexConferenceIdStr: undefined,
-          globalMeetingId: undefined,
           sessionCorrelationId: undefined,
+          globalMeetingId: undefined,
         });
         assert.notCalled(generateClientEventErrorPayloadSpy);
         assert.calledWith(
@@ -879,142 +720,6 @@ describe('internal-plugin-metrics', () => {
         ]);
       });
 
-      it('should submit client event successfully with meetingId which has a sessionCorrelationId', () => {
-        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: fakeMeeting3.id,
-          mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
-        };
-
-        cd.submitClientEvent({
-          name: 'client.alert.displayed',
-          options,
-        });
-
-        assert.called(getIdentifiersSpy);
-        assert.calledWith(getIdentifiersSpy, {
-          meeting: {...fakeMeeting3, sessionCorrelationId: 'sessionCorrelationId3'},
-          mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
-          webexConferenceIdStr: undefined,
-          globalMeetingId: undefined,
-          sessionCorrelationId: undefined,
-        });
-        assert.notCalled(generateClientEventErrorPayloadSpy);
-        assert.calledWith(
-          prepareDiagnosticEventSpy,
-          {
-            canProceed: true,
-            eventData: {
-              webClientDomain: 'whatever',
-            },
-            identifiers: {
-              correlationId: 'correlationId3',
-              sessionCorrelationId: 'sessionCorrelationId3',
-              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,
-          },
-          options
-        );
-        assert.calledWith(submitToCallDiagnosticsSpy, {
-          event: {
-            canProceed: true,
-            eventData: {
-              webClientDomain: 'whatever',
-            },
-            identifiers: {
-              correlationId: 'correlationId3',
-              sessionCorrelationId: 'sessionCorrelationId3',
-              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,
-          },
-          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',
-              },
-              identifiers: {
-                correlationId: 'correlationId3',
-                sessionCorrelationId: 'sessionCorrelationId3',
-                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,
-            },
-            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 log browser data, but only for the first call diagnostic event', () => {
         const prepareDiagnosticEventSpy = sinon.spy(cd, 'prepareDiagnosticEvent');
         const submitToCallDiagnosticsSpy = sinon.spy(cd, 'submitToCallDiagnostics');
@@ -1022,9 +727,6 @@ 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);
-        sinon.stub(bowser, 'getParser').returns(userAgent);
-
         const options = {
           meetingId: fakeMeeting.id,
           mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
@@ -1053,7 +755,7 @@ describe('internal-plugin-metrics', () => {
         assert.deepEqual(webexLoggerLogCalls[2].args, [
           'call-diagnostic-events -> ',
           'CallDiagnosticMetrics: @createClientEventObjectInMeeting => collected browser data',
-          `${JSON.stringify(userAgent)}`,
+          '{"error":"unable to access window.navigator.userAgent"}',
         ]);
 
         assert.deepEqual(webexLoggerLogCalls[3].args, [
@@ -1286,57 +988,6 @@ describe('internal-plugin-metrics', () => {
         });
       });
 
-      it('should use meeting loginType if present and meetingId provided, with sessionCorrelationId', () => {
-        const submitToCallDiagnosticsSpy = sinon.spy(cd, 'submitToCallDiagnostics');
-        sinon.stub(cd, 'getOrigin').returns({origin: 'fake-origin'});
-        const options = {
-          meetingId: fakeMeeting2.id,
-          mediaConnections: [{mediaAgentAlias: 'alias', mediaAgentGroupId: '1'}],
-          sessionCorrelationId: 'sessionCorrelationId1'
-        };
-
-        cd.submitClientEvent({
-          name: 'client.alert.displayed',
-          options,
-        });
-
-        assert.calledWith(submitToCallDiagnosticsSpy, {
-          event: {
-            canProceed: true,
-            eventData: {
-              webClientDomain: 'whatever',
-            },
-            identifiers: {
-              correlationId: 'correlationId2',
-              sessionCorrelationId: 'sessionCorrelationId1',
-              deviceId: 'deviceUrl',
-              locusId: 'url',
-              locusStartTime: 'lastActive',
-              locusUrl: 'locus/url',
-              mediaAgentAlias: 'alias',
-              mediaAgentGroupId: '1',
-              orgId: 'orgId',
-              userId: 'userId',
-            },
-            loginType: 'fakeLoginType',
-            name: 'client.alert.displayed',
-            userType: 'host',
-            isConvergedArchitectureEnabled: undefined,
-            webexSubServiceType: undefined,
-          },
-          eventId: 'my-fake-id',
-          origin: {
-            origin: 'fake-origin',
-          },
-          originTime: {
-            sent: 'not_defined_yet',
-            triggered: now.toISOString(),
-          },
-          senderCountryCode: 'UK',
-          version: 1,
-        });
-      });
-
       it('it should include errors if provided with meetingId', () => {
         sinon.stub(cd, 'getOrigin').returns({origin: 'fake-origin'});
         const submitToCallDiagnosticsSpy = sinon.spy(cd, 'submitToCallDiagnostics');
@@ -1460,9 +1111,6 @@ describe('internal-plugin-metrics', () => {
                 name: 'other',
                 category: 'other',
                 errorCode: 9999,
-                errorData: {
-                  errorName: 'Error'
-                },
                 serviceErrorCode: 9999,
                 errorDescription: 'UnknownError',
                 rawErrorMessage: 'bad times',
@@ -1496,7 +1144,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: {"fatal":true,"shownToUser":false,"name":"other","category":"other","errorCode":9999,"serviceErrorCode":9999,"rawErrorMessage":"bad times","errorDescription":"UnknownError"}`,
         ]);
       });
 
@@ -1534,9 +1182,6 @@ describe('internal-plugin-metrics', () => {
                 name: 'other',
                 category: 'other',
                 errorCode: 9999,
-                errorData: {
-                  errorName: 'Error'
-                },
                 serviceErrorCode: 9999,
                 errorDescription: 'UnknownError',
                 rawErrorMessage: 'bad times',
@@ -1568,7 +1213,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: {"fatal":true,"shownToUser":false,"name":"other","category":"other","errorCode":9999,"serviceErrorCode":9999,"rawErrorMessage":"bad times","errorDescription":"UnknownError"}`,
         ]);
       });
 
@@ -1722,8 +1367,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('should send behavioral event if meetingId provided but meeting is undefined', () => {
-        webex.meetings.getBasicMeetingInformation = sinon.stub().returns(undefined);
-
+        webex.meetings.meetingCollection.get = sinon.stub().returns(undefined);
         cd.submitClientEvent({name: 'client.alert.displayed', options: {meetingId: 'meetingId'}});
         assert.calledWith(
           webex.internal.metrics.submitClientMetrics,
@@ -1927,7 +1571,7 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('should send behavioral event if meeting is undefined', () => {
-        webex.meetings.getBasicMeetingInformation = sinon.stub().returns(undefined);
+        webex.meetings.meetingCollection.get = sinon.stub().returns(undefined);
         cd.submitMQE({
           name: 'client.mediaquality.event',
           payload: {
@@ -2249,9 +1893,6 @@ describe('internal-plugin-metrics', () => {
           shownToUser: true,
           serviceErrorCode: 9999,
           errorCode: 9999,
-          errorData: {
-            errorName: 'Error'
-          },
           rawErrorMessage: 'bad times',
         });
       });
@@ -2395,40 +2036,6 @@ describe('internal-plugin-metrics', () => {
         });
       });
 
-      it('should generate event error payload correctly for wdm error 4404002', () => {
-        const res = cd.generateClientEventErrorPayload({
-          body: {errorCode: 4404002},
-          message: 'Operation denied due to region restriction',
-        });
-        assert.deepEqual(res, {
-          category: 'expected',
-          errorDescription: 'WdmRestrictedRegion',
-          fatal: true,
-          name: 'other',
-          shownToUser: false,
-          serviceErrorCode: 4404002,
-          errorCode: 13000,
-          rawErrorMessage: 'Operation denied due to region restriction',
-        });
-      });
-
-      it('should generate event error payload correctly for wdm error 4404003', () => {
-        const res = cd.generateClientEventErrorPayload({
-          body: {errorCode: 4404003},
-          message: 'Operation denied due to region restriction',
-        });
-        assert.deepEqual(res, {
-          category: 'expected',
-          errorDescription: 'WdmRestrictedRegion',
-          fatal: true,
-          name: 'other',
-          shownToUser: false,
-          serviceErrorCode: 4404003,
-          errorCode: 13000,
-          rawErrorMessage: 'Operation denied due to region restriction',
-        });
-      });
-
       describe('httpStatusCode', () => {
         it('should include httpStatusCode for browser media errors', () => {
           const res = cd.generateClientEventErrorPayload({
@@ -2707,7 +2314,6 @@ describe('internal-plugin-metrics', () => {
                     environment: 'meeting_evn',
                     name: 'endpoint',
                     networkType: 'unknown',
-                    upgradeChannel: 'test',
                     userAgent,
                   },
                   originTime: {
@@ -2791,11 +2397,11 @@ describe('internal-plugin-metrics', () => {
       // The method is called in beforeEach itself. We are just testing it here
       it('sets the received deviceInfo to call-diagnostics', () => {
         const webexLoggerLogCalls = webex.logger.log.getCalls();
-        const device = {userId: 'userId', url: 'deviceUrl', orgId: 'orgId'};
+        const device = { userId: 'userId', url: 'deviceUrl', orgId: 'orgId' };
 
         assert.deepEqual(webexLoggerLogCalls[0].args, [
           'CallDiagnosticMetrics: @setDeviceInfo called',
-          device,
+          device
         ]);
 
         assert.deepEqual(cd.device, device);

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

@@ -274,7 +274,7 @@ describe('internal-plugin-metrics', () => {
   describe('prepareDiagnosticMetricItem', () => {
     let webex: any;
 
-    const check = (eventName: string, expectedEvent: any, expectedUpgradeChannel: string) => {
+    const check = (eventName: string, expectedEvent: any) => {
       const eventPayload = {event: {name: eventName}};
       const item = prepareDiagnosticMetricItem(webex, {
         eventPayload,
@@ -286,7 +286,6 @@ describe('internal-plugin-metrics', () => {
           origin: {
             buildType: 'prod',
             networkType: 'unknown',
-            upgradeChannel: expectedUpgradeChannel
           },
           event: {name: eventName, ...expectedEvent},
         },
@@ -418,11 +417,11 @@ describe('internal-plugin-metrics', () => {
       ],
     ].forEach(([eventName, expectedEvent]) => {
       it(`returns expected result for ${eventName}`, () => {
-        check(eventName as string, expectedEvent, 'gold');
+        check(eventName as string, expectedEvent);
       });
     });
 
-    it('sets buildType and upgradeChannel correctly', () => {
+    it('getBuildType returns correct value', () => {
       const item: any = {
         eventPayload: {
           event: {
@@ -439,14 +438,11 @@ describe('internal-plugin-metrics', () => {
       // just submit any event
       prepareDiagnosticMetricItem(webex, item);
       assert.deepEqual(item.eventPayload.origin.buildType, 'test');
-      assert.deepEqual(item.eventPayload.origin.upgradeChannel, 'test');
 
       delete item.eventPayload.origin.buildType;
-      delete item.eventPayload.origin.upgradeChannel;
       item.eventPayload.event.eventData.markAsTestEvent = false;
       prepareDiagnosticMetricItem(webex, item);
       assert.deepEqual(item.eventPayload.origin.buildType, 'prod');
-      assert.deepEqual(item.eventPayload.origin.upgradeChannel, 'gold');
     });
   });
 

package/test/unit/spec/new-metrics.ts

@@ -11,6 +11,9 @@ describe('internal-plugin-metrics', () => {
       newMetrics: NewMetrics,
     },
     meetings: {
+      meetingCollection: {
+        get: sinon.stub(),
+      },
     },
     request: sinon.stub().resolves({}),
     logger: {

package/test/unit/spec/prelogin-metrics-batcher.ts

@@ -82,7 +82,6 @@ describe('internal-plugin-metrics', () => {
                   origin: {
                     buildType: 'test',
                     networkType: 'unknown',
-                    upgradeChannel: 'test',
                   },
                   originTime: {
                     sent: dateAfterBatcherWait.toISOString(),
@@ -212,7 +211,7 @@ describe('internal-plugin-metrics', () => {
         // item also gets assigned a delay property but the key is a Symbol and haven't been able to test that..
         assert.deepEqual(calls.args[0].eventPayload, {
           event: 'my.event',
-          origin: {buildType: 'test', networkType: 'unknown', upgradeChannel: 'test'},
+          origin: {buildType: 'test', networkType: 'unknown'},
         });
 
         assert.deepEqual(calls.args[0].type, ['diagnostic-event']);
@@ -226,7 +225,6 @@ describe('internal-plugin-metrics', () => {
           origin: {
             buildType: 'test',
             networkType: 'unknown',
-            upgradeChannel: 'test',
           },
         });
         assert.deepEqual(prepareDiagnosticMetricItemCalls[0].args[1].type, ['diagnostic-event']);

package/dist/rtcMetrics/constants.js

@@ -1,11 +0,0 @@
-"use strict";
-
-var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property");
-_Object$defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var RTC_METRICS = exports.default = {
-  APP_ID: 'FFB51ED5-4319-4C55-8303-B1F2FCCDE231'
-};
-//# sourceMappingURL=constants.js.map

package/dist/rtcMetrics/constants.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["RTC_METRICS","exports","default","APP_ID"],"sources":["constants.ts"],"sourcesContent":["const RTC_METRICS = {APP_ID: 'FFB51ED5-4319-4C55-8303-B1F2FCCDE231'};\n\nexport {RTC_METRICS as default};\n"],"mappings":";;;;;;;AAAA,IAAMA,WAAW,GAAAC,OAAA,CAAAC,OAAA,GAAG;EAACC,MAAM,EAAE;AAAsC,CAAC"}