@atlaskit/collab-provider 7.4.1 → 7.4.4

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/collab-provider
 
+## 7.4.4
+
+### Patch Changes
+
+- Updated dependencies
+
+## 7.4.3
+
+### Patch Changes
+
+- [`ec2f2d0b804`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ec2f2d0b804) - ED-14734: Add analytics to track time to connect to collab service, as well as tracking document initial load time.
+
+## 7.4.2
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 7.4.1
 
 ### Patch Changes

package/dist/cjs/analytics/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.triggerAnalyticsForStepsRejected = exports.triggerAnalyticsForStepsAddedSuccessfully = exports.triggerAnalyticsForCatchupSuccessfulWithLatency = exports.triggerAnalyticsForCatchupFailed = exports.fireAnalyticsEvent = exports.buildAnalyticsPayload = void 0;
+exports.triggerCollabAnalyticsEvent = exports.fireAnalyticsEvent = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -15,22 +15,8 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-var buildAnalyticsPayload = function buildAnalyticsPayload(subject, payload) {
-  return {
-    action: 'collab',
-    actionSubject: subject,
-    source: 'unknown',
-    attributes: {
-      packageName: _const.ATTRIBUTES_PACKAGE,
-      payload: payload
-    }
-  };
-};
-
-exports.buildAnalyticsPayload = buildAnalyticsPayload;
-
-var fireAnalyticsEvent = function fireAnalyticsEvent(analyticsClient, analyticsEvent) {
-  if (!analyticsClient || !analyticsEvent) {
+var fireAnalyticsEvent = function fireAnalyticsEvent(analyticsClient, payload) {
+  if (!analyticsClient || !payload) {
     return;
   }
 
@@ -42,38 +28,25 @@ var fireAnalyticsEvent = function fireAnalyticsEvent(analyticsClient, analyticsE
   runItLater(function () {
     client.sendOperationalEvent(_objectSpread(_objectSpread({
       action: 'collab'
-    }, analyticsEvent), {}, {
-      source: analyticsEvent.source || 'unknown'
+    }, payload), {}, {
+      source: payload.source || 'unknown',
+      tags: ['editor']
     }));
   });
 };
 
 exports.fireAnalyticsEvent = fireAnalyticsEvent;
 
-var triggerAnalyticsForStepsAddedSuccessfully = function triggerAnalyticsForStepsAddedSuccessfully(analyticsClient) {
-  var stepAddedEvent = buildAnalyticsPayload(_const.STEPS_ADDED);
-  fireAnalyticsEvent(analyticsClient, stepAddedEvent);
-};
-
-exports.triggerAnalyticsForStepsAddedSuccessfully = triggerAnalyticsForStepsAddedSuccessfully;
-
-var triggerAnalyticsForStepsRejected = function triggerAnalyticsForStepsRejected(analyticsClient, error) {
-  var stepRejectedEvent = buildAnalyticsPayload(_const.STEPS_REJECTED, error);
-  fireAnalyticsEvent(analyticsClient, stepRejectedEvent);
-};
-
-exports.triggerAnalyticsForStepsRejected = triggerAnalyticsForStepsRejected;
-
-var triggerAnalyticsForCatchupFailed = function triggerAnalyticsForCatchupFailed(analyticsClient, error) {
-  var catchupFailedEvent = buildAnalyticsPayload(_const.CATCHUP_FAILURE, error);
-  fireAnalyticsEvent(analyticsClient, catchupFailedEvent);
-};
-
-exports.triggerAnalyticsForCatchupFailed = triggerAnalyticsForCatchupFailed;
-
-var triggerAnalyticsForCatchupSuccessfulWithLatency = function triggerAnalyticsForCatchupSuccessfulWithLatency(analyticsClient, latency) {
-  var callCatchupLatency = buildAnalyticsPayload(_const.CATCHUP_SUCCESS, latency);
-  fireAnalyticsEvent(analyticsClient, callCatchupLatency);
+var triggerCollabAnalyticsEvent = function triggerCollabAnalyticsEvent(analyticsEvent, analyticsClient) {
+  var payload = {
+    action: analyticsEvent.eventAction,
+    actionSubject: _const.EVENT_SUBJECT,
+    source: 'unknown',
+    attributes: _objectSpread({
+      packageName: _const.ATTRIBUTES_PACKAGE
+    }, analyticsEvent.attributes)
+  };
+  fireAnalyticsEvent(analyticsClient, payload);
 };
 
-exports.triggerAnalyticsForCatchupSuccessfulWithLatency = triggerAnalyticsForCatchupSuccessfulWithLatency;
+exports.triggerCollabAnalyticsEvent = triggerCollabAnalyticsEvent;

package/dist/cjs/analytics/performance.js

@@ -40,19 +40,29 @@ function stopMeasure(measureName, onMeasureComplete) {
 
   try {
     performance.measure(measureName, "".concat(measureName, "::start"), "".concat(measureName, "::end"));
-  } catch (error) {} finally {
-    if (onMeasureComplete) {
-      var entry = performance.getEntriesByName(measureName).pop();
-
-      if (entry) {
-        onMeasureComplete(entry.duration, entry.startTime);
-      } else if (start) {
-        onMeasureComplete(performance.now() - start, start);
-      }
-    }
-
-    clearMeasure(measureName);
+  } catch (e) {}
+
+  var entry = performance.getEntriesByName(measureName).pop();
+  clearMeasure(measureName);
+  var measure;
+
+  if (entry) {
+    measure = {
+      duration: entry.duration,
+      startTime: entry.startTime
+    };
+  } else if (start) {
+    measure = {
+      duration: performance.now() - start,
+      startTime: start
+    };
   }
+
+  if (measure && onMeasureComplete) {
+    onMeasureComplete(measure.duration, measure.startTime);
+  }
+
+  return measure;
 }
 
 function clearMeasure(measureName) {

package/dist/cjs/channel.js

@@ -37,6 +37,8 @@ var _performance = require("./analytics/performance");
 
 var _analytics = require("./analytics");
 
+var _const = require("./helpers/const");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -72,6 +74,14 @@ var Channel = /*#__PURE__*/function (_Emitter) {
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onConnect", function () {
       _this.connected = true;
       logger('Connected.', _this.socket.id);
+      var measure = (0, _performance.stopMeasure)('socketConnect');
+      (0, _analytics.triggerCollabAnalyticsEvent)({
+        eventAction: _const.EVENT_ACTION.CONNECTION,
+        attributes: {
+          eventStatus: _const.EVENT_STATUS.SUCCESS,
+          latency: measure === null || measure === void 0 ? void 0 : measure.duration
+        }
+      }, _this.analyticsClient);
 
       _this.emit('connected', {
         sid: _this.socket.id,
@@ -84,6 +94,15 @@ var Channel = /*#__PURE__*/function (_Emitter) {
 
       if (data.type === 'initial') {
         if (!_this.initialized) {
+          var measure = (0, _performance.stopMeasure)('documentInit');
+          (0, _analytics.triggerCollabAnalyticsEvent)({
+            eventAction: _const.EVENT_ACTION.DOCUMENT_INIT,
+            attributes: {
+              eventStatus: _const.EVENT_STATUS.SUCCESS,
+              // TODO: detect when document init fails and fire corresponding event for it
+              latency: measure === null || measure === void 0 ? void 0 : measure.duration
+            }
+          }, _this.analyticsClient);
           var doc = data.doc,
               version = data.version,
               userId = data.userId,
@@ -120,6 +139,12 @@ var Channel = /*#__PURE__*/function (_Emitter) {
     function connect() {
       var _this2 = this;
 
+      (0, _performance.startMeasure)('socketConnect');
+
+      if (!this.initialized) {
+        (0, _performance.startMeasure)('documentInit');
+      }
+
       var _this$config = this.config,
           documentAri = _this$config.documentAri,
           url = _this$config.url;
@@ -228,10 +253,19 @@ var Channel = /*#__PURE__*/function (_Emitter) {
       // Ensure the error emit to the provider has the same structure, so we can handle them unified.
 
       this.socket.on('connect_error', function (error) {
-        // If error received with `data`, it means the connection is rejected
+        var measure = (0, _performance.stopMeasure)('socketConnect');
+        (0, _analytics.triggerCollabAnalyticsEvent)({
+          eventAction: _const.EVENT_ACTION.CONNECTION,
+          attributes: {
+            eventStatus: _const.EVENT_STATUS.FAILURE,
+            error: error,
+            latency: measure === null || measure === void 0 ? void 0 : measure.duration
+          }
+        }, _this2.analyticsClient); // If error received with `data`, it means the connection is rejected
         // by the server on purpose for example no permission, so no need to
         // keep the underneath connection, need to close. But some error like
         // `xhr polling error` needs to retry.
+
         if (!!error.data) {
           var _this2$socket;
 
@@ -248,8 +282,6 @@ var Channel = /*#__PURE__*/function (_Emitter) {
     key: "fetchCatchup",
     value: function () {
       var _fetchCatchup = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(fromVersion) {
-        var _this3 = this;
-
         var _yield$utils$requestS, doc, version, stepMaps, metadata, errorCatchup;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -257,7 +289,6 @@ var Channel = /*#__PURE__*/function (_Emitter) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 _context2.prev = 0;
-                (0, _performance.startMeasure)('callingCatchupApi');
                 _context2.t0 = _utilServiceSupport.utils;
                 _context2.t1 = this.config;
                 _context2.t2 = _objectSpread;
@@ -269,14 +300,14 @@ var Channel = /*#__PURE__*/function (_Emitter) {
                 };
 
                 if (!this.config.permissionTokenRefresh) {
-                  _context2.next = 15;
+                  _context2.next = 14;
                   break;
                 }
 
-                _context2.next = 9;
+                _context2.next = 8;
                 return this.config.permissionTokenRefresh();
 
-              case 9:
+              case 8:
                 _context2.t5 = _context2.sent;
                 _context2.t6 = {
                   'x-token': _context2.t5
@@ -287,19 +318,19 @@ var Channel = /*#__PURE__*/function (_Emitter) {
                 _context2.t4 = {
                   requestInit: _context2.t7
                 };
-                _context2.next = 16;
+                _context2.next = 15;
                 break;
 
-              case 15:
+              case 14:
                 _context2.t4 = {};
 
-              case 16:
+              case 15:
                 _context2.t8 = _context2.t4;
                 _context2.t9 = (0, _context2.t2)(_context2.t3, _context2.t8);
-                _context2.next = 20;
+                _context2.next = 19;
                 return _context2.t0.requestService.call(_context2.t0, _context2.t1, _context2.t9);
 
-              case 20:
+              case 19:
                 _yield$utils$requestS = _context2.sent;
                 doc = _yield$utils$requestS.doc;
                 version = _yield$utils$requestS.version;
@@ -312,8 +343,8 @@ var Channel = /*#__PURE__*/function (_Emitter) {
                   metadata: metadata
                 });
 
-              case 28:
-                _context2.prev = 28;
+              case 27:
+                _context2.prev = 27;
                 _context2.t10 = _context2["catch"](0);
                 logger("Can't fetch the catchup", _context2.t10.message);
                 errorCatchup = {
@@ -326,19 +357,12 @@ var Channel = /*#__PURE__*/function (_Emitter) {
                 this.emit('error', errorCatchup);
                 return _context2.abrupt("return", {});
 
-              case 34:
-                _context2.prev = 34;
-                (0, _performance.stopMeasure)('callingCatchupApi', function (duration, _) {
-                  (0, _analytics.triggerAnalyticsForCatchupSuccessfulWithLatency)(_this3.analyticsClient, duration);
-                });
-                return _context2.finish(34);
-
-              case 37:
+              case 33:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, this, [[0, 28, 34, 37]]);
+        }, _callee2, this, [[0, 27]]);
       }));
 
       function fetchCatchup(_x2) {

package/dist/cjs/helpers/const.js

@@ -3,16 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.STEPS_REJECTED = exports.STEPS_ADDED = exports.CATCHUP_SUCCESS = exports.CATCHUP_FAILURE = exports.ATTRIBUTES_PACKAGE = exports.ACK_MAX_TRY = void 0;
-var STEPS_ADDED = 'collabStepsAddedSuccess';
-exports.STEPS_ADDED = STEPS_ADDED;
-var STEPS_REJECTED = 'collabStepsAddedRejected';
-exports.STEPS_REJECTED = STEPS_REJECTED;
+exports.EVENT_SUBJECT = exports.EVENT_STATUS = exports.EVENT_ACTION = exports.ATTRIBUTES_PACKAGE = exports.ACK_MAX_TRY = void 0;
 var ATTRIBUTES_PACKAGE = 'collabProvider';
 exports.ATTRIBUTES_PACKAGE = ATTRIBUTES_PACKAGE;
-var CATCHUP_SUCCESS = 'collabCatchupSuccess';
-exports.CATCHUP_SUCCESS = CATCHUP_SUCCESS;
-var CATCHUP_FAILURE = 'collabCatchupFailure';
-exports.CATCHUP_FAILURE = CATCHUP_FAILURE;
+var EVENT_SUBJECT = 'collab';
+exports.EVENT_SUBJECT = EVENT_SUBJECT;
+var EVENT_ACTION;
+exports.EVENT_ACTION = EVENT_ACTION;
+
+(function (EVENT_ACTION) {
+  EVENT_ACTION["CONNECTION"] = "connection";
+  EVENT_ACTION["CATCHUP"] = "catchup";
+  EVENT_ACTION["DOCUMENT_INIT"] = "documentInit";
+  EVENT_ACTION["ADD_STEPS"] = "addSteps";
+})(EVENT_ACTION || (exports.EVENT_ACTION = EVENT_ACTION = {}));
+
+var EVENT_STATUS;
+exports.EVENT_STATUS = EVENT_STATUS;
+
+(function (EVENT_STATUS) {
+  EVENT_STATUS["SUCCESS"] = "SUCCESS";
+  EVENT_STATUS["FAILURE"] = "FAILURE";
+})(EVENT_STATUS || (exports.EVENT_STATUS = EVENT_STATUS = {}));
+
 var ACK_MAX_TRY = 10;
 exports.ACK_MAX_TRY = ACK_MAX_TRY;

package/dist/cjs/provider/index.js

@@ -11,10 +11,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -55,6 +55,8 @@ var _errorCodeMapper = require("../error-code-mapper");
 
 var _disconnectedReasonMapper = require("../disconnected-reason-mapper");
 
+var _performance = require("../analytics/performance");
+
 var _excluded = ["type"];
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -224,22 +226,26 @@ var Provider = /*#__PURE__*/function (_Emitter) {
       return (0, _prosemirrorCollab.sendableSteps)(_this.getState());
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "catchup", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var measure, _measure;
+
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              (0, _performance.startMeasure)('callingCatchupApi'); // if the queue is already paused, we are busy with something else, so don't proceed.
+
               if (!_this.pauseQueue) {
-                _context.next = 3;
+                _context.next = 4;
                 break;
               }
 
               logger("Queue is paused. Aborting.");
               return _context.abrupt("return");
 
-            case 3:
+            case 4:
               _this.pauseQueue = true;
-              _context.prev = 4;
-              _context.next = 7;
+              _context.prev = 5;
+              _context.next = 8;
               return (0, _catchup.catchup)({
                 getCurrentPmVersion: _this.getCurrentPmVersion,
                 fetchCatchup: _this.channel.fetchCatchup.bind(_this.channel),
@@ -249,18 +255,34 @@ var Provider = /*#__PURE__*/function (_Emitter) {
                 applyLocalsteps: _this.applyLocalsteps
               });
 
-            case 7:
-              _context.next = 13;
+            case 8:
+              measure = (0, _performance.stopMeasure)('callingCatchupApi');
+              (0, _analytics.triggerCollabAnalyticsEvent)({
+                eventAction: _const.EVENT_ACTION.CATCHUP,
+                attributes: {
+                  eventStatus: _const.EVENT_STATUS.SUCCESS,
+                  latency: measure === null || measure === void 0 ? void 0 : measure.duration
+                }
+              }, _this.analyticsClient);
+              _context.next = 17;
               break;
 
-            case 9:
-              _context.prev = 9;
-              _context.t0 = _context["catch"](4);
-              (0, _analytics.triggerAnalyticsForCatchupFailed)(_this.analyticsClient, _context.t0);
+            case 12:
+              _context.prev = 12;
+              _context.t0 = _context["catch"](5);
+              _measure = (0, _performance.stopMeasure)('callingCatchupApi');
+              (0, _analytics.triggerCollabAnalyticsEvent)({
+                eventAction: _const.EVENT_ACTION.CATCHUP,
+                attributes: {
+                  eventStatus: _const.EVENT_STATUS.FAILURE,
+                  error: _context.t0,
+                  latency: _measure === null || _measure === void 0 ? void 0 : _measure.duration
+                }
+              }, _this.analyticsClient);
               logger("Catch-Up Failed:", _context.t0.message);
 
-            case 13:
-              _context.prev = 13;
+            case 17:
+              _context.prev = 17;
               _this.pauseQueue = false;
 
               _this.processQueue();
@@ -268,19 +290,25 @@ var Provider = /*#__PURE__*/function (_Emitter) {
               _this.sendStepsFromCurrentState();
 
               _this.stepRejectCounter = 0;
-              return _context.finish(13);
+              return _context.finish(17);
 
-            case 19:
+            case 23:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[4, 9, 13, 19]]);
+      }, _callee, null, [[5, 12, 17, 23]]);
     })));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onErrorHandled", function (error) {
       if (error && error.data) {
         if (error.data.code === 'HEAD_VERSION_UPDATE_FAILED' || error.data.code === 'VERSION_NUMBER_ALREADY_EXISTS') {
-          (0, _analytics.triggerAnalyticsForStepsRejected)(_this.analyticsClient, error);
+          (0, _analytics.triggerCollabAnalyticsEvent)({
+            eventAction: _const.EVENT_ACTION.ADD_STEPS,
+            attributes: {
+              eventStatus: _const.EVENT_STATUS.FAILURE,
+              error: error
+            }
+          }, _this.analyticsClient);
           _this.stepRejectCounter++;
         }
 
@@ -784,7 +812,12 @@ var Provider = /*#__PURE__*/function (_Emitter) {
         }); // If steps can apply to local editor sucessfully, no need to accumulate the error counter.
 
         this.stepRejectCounter = 0;
-        (0, _analytics.triggerAnalyticsForStepsAddedSuccessfully)(this.analyticsClient);
+        (0, _analytics.triggerCollabAnalyticsEvent)({
+          eventAction: _const.EVENT_ACTION.ADD_STEPS,
+          attributes: {
+            eventStatus: _const.EVENT_STATUS.SUCCESS
+          }
+        }, this.analyticsClient);
         this.emitTelepointersFromSteps(steps); // Resend local steps if none of the received steps originated with us!
 
         if (clientIds.indexOf(this.clientId) === -1) {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "7.4.1",
+	"version": "7.4.4",
 	"sideEffects": false
 }

package/dist/es2019/analytics/index.js

@@ -1,17 +1,6 @@
-import { ATTRIBUTES_PACKAGE, CATCHUP_FAILURE, CATCHUP_SUCCESS, STEPS_ADDED, STEPS_REJECTED } from '../helpers/const';
-export const buildAnalyticsPayload = (subject, payload) => {
-  return {
-    action: 'collab',
-    actionSubject: subject,
-    source: 'unknown',
-    attributes: {
-      packageName: ATTRIBUTES_PACKAGE,
-      payload
-    }
-  };
-};
-export const fireAnalyticsEvent = (analyticsClient, analyticsEvent) => {
-  if (!analyticsClient || !analyticsEvent) {
+import { ATTRIBUTES_PACKAGE, EVENT_SUBJECT } from '../helpers/const';
+export const fireAnalyticsEvent = (analyticsClient, payload) => {
+  if (!analyticsClient || !payload) {
     return;
   }
 
@@ -23,24 +12,21 @@ export const fireAnalyticsEvent = (analyticsClient, analyticsEvent) => {
   runItLater(() => {
     client.sendOperationalEvent({
       action: 'collab',
-      ...analyticsEvent,
-      source: analyticsEvent.source || 'unknown'
+      ...payload,
+      source: payload.source || 'unknown',
+      tags: ['editor']
     });
   });
 };
-export const triggerAnalyticsForStepsAddedSuccessfully = analyticsClient => {
-  const stepAddedEvent = buildAnalyticsPayload(STEPS_ADDED);
-  fireAnalyticsEvent(analyticsClient, stepAddedEvent);
-};
-export const triggerAnalyticsForStepsRejected = (analyticsClient, error) => {
-  const stepRejectedEvent = buildAnalyticsPayload(STEPS_REJECTED, error);
-  fireAnalyticsEvent(analyticsClient, stepRejectedEvent);
-};
-export const triggerAnalyticsForCatchupFailed = (analyticsClient, error) => {
-  const catchupFailedEvent = buildAnalyticsPayload(CATCHUP_FAILURE, error);
-  fireAnalyticsEvent(analyticsClient, catchupFailedEvent);
-};
-export const triggerAnalyticsForCatchupSuccessfulWithLatency = (analyticsClient, latency) => {
-  const callCatchupLatency = buildAnalyticsPayload(CATCHUP_SUCCESS, latency);
-  fireAnalyticsEvent(analyticsClient, callCatchupLatency);
+export const triggerCollabAnalyticsEvent = (analyticsEvent, analyticsClient) => {
+  const payload = {
+    action: analyticsEvent.eventAction,
+    actionSubject: EVENT_SUBJECT,
+    source: 'unknown',
+    attributes: {
+      packageName: ATTRIBUTES_PACKAGE,
+      ...analyticsEvent.attributes
+    }
+  };
+  fireAnalyticsEvent(analyticsClient, payload);
 };

package/dist/es2019/analytics/performance.js

@@ -27,19 +27,29 @@ export function stopMeasure(measureName, onMeasureComplete) {
 
   try {
     performance.measure(measureName, `${measureName}::start`, `${measureName}::end`);
-  } catch (error) {} finally {
-    if (onMeasureComplete) {
-      const entry = performance.getEntriesByName(measureName).pop();
-
-      if (entry) {
-        onMeasureComplete(entry.duration, entry.startTime);
-      } else if (start) {
-        onMeasureComplete(performance.now() - start, start);
-      }
-    }
-
-    clearMeasure(measureName);
+  } catch (e) {}
+
+  const entry = performance.getEntriesByName(measureName).pop();
+  clearMeasure(measureName);
+  let measure;
+
+  if (entry) {
+    measure = {
+      duration: entry.duration,
+      startTime: entry.startTime
+    };
+  } else if (start) {
+    measure = {
+      duration: performance.now() - start,
+      startTime: start
+    };
   }
+
+  if (measure && onMeasureComplete) {
+    onMeasureComplete(measure.duration, measure.startTime);
+  }
+
+  return measure;
 }
 export function clearMeasure(measureName) {
   if (!hasPerformanceAPIAvailable) {