@atlaskit/react-ufo 2.4.7 → 2.5.0

package/dist/cjs/interaction-metrics/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -32,7 +31,6 @@ exports.addRequestInfo = addRequestInfo;
 exports.addSegment = addSegment;
 exports.addSpan = addSpan;
 exports.addSpanToAll = addSpanToAll;
-exports.experimentalInteractionLog = void 0;
 exports.extractModuleName = extractModuleName;
 exports.getActiveInteraction = getActiveInteraction;
 exports.getCurrentInteractionType = getCurrentInteractionType;
@@ -40,33 +38,36 @@ exports.postInteractionLog = exports.interactionSpans = void 0;
 exports.remove = remove;
 exports.removeHoldByID = removeHoldByID;
 exports.removeSegment = removeSegment;
-exports.sinkPostInteractionLogHandler = exports.sinkInteractionHandler = exports.sinkExperimentalHandler = void 0;
+exports.sinkPostInteractionLogHandler = exports.sinkInteractionHandler = void 0;
 exports.tryComplete = tryComplete;
 exports.updatePageLoadInteractionName = updatePageLoadInteractionName;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _uuid = require("uuid");
 var _coinflip = _interopRequireDefault(require("../coinflip"));
 var _config = require("../config");
-var _createExperimentalInteractionMetricsPayload = require("../create-experimental-interaction-metrics-payload");
-var _utils = require("../create-payload/common/utils");
 var _experienceTraceIdContext = require("../experience-trace-id-context");
 var _featureFlagsAccessed = require("../feature-flags-accessed");
 var _interactionIdContext = require("../interaction-id-context");
 var _vc = require("../vc");
