@webex/internal-plugin-metrics 3.0.0 → 3.1.0

package/test/unit/spec/metrics.js

@@ -104,9 +104,15 @@ describe('plugin-metrics', () => {
       };
       webex.config.metrics.type = ['operational'];
       webex.config.metrics.appType = 'sdk';
+      webex.meetings = {
+        config: {
+          metrics: {
+            clientVersion: '43.0.105'
+          }
+        }
+      }
 
       sinon.spy(webex, 'request');
-      sinon.spy(metrics, 'postPreLoginMetric');
       sinon.spy(metrics, 'aliasUser');
     });
 
@@ -180,6 +186,7 @@ describe('plugin-metrics', () => {
           },
           metricName: 'test',
           tags: {
+            appVersion: '43.0.105',
             browser: '',
             domain: 'whatever',
             os: 'other',
@@ -199,7 +206,7 @@ describe('plugin-metrics', () => {
 
     describe('#submitClientMetrics()', () => {
       describe('before login', () => {
-        it('posts pre-login metric', () => {
+        it('clientMetricsPreloginBatcher pre-login metric', () => {
           const date = clock.now;
           const promise = metrics.submitClientMetrics(eventName, mockPayload, preLoginId);
 
@@ -207,8 +214,6 @@ describe('plugin-metrics', () => {
             .then(() => clock.tick(config.metrics.batcherWait))
             .then(() => promise)
             .then(() => {
-              assert.called(metrics.postPreLoginMetric);
-              assert.calledOnce(webex.credentials.getClientToken);
               assert.calledOnce(webex.request);
               const req = webex.request.args[0][0];
               const metric = req.body.metrics[0];
@@ -296,33 +301,6 @@ describe('plugin-metrics', () => {
       });
     });
 
-    describe('#postPreLoginMetric()', () => {
-      it('returns an HttpResponse object', () => {
-        const promise = metrics.postPreLoginMetric(preLoginProps, preLoginId);
-
-        return promiseTick(50)
-          .then(() => clock.tick(config.metrics.batcherWait))
-          .then(() => promise)
-          .then(() => {
-            assert.calledOnce(webex.request);
-            const req = webex.request.args[0][0];
-            const metric = req.body.metrics[0];
-            const {headers} = req;
-
-            assert.property(headers, 'x-prelogin-userid');
-            assert.property(metric, 'metricName');
-            assert.property(metric, 'tags');
-            assert.property(metric, 'fields');
-            assert.property(metric, 'timestamp');
-
-            assert.equal(metric.timestamp, transformedProps.timestamp);
-            assert.equal(metric.metricName, eventName);
-            assert.equal(metric.tags.testTag, 'tag value');
-            assert.equal(metric.fields.testField, 123);
-          });
-      });
-    });
-
     describe('#aliasUser()', () => {
       it('returns an HttpResponse object', () =>
         metrics.aliasUser(preLoginId).then(() => {

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

@@ -1,29 +1,31 @@
 import {assert} from '@webex/test-helper-chai';
-import {NewMetrics} from '@webex/internal-plugin-metrics';
+import {NewMetrics, CallDiagnosticLatencies} from '@webex/internal-plugin-metrics';
 import MockWebex from '@webex/test-helper-mock-webex';
 import sinon from 'sinon';
 import {Utils} from '@webex/internal-plugin-metrics';
 
 describe('internal-plugin-metrics', () => {
 
+  const mockWebex = () => new MockWebex({
+    children: {
+      newMetrics: NewMetrics,
+    },
+    meetings: {
+      meetingCollection: {
+        get: sinon.stub(),
+      },
+    },
+    request: sinon.stub().resolves({}),
+    logger: {
+      log: sinon.stub(),
+      error: sinon.stub(),
+    }
+  });
+
   describe('check submitClientEvent when webex is not ready', () => {
     let webex;
     //@ts-ignore
-    webex = new MockWebex({
-      children: {
-        newMetrics: NewMetrics,
-      },
-      meetings: {
-        meetingCollection: {
-          get: sinon.stub(),
-        },
-      },
-      request: sinon.stub().resolves({}),
-      logger: {
-        log: sinon.stub(),
-        error: sinon.stub(),
-      }
-    });
+    webex = mockWebex();
 
     it('checks the log', () => {
       webex.internal.newMetrics.submitClientEvent({
@@ -38,26 +40,22 @@ describe('internal-plugin-metrics', () => {
       );
     });
   });
+
+  describe('new-metrics contstructor', () => {
+    it('checks callDiagnosticLatencies is defined before ready emit', () => {
+
+      const webex = mockWebex();
+
+      assert.instanceOf(webex.internal.newMetrics.callDiagnosticLatencies, CallDiagnosticLatencies);
+    });
+  });
+
   describe('new-metrics', () => {
     let webex;
 
     beforeEach(() => {
       //@ts-ignore
-      webex = new MockWebex({
-        children: {
-          newMetrics: NewMetrics,
-        },
-        meetings: {
-          meetingCollection: {
-            get: sinon.stub(),
-          },
-        },
-        request: sinon.stub().resolves({}),
-        logger: {
-          log: sinon.stub(),
-          error: sinon.stub(),
-        }
-      });
+      webex = mockWebex();
 
       webex.emit('ready');
 

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

@@ -74,6 +74,8 @@ describe('internal-plugin-metrics', () => {
                     joinTimes: {
                       meetingInfoReqResp: undefined,
                       clickToInterstitial: undefined,
+                      refreshCaptchaServiceReqResp: undefined,
+                      downloadIntelligenceModelsReqResp: undefined,
                     },
                     name: 'client.interstitial-window.launched',
                   },
@@ -138,7 +140,7 @@ describe('internal-plugin-metrics', () => {
         assert.calledOnceWithExactly(
           webex.logger.error,
           'Pre Login Metrics -->',
-          `PreLoginMetricsBatcher: @submitHttpRequest#prelogin-ca-batch-${expectedBatchId}. Request failed:`,
+          `PreLoginMetricsBatcher: @submitHttpRequest#prelogin-batch-${expectedBatchId}. Request failed:`,
           `error: formattedError`
         );
         assert.lengthOf(
@@ -148,7 +150,8 @@ describe('internal-plugin-metrics', () => {
       });
 
       it('fails if preLoinId is not set', async () => {
-        webex.internal.newMetrics.callDiagnosticMetrics.preLoginMetricsBatcher.preLoginId = undefined;
+        webex.internal.newMetrics.callDiagnosticMetrics.preLoginMetricsBatcher.preLoginId =
+          undefined;
 
         const promise =
           webex.internal.newMetrics.callDiagnosticMetrics.submitToCallDiagnosticsPreLogin(
@@ -176,7 +179,7 @@ describe('internal-plugin-metrics', () => {
 
     describe('prepareItem', () => {
       it('calls prepareDiagnosticMetricItem correctly', async () => {
-         // avoid setting .sent timestamp
+        // avoid setting .sent timestamp
         webex.internal.newMetrics.callDiagnosticMetrics.preLoginMetricsBatcher.prepareRequest = (q) =>
           Promise.resolve(q);