@webex/internal-plugin-metrics 3.10.0-next.3 → 3.10.0-wxc-disconnect.1

package/src/call-diagnostic/call-diagnostic-metrics-latencies.ts

@@ -1,7 +1,6 @@
 /* eslint-disable class-methods-use-this */
 /* eslint-disable valid-jsdoc */
 import {WebexPlugin} from '@webex/webex-core';
-import {clamp} from 'lodash';
 
 import {MetricEventNames, PreComputedLatencies} from '../metrics.types';
 
@@ -17,7 +16,6 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
   precomputedLatencies: Map<PreComputedLatencies, number>;
   // meetingId that the current latencies are for
   private meetingId?: string;
-  private MAX_INTEGER = 2147483647;
 
   /**
    * @constructor
@@ -164,9 +162,13 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
 
     const diff = end - start;
 
-    const {minimum = 0, maximum = this.MAX_INTEGER} = clampValues || {};
+    if (!clampValues) {
+      return diff;
+    }
+
+    const {minimum = 0, maximum} = clampValues;
 
-    return clamp(diff, minimum, maximum);
+    return Math.min(maximum ?? Infinity, Math.max(diff, minimum));
   }
 
   /**
@@ -316,7 +318,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
   public getPageJMT() {
     const latency = this.precomputedLatencies.get('internal.client.pageJMT');
 
-    return typeof latency === 'number' ? clamp(latency, 0, this.MAX_INTEGER) : undefined;
+    return typeof latency === 'number' ? latency : undefined;
   }
 
   /**
@@ -326,7 +328,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
   public getDownloadTimeJMT() {
     const latency = this.precomputedLatencies.get('internal.download.time');
 
-    return typeof latency === 'number' ? clamp(latency, 0, this.MAX_INTEGER) : undefined;
+    return typeof latency === 'number' ? latency : undefined;
   }
 
   /**
@@ -347,7 +349,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     );
 
     if (typeof clickToInterstitialLatency === 'number') {
-      return clamp(clickToInterstitialLatency, 0, this.MAX_INTEGER);
+      return clickToInterstitialLatency;
     }
 
     return undefined;
@@ -371,7 +373,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     );
 
     if (typeof clickToInterstitialWithUserDelayLatency === 'number') {
-      return clamp(clickToInterstitialWithUserDelayLatency, 0, this.MAX_INTEGER);
+      return clickToInterstitialWithUserDelayLatency;
     }
 
     return undefined;
@@ -418,7 +420,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     if (interstitialJoinClickTimestamp && connectedMedia) {
       const interstitialToMediaOKJmt = connectedMedia - interstitialJoinClickTimestamp - lobbyTime;
 
-      return clamp(interstitialToMediaOKJmt, 0, this.MAX_INTEGER);
+      return Math.max(0, interstitialToMediaOKJmt);
     }
 
     return undefined;
@@ -433,7 +435,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     const interstitialToJoinOk = this.getInterstitialToJoinOK();
 
     if (typeof clickToInterstitial === 'number' && typeof interstitialToJoinOk === 'number') {
-      return clamp(clickToInterstitial + interstitialToJoinOk, 0, this.MAX_INTEGER);
+      return clickToInterstitial + interstitialToJoinOk;
     }
 
     return undefined;
@@ -451,7 +453,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
       typeof clickToInterstitialWithUserDelay === 'number' &&
       typeof interstitialToJoinOk === 'number'
     ) {
-      return clamp(clickToInterstitialWithUserDelay + interstitialToJoinOk, 0, this.MAX_INTEGER);
+      return clickToInterstitialWithUserDelay + interstitialToJoinOk;
     }
 
     return undefined;
@@ -466,7 +468,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     const ICESetupTime = this.getICESetupTime();
 
     if (joinReqResp && ICESetupTime) {
-      return clamp(joinReqResp + ICESetupTime, 0, this.MAX_INTEGER);
+      return joinReqResp + ICESetupTime;
     }
 
     return undefined;
@@ -483,16 +485,12 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     const lobbyTime = this.getStayLobbyTime();
 
     if (clickToInterstitial && interstitialToJoinOk && joinConfJMT) {
-      const totalMediaJMT = clamp(
-        clickToInterstitial + interstitialToJoinOk + joinConfJMT,
-        0,
-        Infinity
-      );
+      const totalMediaJMT = Math.max(0, clickToInterstitial + interstitialToJoinOk + joinConfJMT);
       if (this.getMeeting()?.allowMediaInLobby) {
-        return clamp(totalMediaJMT, 0, this.MAX_INTEGER);
+        return totalMediaJMT;
       }
 
-      return clamp(totalMediaJMT - lobbyTime, 0, this.MAX_INTEGER);
+      return Math.max(0, totalMediaJMT - lobbyTime);
     }
 
     return undefined;
@@ -508,11 +506,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     const joinConfJMT = this.getJoinConfJMT();
 
     if (clickToInterstitialWithUserDelay && interstitialToJoinOk && joinConfJMT) {
-      return clamp(
-        clickToInterstitialWithUserDelay + interstitialToJoinOk + joinConfJMT,
-        0,
-        this.MAX_INTEGER
-      );
+      return Math.max(0, clickToInterstitialWithUserDelay + interstitialToJoinOk + joinConfJMT);
     }
 
     return undefined;
@@ -527,7 +521,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     const joinConfJMT = this.getJoinConfJMT();
 
     if (typeof interstitialToJoinOk === 'number' && typeof joinConfJMT === 'number') {
-      return clamp(interstitialToJoinOk - joinConfJMT, 0, this.MAX_INTEGER);
+      return Math.max(0, interstitialToJoinOk - joinConfJMT);
     }
 
     return undefined;
@@ -554,7 +548,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     const reachablityClusterReqResp = this.precomputedLatencies.get('internal.get.cluster.time');
 
     return typeof reachablityClusterReqResp === 'number'
-      ? clamp(Math.floor(reachablityClusterReqResp), 0, this.MAX_INTEGER)
+      ? Math.floor(reachablityClusterReqResp)
       : undefined;
   }
 
@@ -588,9 +582,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
   public getExchangeCITokenJMT() {
     const exchangeCITokenJMT = this.precomputedLatencies.get('internal.exchange.ci.token.time');
 
-    return typeof exchangeCITokenJMT === 'number'
-      ? clamp(Math.floor(exchangeCITokenJMT), 0, this.MAX_INTEGER)
-      : undefined;
+    return typeof exchangeCITokenJMT === 'number' ? Math.floor(exchangeCITokenJMT) : undefined;
   }
 
   /**
@@ -600,7 +592,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     const refreshCaptchaReqResp = this.precomputedLatencies.get('internal.refresh.captcha.time');
 
     return typeof refreshCaptchaReqResp === 'number'
-      ? clamp(Math.floor(refreshCaptchaReqResp), 0, this.MAX_INTEGER)
+      ? Math.floor(refreshCaptchaReqResp)
       : undefined;
   }
 
@@ -614,7 +606,7 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
     );
 
     return typeof downloadIntelligenceModelsReqResp === 'number'
-      ? clamp(Math.floor(downloadIntelligenceModelsReqResp), 0, this.MAX_INTEGER)
+      ? Math.floor(downloadIntelligenceModelsReqResp)
       : undefined;
   }
 
@@ -626,6 +618,6 @@ export default class CallDiagnosticLatencies extends WebexPlugin {
   public getOtherAppApiReqResp() {
     const otherAppApiJMT = this.precomputedLatencies.get('internal.other.app.api.time');
 
-    return otherAppApiJMT > 0 ? clamp(Math.floor(otherAppApiJMT), 0, this.MAX_INTEGER) : undefined;
+    return otherAppApiJMT > 0 ? Math.floor(otherAppApiJMT) : undefined;
   }
 }

package/src/call-diagnostic/call-diagnostic-metrics.ts

@@ -1415,11 +1415,8 @@ export default class CallDiagnosticMetrics extends StatelessWebexPlugin {
    */
   public setDeviceInfo(device: any): void {
     // This was created to fix the circular dependency between internal-plugin-device and internal-plugin-metrics
-    this.logger.log('CallDiagnosticMetrics: @setDeviceInfo called', {
-      userId: device?.userId,
-      deviceId: device?.url,
-      orgId: device?.orgId,
-    });
+    this.logger.log('CallDiagnosticMetrics: @setDeviceInfo called', device);
+
     this.device = device;
   }
 }

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

