@webex/internal-plugin-metrics 3.12.0-next.8 → 3.12.0-task-refactor.1

package/src/new-metrics.ts

@@ -9,8 +9,6 @@ import CallDiagnosticMetrics from './call-diagnostic/call-diagnostic-metrics';
 import BehavioralMetrics from './behavioral-metrics';
 import OperationalMetrics from './operational-metrics';
 import BusinessMetrics from './business-metrics';
-import PreLoginMetrics from './prelogin-metrics';
-import PreLoginMetricsBatcher from './prelogin-metrics-batcher';
 import {
   RecursivePartial,
   MetricEventProduct,
@@ -47,7 +45,6 @@ class Metrics extends WebexPlugin {
   behavioralMetrics: BehavioralMetrics;
   operationalMetrics: OperationalMetrics;
   businessMetrics: BusinessMetrics;
-  preLoginMetrics: PreLoginMetrics;
   isReady = false;
 
   /**
@@ -90,13 +87,6 @@ class Metrics extends WebexPlugin {
     this.webex.once('ready', () => {
       // @ts-ignore
       this.callDiagnosticMetrics = new CallDiagnosticMetrics({}, {parent: this.webex});
-      this.preLoginMetrics = new PreLoginMetrics(
-        // @ts-ignore
-        new PreLoginMetricsBatcher({}, {parent: this.webex}),
-        {},
-        // @ts-ignore
-        {parent: this.webex}
-      );
       this.isReady = true;
       this.setDelaySubmitClientEvents({
         shouldDelay: this.delaySubmitClientEvents,
@@ -261,38 +251,6 @@ class Metrics extends WebexPlugin {
     return this.businessMetrics.submitBusinessEvent({name, payload, table, metadata});
   }
 
-  /**
-   * Call Analyzer: Pre-Login Event
-   * @param args
-   */
-  submitPreLoginEvent({
-    name,
-    preLoginId,
-    payload,
-    metadata,
-  }: {
-    name: string;
-    preLoginId: string;
-    payload: EventPayload;
-    metadata?: EventPayload;
-  }): Promise<void> {
-    if (!this.isReady) {
-      // @ts-ignore
-      this.webex.logger.log(
-        `NewMetrics: @submitPreLoginEvent. Attempted to submit before webex.ready: ${name}`
-      );
-
-      return Promise.resolve();
-    }
-
-    return this.preLoginMetrics.submitPreLoginEvent({
-      name,
-      preLoginId,
-      payload,
-      metadata,
-    });
-  }
-
   /**
    * Call Analyzer: Media Quality Event
    * @param args

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

@@ -142,7 +142,9 @@ describe('plugin-metrics', () => {
           webex.internal.newMetrics.callDiagnosticLatencies.getDiffBetweenTimestamps = sinon
             .stub()
             .returns(10);
-          webex.internal.newMetrics.callDiagnosticLatencies.getU2CTime = sinon.stub().returns(20);
+          webex.internal.newMetrics.callDiagnosticLatencies.getU2CTime = sinon
+            .stub()
+            .returns(20);
           webex.internal.newMetrics.callDiagnosticLatencies.getReachabilityClustersReqResp = sinon
             .stub()
             .returns(10);
@@ -163,7 +165,7 @@ describe('plugin-metrics', () => {
               registerWDMDeviceJMT: 10,
               showInterstitialTime: 10,
               getU2CTime: 20,
-              getReachabilityClustersReqResp: 10,
+              getReachabilityClustersReqResp: 10
             },
           });
           assert.lengthOf(
@@ -187,8 +189,9 @@ describe('plugin-metrics', () => {
           webex.internal.newMetrics.callDiagnosticLatencies.getDownloadTimeJMT = sinon
             .stub()
             .returns(100);
-          webex.internal.newMetrics.callDiagnosticLatencies.getClickToInterstitialWithUserDelay =
-            sinon.stub().returns(43);
+          webex.internal.newMetrics.callDiagnosticLatencies.getClickToInterstitialWithUserDelay = sinon
+            .stub()
+            .returns(43);
           webex.internal.newMetrics.callDiagnosticLatencies.getTotalJMTWithUserDelay = sinon
             .stub()
             .returns(64);
@@ -343,10 +346,7 @@ describe('plugin-metrics', () => {
           webex.internal.newMetrics.callDiagnosticLatencies.getInterstitialToJoinOK = sinon
             .stub()
             .returns(7);
-          webex.internal.newMetrics.callDiagnosticLatencies.getStayLobbyTime = sinon
-            .stub()
-            .returns(1);
-          webex.internal.newMetrics.callDiagnosticLatencies.getStayLobbyTimeCappedBy = sinon
+            webex.internal.newMetrics.callDiagnosticLatencies.getStayLobbyTime = sinon
             .stub()
             .returns(1);
           webex.internal.newMetrics.callDiagnosticLatencies.getTotalMediaJMTWithUserDelay = sinon
@@ -369,9 +369,10 @@ describe('plugin-metrics', () => {
           assert.deepEqual(webex.request.getCalls()[0].args[0].body.metrics[0].eventPayload.event, {
             name: 'client.media-engine.ready',
             joinTimes: {
-              totalMediaJMT: 44,
+              totalMediaJMT: 61,
               interstitialToMediaOKJMT: 22,
-              callInitMediaEngineReady: 22,
+              callInitMediaEngineReady: 10,
+              stayLobbyTime: 1,
               totalMediaJMTWithUserDelay: 43,
               totalJMTWithUserDelay: 64,
             },
@@ -381,34 +382,6 @@ describe('plugin-metrics', () => {
             0
           );
         });
-
-        it('appends the correct join times to the request for client.lobby.exited', async () => {
-          webex.internal.newMetrics.callDiagnosticLatencies.getStayLobbyTime = sinon
-            .stub()
-            .returns(10);
-
-          const promise = webex.internal.newMetrics.callDiagnosticMetrics.submitToCallDiagnostics(
-            //@ts-ignore
-            {event: {name: 'client.lobby.exited'}}
-          );
-          await flushPromises();
-          clock.tick(config.metrics.batcherWait);
-
-          await promise;
-
-          //@ts-ignore
-          assert.calledOnce(webex.request);
-          assert.deepEqual(webex.request.getCalls()[0].args[0].body.metrics[0].eventPayload.event, {
-            name: 'client.lobby.exited',
-            joinTimes: {
-              stayLobbyTime: 10,
-            },
-          });
-          assert.lengthOf(
-            webex.internal.newMetrics.callDiagnosticMetrics.callDiagnosticEventsBatcher.queue,
-            0
-          );
-        });
       });
 
       describe('when the request fails', () => {