Simplifies logic around userID and callstatsUsername in callstats.

JitsiConference.js

@@ -26,6 +26,7 @@ import E2ePing from './modules/e2eping/e2eping';
 import Jvb121EventGenerator from './modules/event/Jvb121EventGenerator';
 import RecordingManager from './modules/recording/RecordingManager';
 import RttMonitor from './modules/rttmonitor/rttmonitor';
+import Settings from './modules/settings/Settings';
 import AvgRTPStatsReporter from './modules/statistics/AvgRTPStatsReporter';
 import AudioOutputProblemDetector from './modules/statistics/AudioOutputProblemDetector';
 import SpeakerStatsCollector from './modules/statistics/SpeakerStatsCollector';
@@ -284,6 +285,11 @@ JitsiConference.prototype._init = function(options = {}) {
     }
 
     const { config } = this.options;
+    const statsCurrentId = Settings.callStatsUserName;
+
+    if (config.enableStatsID) {
+        config.statsId = statsCurrentId;
+    }
 
     this.room = this.xmpp.createRoom(
         this.options.name,
@@ -344,21 +350,31 @@ JitsiConference.prototype._init = function(options = {}) {
     this.participantConnectionStatus.init();
 
     if (!this.statistics) {
-        let callStatsAliasName = this.myUserId();
+        let aliasName = this.myUserId();
+        let userName = statsCurrentId;
 
         if (config.enableDisplayNameInStats && config.displayName) {
-            callStatsAliasName = config.displayName;
+            aliasName = config.displayName;
+        }
+
+        if (config.enableStatsID) {
+            // let's swap the values, as instead of components to report
+            // the xmpp resource as id will use the supplied statsId
+            const newAlias = userName;
+
+            userName = aliasName;
+            aliasName = newAlias;
         }
 
         this.statistics = new Statistics(this.xmpp, {
-            callStatsAliasName,
+            aliasName,
+            userName,
             callStatsConfIDNamespace: this.connection.options.hosts.domain,
             confID: config.confID || `${this.connection.options.hosts.domain}/${this.options.name}`,
             customScriptUrl: config.callStatsCustomScriptUrl,
             callStatsID: config.callStatsID,
             callStatsSecret: config.callStatsSecret,
             roomName: this.options.name,
-            swapUserNameAndAlias: config.enableStatsID,
             applicationName: config.applicationName,
             getWiFiStatsMethod: config.getWiFiStatsMethod
         });

modules/statistics/AnalyticsAdapter.js

@@ -6,7 +6,6 @@ import {
 } from '../../service/statistics/AnalyticsEvents';
 import { getLogger } from 'jitsi-meet-logger';
 import browser from '../browser';
-import Settings from '../settings/Settings';
 
 const MAX_CACHE_SIZE = 100;
 
@@ -55,11 +54,18 @@ const logger = getLogger(__filename);
  * action, actionSubject, source, containerType, containerId, objectType,
  * objectId
  */
-class AnalyticsAdapter {
+export default class AnalyticsAdapter {
+    /**
+     * The options to configure Statistics.
+     * @typedef {Object} AnalyticsOptions
+     * @property {string} statsId - The id that will be used to be passed with all analytics for current session.
+     */
     /**
      * Creates new AnalyticsAdapter instance.
+     * @param {AnalyticsOptions} options - The options to use creating the AnalyticsAdapter.
      */
-    constructor() {
+    constructor(options) {
+        this.options = options;
         this.reset();
     }
 
@@ -104,7 +110,7 @@ class AnalyticsAdapter {
         this.conferenceName = '';
 
         this.addPermanentProperties({
-            'callstats_name': Settings.callStatsUserName,
+            'callstats_name': this.options.statsId,
             'user_agent': navigator.userAgent,
             'browser_name': browser.getName()
         });
@@ -351,5 +357,3 @@ class AnalyticsAdapter {
         }
     }
 }
-
-export default new AnalyticsAdapter();

modules/statistics/statistics.js

@@ -1,13 +1,12 @@
 import EventEmitter from 'events';
 
 import { FEEDBACK } from '../../service/statistics/AnalyticsEvents';
-import analytics from './AnalyticsAdapter';
+import Analytics from './AnalyticsAdapter';
 import CallStats from './CallStats';
 import LocalStats from './LocalStatsCollector';
 import RTPStats from './RTPStatsCollector';
 
 import browser from '../browser';
-import Settings from '../settings/Settings';
 import ScriptUtil from '../util/ScriptUtil';
 import JitsiTrackError from '../../JitsiTrackError';
 import * as StatisticsEvents from '../../service/statistics/Events';
@@ -63,15 +62,11 @@ function _initCallStatsBackend(options) {
         return;
     }
 
-    const userName = Settings.callStatsUserName;
-
     if (!CallStats.initBackend({
         callStatsID: options.callStatsID,
         callStatsSecret: options.callStatsSecret,
-        userName: options.swapUserNameAndAlias
-            ? options.callStatsAliasName : userName,
-        aliasName: options.swapUserNameAndAlias
-            ? userName : options.callStatsAliasName,
+        userName: options.userName,
+        aliasName: options.aliasName,
         applicationName: options.applicationName,
         getWiFiStatsMethod: options.getWiFiStatsMethod,
         confID: options.confID
@@ -128,8 +123,8 @@ Statistics.init = function(options) {
  * @typedef {Object} StatisticsOptions
  * @property {string} applicationName - The application name to pass to
  * callstats.
- * @property {string} callStatsAliasName - The alias name to use when
- * initializing callstats.
+ * @property {string} aliasName - The alias name to use when initializing callstats.
+ * @property {string} userName - The user name to use when initializing callstats.
  * @property {string} callStatsConfIDNamespace - A namespace to prepend the
  * callstats conference ID with.
  * @property {string} confID - The callstats conference ID to use.
@@ -138,8 +133,6 @@ Statistics.init = function(options) {
  * @property {string} customScriptUrl - A custom lib url to use when downloading
  * callstats library.
  * @property {string} roomName - The room name we are currently in.
- * @property {boolean} swapUserNameAndAlias - Whether to swap the places of
- * username and alias when initiating callstats.
  */
 /**
  *
@@ -158,6 +151,10 @@ export default function Statistics(xmpp, options) {
     this.xmpp = xmpp;
     this.options = options || {};
 
+    Statistics.analytics = new Analytics({
+        statsId: this.options.aliasName
+    });
+
     this.callStatsIntegrationEnabled
         = this.options.callStatsID && this.options.callStatsSecret
 
@@ -194,7 +191,6 @@ export default function Statistics(xmpp, options) {
 Statistics.audioLevelsEnabled = false;
 Statistics.audioLevelsInterval = 200;
 Statistics.disableThirdPartyRequests = false;
-Statistics.analytics = analytics;
 
 Object.defineProperty(Statistics, 'instances', {
     /**

modules/xmpp/ChatRoom.js

@@ -6,7 +6,6 @@ import { $iq, $msg, $pres, Strophe } from 'strophe.js';
 import GlobalOnErrorHandler from '../util/GlobalOnErrorHandler';
 import * as JitsiTranscriptionStatus from '../../JitsiTranscriptionStatus';
 import Listenable from '../util/Listenable';
-import Settings from '../settings/Settings';
 import * as MediaType from '../../service/RTC/MediaType';
 import XMPPEvents from '../../service/xmpp/XMPPEvents';
 
@@ -140,10 +139,10 @@ export default class ChatRoom extends Listenable {
         this.presMap.xns = 'http://jabber.org/protocol/muc';
         this.presMap.nodes = [];
 
-        if (options.enableStatsID) {
+        if (options.statsId) {
             this.presMap.nodes.push({
                 'tagName': 'stats-id',
-                'value': Settings.callStatsUserName
+                'value': options.statsId
             });
         }