@@ -131,7 +131,7 @@ describe('internal-plugin-metrics', () => {
     });
 
     describe('getDiffBetweenTimestamps with clamping', () => {
-      it('should apply default clamping (min: 0, max: 2147483647) when no clampValues provided', () => {
+      it('should return diff without clamping when no clampValues provided', () => {
         cdl.saveTimestamp({key: 'client.alert.displayed', value: 10});
         cdl.saveTimestamp({key: 'client.alert.removed', value: 50});
         const res = cdl.getDiffBetweenTimestamps('client.alert.displayed', 'client.alert.removed');
@@ -204,20 +204,6 @@ describe('internal-plugin-metrics', () => {
         });
         assert.deepEqual(res, undefined);
       });
-
-      it('should apply default minimum clamping (0) when no clampValues provided and diff is negative', () => {
-        cdl.saveTimestamp({key: 'client.alert.displayed', value: 100});
-        cdl.saveTimestamp({key: 'client.alert.removed', value: 50});
-        const res = cdl.getDiffBetweenTimestamps('client.alert.displayed', 'client.alert.removed');
-        assert.deepEqual(res, 0);
-      });
-
-      it('should clamp the value when a number greater than 2147483647', () => {
-        cdl.saveTimestamp({key: 'client.alert.displayed', value: 0});
-        cdl.saveTimestamp({key: 'client.alert.removed', value: 2147483648});
-        const res = cdl.getDiffBetweenTimestamps('client.alert.displayed', 'client.alert.removed');
-        assert.deepEqual(res, 2147483647);
-      });
     });
 
     it('calculates getMeetingInfoReqResp correctly', () => {
@@ -317,12 +303,6 @@ describe('internal-plugin-metrics', () => {
 
         assert.deepEqual(cdl.getRefreshCaptchaReqResp(), 321);
       });
-
-      it('returns the correct number when it is greater than 2147483647', () => {
-        cdl.saveLatency('internal.refresh.captcha.time', 4294967400);
-
-        assert.deepEqual(cdl.getRefreshCaptchaReqResp(), 2147483647);
-      });
     });
 
     describe('getReachabilityClustersReqResp', () => {
@@ -341,12 +321,6 @@ describe('internal-plugin-metrics', () => {
 
         assert.deepEqual(cdl.getReachabilityClustersReqResp(), 321);
       });
-
-      it('returns the correct number when it is greater than 2147483647', () => {
-        cdl.saveLatency('internal.get.cluster.time', 4294967400);
-
-        assert.deepEqual(cdl.getReachabilityClustersReqResp(), 2147483647);
-      });
     });
 
     describe('getExchangeCITokenJMT', () => {
@@ -365,12 +339,6 @@ describe('internal-plugin-metrics', () => {
 
         assert.deepEqual(cdl.getExchangeCITokenJMT(), 321);
       });
-
-      it('returns the correct number when it is greater than 2147483647', () => {
-        cdl.saveLatency('internal.exchange.ci.token.time', 4294967400);
-
-        assert.deepEqual(cdl.getExchangeCITokenJMT(), 2147483647);
-      });
     });
 
     describe('saveTimestamp', () => {
@@ -524,11 +492,6 @@ describe('internal-plugin-metrics', () => {
       assert.deepEqual(cdl.getPageJMT(), 10);
     });
 
-    it('calculates getPageJMT correctly when it is greater than MAX_INTEGER', () => {
-      cdl.saveLatency('internal.client.pageJMT', 2147483648);
-      assert.deepEqual(cdl.getPageJMT(), 2147483647);
-    });
-
     it('calculates getClickToInterstitial correctly', () => {
       cdl.saveTimestamp({
         key: 'internal.client.meeting.click.joinbutton',
@@ -559,11 +522,6 @@ describe('internal-plugin-metrics', () => {
       assert.deepEqual(cdl.getClickToInterstitial(), 0);
     });
 
-    it('calculates getClickToInterstitial without join button timestamp when it is greater than MAX_INTEGER', () => {
-      cdl.saveLatency('internal.click.to.interstitial', 2147483648);
-      assert.deepEqual(cdl.getClickToInterstitial(), 2147483647);
-    });
-
     it('calculates getClickToInterstitialWithUserDelay correctly', () => {
       cdl.saveTimestamp({
         key: 'internal.client.meeting.click.joinbutton',
@@ -594,11 +552,6 @@ describe('internal-plugin-metrics', () => {
       assert.deepEqual(cdl.getClickToInterstitialWithUserDelay(), 0);
     });
 
-    it('calculates getClickToInterstitialWithUserDelay without join button timestamp when it is greater than MAX_INTEGER', () => {
-      cdl.saveLatency('internal.click.to.interstitial.with.user.delay', 2147483648);
-      assert.deepEqual(cdl.getClickToInterstitialWithUserDelay(), 2147483647);
-    });
-
     it('calculates getInterstitialToJoinOK correctly', () => {
       cdl.saveTimestamp({
         key: 'internal.client.interstitial-window.click.joinbutton',
@@ -707,19 +660,6 @@ describe('internal-plugin-metrics', () => {
         assert.deepEqual(cdl.getTotalJMT(), undefined);
       });
 
-    it('calculates getTotalJMT correctly when it is greater than MAX_INTEGER', () => {
-      cdl.saveTimestamp({
-        key: 'internal.client.interstitial-window.click.joinbutton',
-        value: 5,
-      });
-      cdl.saveTimestamp({
-        key: 'client.locus.join.response',
-        value: 40,
-      });
-      cdl.saveLatency('internal.click.to.interstitial', 2147483648);
-      assert.deepEqual(cdl.getTotalJMT(), 2147483647);
-    });
-
     it('calculates getTotalJMTWithUserDelay correctly', () => {
       cdl.saveTimestamp({
         key: 'internal.client.interstitial-window.click.joinbutton',
@@ -792,19 +732,6 @@ describe('internal-plugin-metrics', () => {
         assert.deepEqual(cdl.getTotalJMTWithUserDelay(), undefined);
       });
 
-      it('calculates getTotalJMTWithUserDelay correctly when it is greater than MAX_INTEGER', () => {
-        cdl.saveLatency('internal.click.to.interstitial.with.user.delay', 2147483648);
-        cdl.saveTimestamp({
-          key: 'internal.client.interstitial-window.click.joinbutton',
-          value: 20,
-        });
-        cdl.saveTimestamp({
-          key: 'client.locus.join.response',
-          value: 40,
-        });
-        assert.deepEqual(cdl.getTotalJMTWithUserDelay(), 2147483647);
-      });
-
     it('calculates getTotalMediaJMT correctly', () => {
       cdl.saveTimestamp({
         key: 'internal.client.meeting.click.joinbutton',
@@ -841,42 +768,6 @@ describe('internal-plugin-metrics', () => {
       assert.deepEqual(cdl.getTotalMediaJMT(), 27);
     });
 
-    it('calculates getTotalMediaJMT correctly when it is greater than MAX_INTEGER', () => {
-      cdl.saveTimestamp({
-        key: 'internal.client.meeting.click.joinbutton',
-        value: 5,
-      });
-      cdl.saveTimestamp({
-        key: 'internal.client.meeting.interstitial-window.showed',
-        value: 8,
-      });
-      cdl.saveTimestamp({
-        key: 'internal.client.interstitial-window.click.joinbutton',
-        value: 10,
-      });
-      cdl.saveTimestamp({
-        key: 'client.locus.join.request',
-        value: 12,
-      });
-      cdl.saveTimestamp({
-        key: 'client.locus.join.response',
-        value: 2147483700,
-      });
-      cdl.saveTimestamp({
-        key: 'internal.host.meeting.participant.admitted',
-        value: 2147483800,
-      });
-      cdl.saveTimestamp({
-        key: 'client.ice.start',
-        value: 30,
-      });
-      cdl.saveTimestamp({
-        key: 'client.ice.end',
-        value: 100,
-      });
-      assert.deepEqual(cdl.getTotalMediaJMT(), 2147483647);
-    });
-
     it('calculates getTotalMediaJMT correctly with allowMediaInLobby true', () => {
       cdl.saveTimestamp({
         key: 'internal.client.meeting.click.joinbutton',
@@ -914,43 +805,6 @@ describe('internal-plugin-metrics', () => {
       assert.deepEqual(cdl.getTotalMediaJMT(), 31);
     });
 
-    it('calculates getTotalMediaJMT correctly with allowMediaInLobby true and it is greater than MAX_INTEGER', () => {
-      cdl.saveTimestamp({
-        key: 'internal.client.meeting.click.joinbutton',
-        value: 5,
-        options: {meetingId: 'meeting-id'},
-      });
-      cdl.saveTimestamp({
-        key: 'internal.client.meeting.interstitial-window.showed',
-        value: 100,
-      });
-      cdl.saveTimestamp({
-        key: 'internal.client.interstitial-window.click.joinbutton',
-        value: 1000,
-      });
-      cdl.saveTimestamp({
-        key: 'client.locus.join.request',
-        value: 2000,
-      });
-      cdl.saveTimestamp({
-        key: 'client.locus.join.response',
-        value: 2147483700,
-      });
-      cdl.saveTimestamp({
-        key: 'internal.host.meeting.participant.admitted',
-        value: 2147483800,
-      });
-      cdl.saveTimestamp({
-        key: 'client.ice.start',
-        value: 2147483900,
-      });
-      cdl.saveTimestamp({
-        key: 'client.ice.end',
-        value: 4294967400,
-      });
-      assert.deepEqual(cdl.getTotalMediaJMT(), 2147483647);
-    });
-
     it('calculates getTotalMediaJMTWithUserDelay correctly', () => {
       cdl.saveLatency('internal.click.to.interstitial.with.user.delay', 7);
       cdl.saveTimestamp({
@@ -1036,28 +890,6 @@ describe('internal-plugin-metrics', () => {
       assert.deepEqual(cdl.getJoinConfJMT(), 20);
     });
 
-    it('calculates getJoinConfJMT correctly when it is greater than MAX_INTEGER', () => {
-      // Since both getJoinReqResp and getICESetupTime are individually clamped to 1200000,
-      // the maximum possible sum is 2400000, which is less than MAX_INTEGER (2147483647).
-      // This test should verify that the final clamping works by mocking the intermediate methods
-      // to return values that would sum to more than MAX_INTEGER.
-      
-      const originalGetJoinReqResp = cdl.getJoinReqResp;
-      const originalGetICESetupTime = cdl.getICESetupTime;
-      
-      // Mock the methods to return large values that would exceed MAX_INTEGER when summed
-      cdl.getJoinReqResp = () => 1500000000;
-      cdl.getICESetupTime = () => 1000000000;
-      
-      const result = cdl.getJoinConfJMT();
-      
-      // Restore original methods
-      cdl.getJoinReqResp = originalGetJoinReqResp;
-      cdl.getICESetupTime = originalGetICESetupTime;
-      
-      assert.deepEqual(result, 2147483647);
-    });
-
     it('calculates getClientJMT correctly', () => {
       cdl.saveTimestamp({
         key: 'internal.client.interstitial-window.click.joinbutton',
@@ -1150,26 +982,6 @@ describe('internal-plugin-metrics', () => {
       assert.deepEqual(cdl.getInterstitialToMediaOKJMT(), 8);
     });
 
-    it('calculates getInterstitialToMediaOKJMT correctly when it is greater than MAX_INTEGER', () => {
-      cdl.saveTimestamp({
-        key: 'internal.client.interstitial-window.click.joinbutton',
-        value: 4,
-      });
-      cdl.saveTimestamp({
-        key: 'client.locus.join.response',
-        value: 10,
-      });
-      cdl.saveTimestamp({
-        key: 'internal.host.meeting.participant.admitted',
-        value: 12,
-      });
-      cdl.saveTimestamp({
-        key: 'client.ice.end',
-        value: 2147483700,
-      });
-      assert.deepEqual(cdl.getInterstitialToMediaOKJMT(), 2147483647);
-    });
-
     it('calculates getInterstitialToMediaOKJMT correctly without lobby', () => {
       cdl.saveTimestamp({
         key: 'internal.client.interstitial-window.click.joinbutton',
@@ -1217,11 +1029,6 @@ describe('internal-plugin-metrics', () => {
       assert.deepEqual(cdl.getDownloadTimeJMT(), 1000);
     });
 
-    it('calculates getDownloadTimeJMT correctly when it is greater than MAX_INTEGER', () => {
-      cdl.saveLatency('internal.download.time', 2147483648);
-      assert.deepEqual(cdl.getDownloadTimeJMT(), 2147483647);
-    });
-
     describe('getOtherAppApiReqResp', () => {
       it('returns undefined when no precomputed value available', () => {
         assert.deepEqual(cdl.getOtherAppApiReqResp(), undefined);
@@ -1244,12 +1051,6 @@ describe('internal-plugin-metrics', () => {
 
         assert.deepEqual(cdl.getOtherAppApiReqResp(), 321);
       });
-
-      it('returns the correct number when it is greater than 2147483647', () => {
-        cdl.saveLatency('internal.other.app.api.time', 4294967400);
-
-        assert.deepEqual(cdl.getOtherAppApiReqResp(), 2147483647);
-      });
     });
   });
 });

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

@@ -3906,7 +3906,7 @@ describe('internal-plugin-metrics', () => {
 
         assert.deepEqual(webexLoggerLogCalls[0].args, [
           'CallDiagnosticMetrics: @setDeviceInfo called',
-          {userId: 'userId', deviceId: 'deviceUrl', orgId: 'orgId'},
+          device,
         ]);
 
         assert.deepEqual(cd.device, device);