-var _common = require("./common");
-var _constants = _interopRequireWildcard(require("./common/constants"));
+var _constants = _interopRequireDefault(require("./common/constants"));
 var _postInteractionLog = _interopRequireDefault(require("./post-interaction-log"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var PreviousInteractionLog = {
   name: undefined,
   isAborted: undefined
 };
 var postInteractionLog = exports.postInteractionLog = new _postInteractionLog.default();
-var experimentalInteractionLog = exports.experimentalInteractionLog = new _createExperimentalInteractionMetricsPayload.ExperimentalInteractionMetrics();
+var interactionQueue = [];
+var segmentCache = new Map();
+var CLEANUP_TIMEOUT = 60 * 1000;
+var CLEANUP_TIMEOUT_AFTER_APDEX = 15 * 1000;
+var segmentObservers = [];
 function getActiveInteraction() {
   var interactionId = (0, _interactionIdContext.getInteractionId)();
   if (!interactionId.current) {
@@ -74,6 +75,51 @@ function getActiveInteraction() {
   }
   return _constants.default.get(interactionId.current);
 }
+function isPerformanceTracingEnabled() {
+  var _getConfig;
+  return ((_getConfig = (0, _config.getConfig)()) === null || _getConfig === void 0 ? void 0 : _getConfig.enableAdditionalPerformanceMarks) || window.__REACT_UFO_ENABLE_PERF_TRACING || process.env.NODE_ENV !== 'production';
+}
+function labelStackToString(labelStack, name) {
+  var _stack$map;
+  var stack = (0, _toConsumableArray2.default)(labelStack !== null && labelStack !== void 0 ? labelStack : []);
+  if (name) {
+    stack.push({
+      name: name
+    });
+  }
+  return (_stack$map = stack.map(function (l) {
+    return l.name;
+  })) === null || _stack$map === void 0 ? void 0 : _stack$map.join('/');
+}
+function labelStackToIdString(labelStack) {
+  var _labelStack$map;
+  return labelStack === null || labelStack === void 0 || (_labelStack$map = labelStack.map(function (l) {
+    return 'segmentId' in l ? "".concat(l.name, ":").concat(l.segmentId) : "".concat(l.name);
+  })) === null || _labelStack$map === void 0 ? void 0 : _labelStack$map.join('/');
+}
+function addSegmentObserver(observer) {
+  segmentObservers.push(observer);
+  var _iterator = _createForOfIteratorHelper(segmentCache.values()),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var segmentInfo = _step.value;
+      observer.onAdd(segmentInfo);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+}
+function removeSegmentObserver(observer) {
+  var index = segmentObservers.findIndex(function (obs) {
+    return obs === observer;
+  });
+  if (index !== -1) {
+    segmentObservers.splice(index, 1);
+  }
+}
 function remove(interactionId) {
   _constants.default.delete(interactionId);
 }
@@ -112,7 +158,7 @@ function addCustomTiming(interactionId, labelStack, data) {
       labelStack: labelStack,
       data: data
     });
-    if ((0, _common.isPerformanceTracingEnabled)()) {
+    if (isPerformanceTracingEnabled()) {
       for (var _i = 0, _Object$entries = Object.entries(data); _i < _Object$entries.length; _i++) {
         var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
           key = _Object$entries$_i[0],
@@ -121,7 +167,7 @@ function addCustomTiming(interactionId, labelStack, data) {
           endTime = timingData.endTime;
         try {
           // for Firefox 102 and older
-          performance.measure("\uD83D\uDEF8 ".concat((0, _common.labelStackToString)(labelStack, key), " [custom_timing]"), {
+          performance.measure("\uD83D\uDEF8 ".concat(labelStackToString(labelStack, key), " [custom_timing]"), {
             start: startTime,
             end: endTime
           });
@@ -143,8 +189,8 @@ function addMark(interactionId, type, name, labelStack) {
       time: time
     });
   }
-  if ((0, _common.isPerformanceTracingEnabled)()) {
-    performance.mark("\uD83D\uDEF8 ".concat((0, _common.labelStackToString)(labelStack, name), " [").concat(type, "]"), {
+  if (isPerformanceTracingEnabled()) {
+    performance.mark("\uD83D\uDEF8 ".concat(labelStackToString(labelStack, name), " [").concat(type, "]"), {
       startTime: time
     });
   }
@@ -159,8 +205,8 @@ function addMarkToAll(type, name, labelStack) {
       time: time
     });
   });
-  if ((0, _common.isPerformanceTracingEnabled)()) {
-    performance.mark("\uD83D\uDEF8 ".concat((0, _common.labelStackToString)(labelStack, name), " [").concat(type, "]"), {
+  if (isPerformanceTracingEnabled()) {
+    performance.mark("\uD83D\uDEF8 ".concat(labelStackToString(labelStack, name), " [").concat(type, "]"), {
       startTime: time
     });
   }
@@ -178,10 +224,10 @@ function addSpan(interactionId, type, name, labelStack, start) {
       end: end,
       size: size
     });
-    if ((0, _common.isPerformanceTracingEnabled)()) {
+    if (isPerformanceTracingEnabled()) {
       try {
         // for Firefox 102 and older
-        performance.measure("\uD83D\uDEF8 ".concat((0, _common.labelStackToString)(labelStack, name), " [").concat(type, "]"), {
+        performance.measure("\uD83D\uDEF8 ".concat(labelStackToString(labelStack, name), " [").concat(type, "]"), {
           start: start,
           end: end
         });
@@ -204,10 +250,10 @@ function addSpanToAll(type, name, labelStack, start) {
       size: size
     });
   });
-  if ((0, _common.isPerformanceTracingEnabled)()) {
+  if (isPerformanceTracingEnabled()) {
     try {
       // for Firefox 102 and older
-      performance.measure("\uD83D\uDEF8 ".concat((0, _common.labelStackToString)(labelStack, name), " [").concat(type, "]"), {
+      performance.measure("\uD83D\uDEF8 ".concat(labelStackToString(labelStack, name), " [").concat(type, "]"), {
         start: start,
         end: end
       });
@@ -222,6 +268,7 @@ function addPreload(moduleId, timestamp) {
 function addLoad(identifier, start, end) {
   addSpanToAll('bundle_load', identifier, null, start, end - start);
 }
+var moduleLoadingRequests = {};
 function extractModuleName(input) {
   var result = input !== null && input !== void 0 ? input : '';
   result = result.replace(/^\.\/src\/packages\//, '');
@@ -229,34 +276,37 @@ function extractModuleName(input) {
   result = result.replace(/(\/src)?\/(index|main)\.(tsx|ts|js|jsx)$/, '');
   return result;
 }
-function addHold(interactionId, labelStack, name, experimental) {
+function addHoldCriterion(id, labelStack, name, startTime) {
+  var _window$__CRITERION__;
+  if (!((_window$__CRITERION__ = window.__CRITERION__) !== null && _window$__CRITERION__ !== void 0 && _window$__CRITERION__.addUFOHold)) {
+    return;
+  }
+  window.__CRITERION__.addUFOHold(id, labelStackToString(labelStack), name, startTime);
+}
+function removeHoldCriterion(id) {
+  var _window$__CRITERION__2;
+  if (!((_window$__CRITERION__2 = window.__CRITERION__) !== null && _window$__CRITERION__2 !== void 0 && _window$__CRITERION__2.removeUFOHold)) {
+    return;
+  }
+  window.__CRITERION__.removeUFOHold(id);
+}
+function addHold(interactionId, labelStack, name) {
   var interaction = _constants.default.get(interactionId);
   var id = (0, _uuid.v4)();
   if (interaction != null) {
-    var _getConfig;
-    var holdActive = {
+    var start = performance.now();
+    interaction.holdActive.set(id, {
       labelStack: labelStack,
       name: name,
-      start: 0
-    };
-    var start = performance.now();
-    if ((_getConfig = (0, _config.getConfig)()) !== null && _getConfig !== void 0 && (_getConfig = _getConfig.experimentalInteractionMetrics) !== null && _getConfig !== void 0 && _getConfig.enabled && experimental) {
-      interaction.holdExpActive.set(id, _objectSpread(_objectSpread({}, holdActive), {}, {
-        start: start
-      }));
-    }
-    if (!experimental) {
-      interaction.holdActive.set(id, _objectSpread(_objectSpread({}, holdActive), {}, {
-        start: start
-      }));
-    }
-    (0, _common.addHoldCriterion)(id, labelStack, name, start);
+      start: start
+    });
+    addHoldCriterion(id, labelStack, name, start);
     return function () {
       var end = performance.now();
-      if ((0, _common.isPerformanceTracingEnabled)()) {
+      if (isPerformanceTracingEnabled()) {
         try {
           // for Firefox 102 and older
-          performance.measure("\uD83D\uDEF8 ".concat((0, _common.labelStackToString)(labelStack, name), " [hold]"), {
+          performance.measure("\uD83D\uDEF8 ".concat(labelStackToString(labelStack, name), " [hold]"), {
             start: start,
             end: end
           });
@@ -264,23 +314,14 @@ function addHold(interactionId, labelStack, name, experimental) {
           // do nothing
         }
       }
-      (0, _common.removeHoldCriterion)(id);
+      removeHoldCriterion(id);
       var currentInteraction = _constants.default.get(interactionId);
       var currentHold = interaction.holdActive.get(id);
-      var expHold = interaction.holdExpActive.get(id);
-      if (currentInteraction != null) {
-        if (currentHold != null) {
-          currentInteraction.holdInfo.push(_objectSpread(_objectSpread({}, currentHold), {}, {
-            end: end
-          }));
-          interaction.holdActive.delete(id);
-        }
-        if (expHold != null) {
-          currentInteraction.holdExpInfo.push(_objectSpread(_objectSpread({}, expHold), {}, {
-            end: end
-          }));
-          interaction.holdExpActive.delete(id);
-        }
+      if (currentInteraction != null && currentHold != null) {
+        currentInteraction.holdInfo.push(_objectSpread(_objectSpread({}, currentHold), {}, {
+          end: end
+        }));
+        interaction.holdActive.delete(id);
       }
     };
   }
@@ -296,7 +337,7 @@ function addHoldByID(interactionId, labelStack, name, id, ignoreOnSubmit) {
       start: start,
       ignoreOnSubmit: ignoreOnSubmit
     });
-    (0, _common.addHoldCriterion)(id, labelStack, name, start);
+    addHoldCriterion(id, labelStack, name, start);
   }
   return function () {};
 }
@@ -311,7 +352,7 @@ function removeHoldByID(interactionId, id) {
         end: end
       }));
       interaction.holdActive.delete(id);
-      (0, _common.removeHoldCriterion)(id);
+      removeHoldCriterion(id);
     }
   }
 }
@@ -328,19 +369,19 @@ var ModuleLoadingProfiler = exports.ModuleLoadingProfiler = {
   },
   onLoadStart: function onLoadStart(info) {
     var timeoutId = setTimeout(function () {
-      delete _constants.moduleLoadingRequests[info.identifier];
+      delete moduleLoadingRequests[info.identifier];
     }, 30000);
     var request = {
       start: performance.now(),
       timeoutId: timeoutId
     };
-    _constants.moduleLoadingRequests[info.identifier] = request;
+    moduleLoadingRequests[info.identifier] = request;
   },
   onLoadComplete: function onLoadComplete(info) {
-    var request = _constants.moduleLoadingRequests[info.identifier];
+    var request = moduleLoadingRequests[info.identifier];
     if (request) {
       clearTimeout(request.timeoutId);
-      delete _constants.moduleLoadingRequests[info.identifier];
+      delete moduleLoadingRequests[info.identifier];
       addLoad(extractModuleName(info.identifier), request.start, performance.now());
     }
   },
@@ -383,10 +424,10 @@ function addErrorToAll(name, labelStack, errorType, errorMessage, errorStack) {
 }
 var addProfilerTimings = exports.addProfilerTimings = function addProfilerTimings(interactionId, labelStack, type, actualDuration, baseDuration, startTime, commitTime) {
   var _getConfig2;
-  if ((0, _common.isPerformanceTracingEnabled)()) {
+  if (isPerformanceTracingEnabled()) {
     try {
       // for Firefox 102 and older
-      performance.measure("\uD83D\uDEF8 ".concat((0, _common.labelStackToString)(labelStack), " [react-profiler] ").concat(type), {
+      performance.measure("\uD83D\uDEF8 ".concat(labelStackToString(labelStack), " [react-profiler] ").concat(type), {
         start: startTime,
         duration: actualDuration
       });
@@ -408,10 +449,22 @@ var addProfilerTimings = exports.addProfilerTimings = function addProfilerTiming
     postInteractionLog.addProfilerTimings(labelStack, type, actualDuration, baseDuration, startTime, commitTime);
   }
 };
-var handleInteraction = _common.pushToQueue;
+var pushToQueue = function pushToQueue(id, data) {
+  interactionQueue.push({
+    id: id,
+    data: data
+  });
+};
+var handleInteraction = pushToQueue;
+function callCleanUpCallbacks(interaction) {
+  interaction.cleanupCallbacks.reverse().forEach(function (cleanUpCallback) {
+    cleanUpCallback();
+  });
+}
 var finishInteraction = function finishInteraction(id, data) {
   var _getConfig3;
   var endTime = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : performance.now();
+  // eslint-disable-next-line no-param-reassign
   data.end = endTime;
   try {
     // for Firefox 102 and older
@@ -423,20 +476,58 @@ var finishInteraction = function finishInteraction(id, data) {
     // do nothing
   }
   if (data.featureFlags) {
+    // eslint-disable-next-line no-param-reassign
     data.featureFlags.during = Object.fromEntries(_featureFlagsAccessed.currentFeatureFlagsAccessed);
   }
   (0, _experienceTraceIdContext.clearActiveTrace)();
-  (0, _common.callCleanUpCallbacks)(data);
+  callCleanUpCallbacks(data);
   if ((_getConfig3 = (0, _config.getConfig)()) !== null && _getConfig3 !== void 0 && (_getConfig3 = _getConfig3.vc) !== null && _getConfig3 !== void 0 && _getConfig3.stopVCAtInteractionFinish) {
-    data.vc = (0, _vc.getVCObserver)().getVCRawData();
+    data.vc = (0, _vc.getVCObserver)().getVCRawData(data.end);
   }
+  remove(id);
   PreviousInteractionLog.name = data.ufoName || 'unknown';
   PreviousInteractionLog.isAborted = data.abortReason != null;
   if (data.ufoName) {
     handleInteraction(id, data);
   }
-  if ((0, _common.isPerformanceTracingEnabled)()) {
-    (0, _common.reactProfilerTimingMap)(data);
+  if (isPerformanceTracingEnabled()) {
+    var profilerTimingMap = new Map();
+    data.reactProfilerTimings.forEach(function (profilerTiming) {
+      var labelStackId = labelStackToIdString(profilerTiming.labelStack);
+      if (labelStackId) {
+        var _profilerTimingMap$ge, _timing$start, _timing$end;
+        var timing = (_profilerTimingMap$ge = profilerTimingMap.get(labelStackId)) !== null && _profilerTimingMap$ge !== void 0 ? _profilerTimingMap$ge : {
+          labelStack: profilerTiming.labelStack
+        };
+        timing.start = profilerTiming.startTime < ((_timing$start = timing.start) !== null && _timing$start !== void 0 ? _timing$start : Number.MAX_SAFE_INTEGER) ? profilerTiming.startTime : timing.start;
+        timing.end = profilerTiming.commitTime > ((_timing$end = timing.end) !== null && _timing$end !== void 0 ? _timing$end : Number.MIN_SAFE_INTEGER) ? profilerTiming.commitTime : timing.end;
+        profilerTimingMap.set(labelStackId, timing);
+      }
+    });
+    try {
+      // for Firefox 102 and older
+      var _iterator2 = _createForOfIteratorHelper(profilerTimingMap.entries()),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _step2$value = (0, _slicedToArray2.default)(_step2.value, 2),
+            _step2$value$ = _step2$value[1],
+            labelStack = _step2$value$.labelStack,
+            start = _step2$value$.start,
+            end = _step2$value$.end;
+          performance.measure("\uD83D\uDEF8 ".concat(labelStackToString(labelStack), " [segment_ttai]"), {
+            start: start,
+            end: end
+          });
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    } catch (e) {
+      // do nothing
+    }
   }
   try {
     // dispatch a global window event to notify the measure is completed
@@ -448,100 +539,65 @@ var finishInteraction = function finishInteraction(id, data) {
   }
 };
 var sinkInteractionHandler = exports.sinkInteractionHandler = function sinkInteractionHandler(sinkFn) {
-  if (handleInteraction === _common.pushToQueue) {
+  if (handleInteraction === pushToQueue) {
     handleInteraction = sinkFn;
-    _constants.interactionQueue.forEach(function (interaction) {
+    interactionQueue.forEach(function (interaction) {
       sinkFn(interaction.id, interaction.data);
     });
-    _constants.interactionQueue.length = 0;
+    interactionQueue.length = 0;
   }
 };
-var sinkExperimentalHandler = exports.sinkExperimentalHandler = function sinkExperimentalHandler(sinkFn) {
-  experimentalInteractionLog.sinkHandler(sinkFn);
-};
 var sinkPostInteractionLogHandler = exports.sinkPostInteractionLogHandler = function sinkPostInteractionLogHandler(sinkFn) {
   postInteractionLog.sinkHandler(sinkFn);
 };
-
-// a flag to prevent mutliple submittions
-var activeSubmitted = false;
 function tryComplete(interactionId, endTime) {
   var interaction = _constants.default.get(interactionId);
   if (interaction != null) {
-    var noMoreActiveHolds = interaction.holdActive.size === 0;
-    var noMoreExpHolds = interaction.holdExpActive.size === 0;
-    var postInteraction = function postInteraction() {
+    var noMoreHolds = interaction.holdActive.size === 0;
+    if (noMoreHolds) {
       var _getConfig4;
+      finishInteraction(interactionId, interaction, endTime);
       if ((_getConfig4 = (0, _config.getConfig)()) !== null && _getConfig4 !== void 0 && (_getConfig4 = _getConfig4.postInteractionLog) !== null && _getConfig4 !== void 0 && _getConfig4.enabled) {
-        var _getExperimentalVCMet;
-        var experimentalVC90 = (_getExperimentalVCMet = (0, _utils.getExperimentalVCMetrics)(interaction)) === null || _getExperimentalVCMet === void 0 ? void 0 : _getExperimentalVCMet['metric:experimental:vc90'];
-        var experimentalTTAI = (0, _utils.getTTAI)(interaction);
-        postInteractionLog.onInteractionComplete(_objectSpread(_objectSpread({}, interaction), {}, {
-          experimentalTTAI: experimentalTTAI,
-          experimentalVC90: experimentalVC90
-        }));
-      }
-      remove(interactionId);
-      activeSubmitted = false;
-    };
-    if (noMoreActiveHolds) {
-      if (!activeSubmitted) {
-        finishInteraction(interactionId, interaction, endTime);
-        activeSubmitted = true;
-      }
-      if (noMoreExpHolds) {
-        var _getConfig5;
-        if ((_getConfig5 = (0, _config.getConfig)()) !== null && _getConfig5 !== void 0 && (_getConfig5 = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5 !== void 0 && _getConfig5.enabled) {
-          experimentalInteractionLog.onInteractionComplete(interactionId, interaction, endTime);
-        }
-        postInteraction();
+        postInteractionLog.onInteractionComplete(interaction);
       }
     }
   }
 }
+function callCancelCallbacks(interaction) {
+  interaction.cancelCallbacks.reverse().forEach(function (cancelCallback) {
+    cancelCallback();
+  });
+}
 function abort(interactionId, abortReason) {
   var interaction = _constants.default.get(interactionId);
   if (interaction != null) {
-    var _getConfig6;
-    (0, _common.callCancelCallbacks)(interaction);
+    callCancelCallbacks(interaction);
     interaction.abortReason = abortReason;
     finishInteraction(interactionId, interaction);
-    if ((_getConfig6 = (0, _config.getConfig)()) !== null && _getConfig6 !== void 0 && (_getConfig6 = _getConfig6.experimentalInteractionMetrics) !== null && _getConfig6 !== void 0 && _getConfig6.enabled) {
-      experimentalInteractionLog.onInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   }
 }
 function abortByNewInteraction(interactionId, interactionName) {
   var interaction = _constants.default.get(interactionId);
   if (interaction != null) {
-    var _getConfig7;
-    (0, _common.callCancelCallbacks)(interaction);
+    callCancelCallbacks(interaction);
     interaction.abortReason = 'new_interaction';
     interaction.abortedByInteractionName = interactionName;
     finishInteraction(interactionId, interaction);
-    if ((_getConfig7 = (0, _config.getConfig)()) !== null && _getConfig7 !== void 0 && (_getConfig7 = _getConfig7.experimentalInteractionMetrics) !== null && _getConfig7 !== void 0 && _getConfig7.enabled) {
-      experimentalInteractionLog.onInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   }
 }
 function abortAll(abortReason, abortedByInteractionName) {
   _constants.default.forEach(function (interaction, interactionId) {
-    var _getConfig8;
     var noMoreHolds = interaction.holdActive.size === 0;
     if (!noMoreHolds) {
-      (0, _common.callCancelCallbacks)(interaction);
+      callCancelCallbacks(interaction);
+      // eslint-disable-next-line no-param-reassign
       interaction.abortReason = abortReason;
       if (abortedByInteractionName != null) {
+        // eslint-disable-next-line no-param-reassign
         interaction.abortedByInteractionName = abortedByInteractionName;
       }
     }
     finishInteraction(interactionId, interaction);
-    if ((_getConfig8 = (0, _config.getConfig)()) !== null && _getConfig8 !== void 0 && (_getConfig8 = _getConfig8.experimentalInteractionMetrics) !== null && _getConfig8 !== void 0 && _getConfig8.enabled) {
-      experimentalInteractionLog.onInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   });
 }
 function addOnCancelCallback(id, cancelCallback) {
@@ -549,16 +605,16 @@ function addOnCancelCallback(id, cancelCallback) {
   interaction === null || interaction === void 0 || interaction.cancelCallbacks.push(cancelCallback);
 }
 function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelStack, routeName) {
-  var _getConfig9;
+  var _getConfig5;
   var trace = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : null;
-  if ((_getConfig9 = (0, _config.getConfig)()) !== null && _getConfig9 !== void 0 && (_getConfig9 = _getConfig9.postInteractionLog) !== null && _getConfig9 !== void 0 && _getConfig9.enabled) {
+  if ((_getConfig5 = (0, _config.getConfig)()) !== null && _getConfig5 !== void 0 && (_getConfig5 = _getConfig5.postInteractionLog) !== null && _getConfig5 !== void 0 && _getConfig5.enabled) {
     postInteractionLog.reset();
   }
   var previousTime = startTime;
-  var timeoutTime = _constants.CLEANUP_TIMEOUT;
+  var timeoutTime = CLEANUP_TIMEOUT;
   var timerID = setTimeout(function () {
     abort(interactionId, 'timeout');
-  }, _constants.CLEANUP_TIMEOUT);
+  }, CLEANUP_TIMEOUT);
   function changeTimeout(newTime) {
     // we compare if the time left is lower than the new time to no
     // extend the timeout beyond the initial waiting time
@@ -591,11 +647,9 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
     requestInfo: [],
     reactProfilerTimings: [],
     holdInfo: [],
-    holdExpInfo: [],
     holdActive: new Map(),
-    holdExpActive: new Map(),
     // measure when we execute this code
-    // from this, we can measure the input delay -
+    // from this we can measure the input delay -
     // how long the browser took to hand execution back to JS)
     measureStart: performance.now(),
     rate: rate,
@@ -627,9 +681,9 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
     },
     onRemove: function onRemove() {}
   };
-  (0, _common.addSegmentObserver)(segmentObserver);
+  addSegmentObserver(segmentObserver);
   metrics.cleanupCallbacks.push(function () {
-    (0, _common.removeSegmentObserver)(segmentObserver);
+    removeSegmentObserver(segmentObserver);
   });
   metrics.cleanupCallbacks.push(function () {
     clearTimeout(metrics.timerID);
@@ -654,7 +708,7 @@ function addBrowserMetricEvent(event) {
     interaction.legacyMetrics = interaction.legacyMetrics || [];
     interaction.legacyMetrics.push(event);
     if ((interaction.type === 'page_load' || interaction.type === 'transition') && ((_event$config = event.config) === null || _event$config === void 0 ? void 0 : _event$config.type) === 'PAGE_LOAD') {
-      interaction.changeTimeout(_constants.CLEANUP_TIMEOUT_AFTER_APDEX);
+      interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
       removeHoldByID(interaction.id, interaction.ufoName);
     }
   }
@@ -673,7 +727,7 @@ function addApdexToAll(apdex) {
       // do nothing
     }
     if (interaction.type === 'page_load' || interaction.type === 'transition') {
-      interaction.changeTimeout(_constants.CLEANUP_TIMEOUT_AFTER_APDEX);
+      interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
       removeHoldByID(key, interaction.ufoName);
     }
   });
@@ -693,7 +747,7 @@ function addApdex(interactionId, apdexInfo) {
       // do nothing
     }
     if (interaction.type === 'page_load' || interaction.type === 'transition') {
-      interaction.changeTimeout(_constants.CLEANUP_TIMEOUT_AFTER_APDEX);
+      interaction.changeTimeout(CLEANUP_TIMEOUT_AFTER_APDEX);
       removeHoldByID(interactionId, interaction.ufoName);
     }
   }
@@ -706,25 +760,36 @@ function addRequestInfo(interactionId, labelStack, requestInfo) {
     }, requestInfo));
   }
 }
+function isSegmentLabel(obj) {
+  return obj && typeof obj.name === 'string' && typeof obj.segmentId === 'string';
+}
+function getSegmentCacheKey(labelStack) {
+  return labelStack.map(function (l) {
+    if (isSegmentLabel(l)) {
+      return "".concat(l.name, "_").concat(l.segmentId);
+    }
+    return l.name;
+  }).join('|');
+}
 function addSegment(labelStack) {
-  var key = (0, _common.getSegmentCacheKey)(labelStack);
-  var existingSegment = _constants.segmentCache.get(key);
+  var key = getSegmentCacheKey(labelStack);
+  var existingSegment = segmentCache.get(key);
   if (!existingSegment) {
     var segmentInfo = {
       labelStack: labelStack
     };
-    _constants.segmentCache.set(key, segmentInfo);
-    _constants.segmentObservers.forEach(function (observer) {
+    segmentCache.set(key, segmentInfo);
+    segmentObservers.forEach(function (observer) {
       observer.onAdd(segmentInfo);
     });
   }
 }
 function removeSegment(labelStack) {
-  var key = (0, _common.getSegmentCacheKey)(labelStack);
-  var segmentInfo = _constants.segmentCache.get(key);
+  var key = getSegmentCacheKey(labelStack);
+  var segmentInfo = segmentCache.get(key);
   if (segmentInfo) {
-    _constants.segmentCache.delete(JSON.stringify(labelStack));
-    _constants.segmentObservers.forEach(function (observer) {
+    segmentCache.delete(JSON.stringify(labelStack));
+    segmentObservers.forEach(function (observer) {
       observer.onRemove(segmentInfo);
     });
   }
@@ -738,7 +803,7 @@ function addRedirect(interactionId, fromUfoName, nextUfoName, nextRouteName, tim
       fromInteractionName: fromUfoName,
       time: time
     });
-    if ((0, _common.isPerformanceTracingEnabled)()) {
+    if (isPerformanceTracingEnabled()) {
       var prevRedirect = interaction.redirects.at(-2);
       try {
         var _prevRedirect$time;