@atlaskit/react-ufo 2.4.7 → 2.5.0

package/dist/esm/create-payload/index.js

@@ -18,12 +18,13 @@ import { getBm3Timings } from '../custom-timings';
 import { getGlobalErrorCount } from '../global-error-handler';
 import { getPageVisibilityState } from '../hidden-timing';
 import * as initialPageLoadExtraTiming from '../initial-page-load-extra-timing';
-import { interactionSpans as atlaskitInteractionSpans } from '../interaction-metrics';
+import { interactionSpans as atlaskitInteractionSpans, postInteractionLog } from '../interaction-metrics';
 import * as resourceTiming from '../resource-timing';
 import { roundEpsilon } from '../round-number';
 import * as ssr from '../ssr';
-import { buildSegmentTree, getExperimentalVCMetrics, getInteractionStatus, getPageVisibilityUpToTTAI, getSSRDoneTimeValue, getTTAI, getVCMetrics, labelStackStartWith, optimizeLabelStack, sanitizeUfoName, stringifyLabelStackFully } from './common/utils';
-export function getUfoNameOverride(interaction) {
+import { getVCObserver } from '../vc';
+import { buildSegmentTree, labelStackStartWith, optimizeLabelStack, sanitizeUfoName, stringifyLabelStackFully } from './common/utils';
+function getUfoNameOverride(interaction) {
   var ufoName = interaction.ufoName,
     apdex = interaction.apdex;
   try {
@@ -35,6 +36,7 @@ export function getUfoNameOverride(interaction) {
       }
     }
     return ufoName;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } catch (e) {
     return ufoName;
   }
@@ -69,6 +71,11 @@ var getPageVisibilityUpToTTI = function getPageVisibilityUpToTTI(interaction) {
   var bm3EndTimeOrInteractionEndTime = getBm3EndTimeOrFallbackValue(interaction);
   return getPageVisibilityState(start, bm3EndTimeOrInteractionEndTime);
 };
+var getPageVisibilityUpToTTAI = function getPageVisibilityUpToTTAI(interaction) {
+  var start = interaction.start,
+    end = interaction.end;
+  return getPageVisibilityState(start, end);
+};
 var getVisibilityStateFromPerformance = function getVisibilityStateFromPerformance(stop) {
   try {
     var results = performance.getEntriesByType('visibility-state');
@@ -124,6 +131,15 @@ var getMoreAccuratePageVisibilityUpToTTAI = function getMoreAccuratePageVisibili
   }
   return old;
 };
+var getInteractionStatus = function getInteractionStatus(interaction) {
+  var originalInteractionStatus = interaction.abortReason ? 'ABORTED' : 'SUCCEEDED';
+  var hasBm3TTI = interaction.apdex.length > 0;
+  var overrideStatus = hasBm3TTI ? 'SUCCEEDED' : originalInteractionStatus;
+  return {
+    originalInteractionStatus: originalInteractionStatus,
+    overrideStatus: overrideStatus
+  };
+};
 var getResourceTimings = function getResourceTimings(start, end) {
   var _resourceTiming$getRe;
   return (_resourceTiming$getRe = resourceTiming.getResourceTimings(start, end)) !== null && _resourceTiming$getRe !== void 0 ? _resourceTiming$getRe : undefined;
@@ -152,6 +168,42 @@ var getPaintMetrics = function getPaintMetrics(type) {
   });
   return metrics;
 };
+var getVCMetrics = function getVCMetrics(interaction) {
+  var _config$vc, _interaction$apdex;
+  var config = getConfig();
+  if (!(config !== null && config !== void 0 && (_config$vc = config.vc) !== null && _config$vc !== void 0 && _config$vc.enabled)) {
+    return {};
+  }
+  if (interaction.type !== 'page_load' && interaction.type !== 'transition') {
+    return {};
+  }
+  var ssr = interaction.type === 'page_load' && config !== null && config !== void 0 && config.ssr ? {
+    ssr: getSSRDoneTimeValue(config)
+  } : null;
+  postInteractionLog.setVCObserverSSRConfig(ssr);
+  var tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime;
+  var prefix = 'ufo';
+  var result = getVCObserver().getVCResult(_objectSpread({
+    start: interaction.start,
+    stop: interaction.end,
+    tti: tti,
+    prefix: prefix,
+    vc: interaction.vc
+  }, ssr));
+  postInteractionLog.setLastInteractionFinishVCResult(result);
+  var VC = result === null || result === void 0 ? void 0 : result['metrics:vc'];
+  if (!VC || !(result !== null && result !== void 0 && result["".concat(prefix, ":vc:clean")])) {
+    return result;
+  }
+  var interactionStatus = getInteractionStatus(interaction);
+  var pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
+  if (interactionStatus.originalInteractionStatus !== 'SUCCEEDED' || pageVisibilityUpToTTAI !== 'visible') {
+    return result;
+  }
+  return _objectSpread(_objectSpread({}, result), {}, {
+    'metric:vc90': VC['90']
+  });
+};
 var getNavigationMetrics = function getNavigationMetrics(type) {
   if (type !== 'page_load') {
     return {};
@@ -199,13 +251,13 @@ var getNavigationMetrics = function getNavigationMetrics(type) {
   };
 };
 var getPPSMetrics = function getPPSMetrics(interaction) {
-  var _interaction$apdex;
+  var _interaction$apdex2;
   var start = interaction.start,
     end = interaction.end;
   var config = getConfig();
   var interactionStatus = getInteractionStatus(interaction);
   var pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
-  var tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime;
+  var tti = (_interaction$apdex2 = interaction.apdex) === null || _interaction$apdex2 === void 0 || (_interaction$apdex2 = _interaction$apdex2[0]) === null || _interaction$apdex2 === void 0 ? void 0 : _interaction$apdex2.stopTime;
   var ttai = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && pageVisibilityUpToTTAI === 'visible' ? Math.round(end - start) : undefined;
   var PPSMetricsAtTTI = tti !== undefined ? getLighthouseMetrics({
     start: start,
@@ -296,13 +348,13 @@ function optimizeCustomData(interaction) {
       for (var _i = 0, _Object$entries = Object.entries(currentValue.custom || {}); _i < _Object$entries.length; _i++) {
         var _result$get$data2, _result$get2;
         var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-          key = _Object$entries$_i[0],
+          _key = _Object$entries$_i[0],
           value = _Object$entries$_i[1];
         var label = stringifyLabelStackFully([]);
         var labelValue = (_result$get$data2 = (_result$get2 = result.get(label)) === null || _result$get2 === void 0 ? void 0 : _result$get2.data) !== null && _result$get$data2 !== void 0 ? _result$get$data2 : {};
         result.set(label, {
           labelStack: optimizeLabelStack([]),
-          data: Object.assign(labelValue, _defineProperty({}, key, value))
+          data: Object.assign(labelValue, _defineProperty({}, _key, value))
         });
       }
       return result;
@@ -540,6 +592,10 @@ function getBm3TrackerTimings(interaction) {
     legacyMetrics: legacyMetrics
   };
 }
+function getSSRDoneTimeValue(config) {
+  var _config$ssr, _config$ssr2;
+  return config !== null && config !== void 0 && (_config$ssr = config.ssr) !== null && _config$ssr !== void 0 && _config$ssr.getSSRDoneTime ? config === null || config === void 0 || (_config$ssr2 = config.ssr) === null || _config$ssr2 === void 0 ? void 0 : _config$ssr2.getSSRDoneTime() : ssr.getSSRDoneTime();
+}
 function getPayloadSize(payload) {
   return Math.round(new TextEncoder().encode(JSON.stringify(payload)).length / 1024);
 }
@@ -582,15 +638,13 @@ function getStylesheetMetrics() {
     return {};
   }
 }
-var regularTTAI;
-var expTTAI;
 function getErrorCounts(interaction) {
   return {
     'ufo:errors:globalCount': getGlobalErrorCount(),
     'ufo:errors:count': interaction.errors.length
   };
 }
-export function createInteractionMetricsPayload(interaction, interactionId, experimental) {
+function createInteractionMetricsPayload(interaction, interactionId) {
   var _window$location, _config$additionalPay;
   var interactionPayloadStart = performance.now();
   var config = getConfig();
@@ -625,7 +679,7 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
   } : {};
   // Page Load
   var getPageLoadInteractionMetrics = function getPageLoadInteractionMetrics() {
-    var _config$ssr;
+    var _config$ssr3;
     if (!isPageLoad) {
       return {};
     }
@@ -636,12 +690,12 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
     } : {};
     return _objectSpread(_objectSpread({}, SSRDoneTime), {}, {
       isBM3ConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp,
-      isUFOConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp || !!(config !== null && config !== void 0 && (_config$ssr = config.ssr) !== null && _config$ssr !== void 0 && _config$ssr.getSSRDoneTime)
+      isUFOConfigSSRDoneAsFmp: interaction.metaData.__legacy__bm3ConfigSSRDoneAsFmp || !!(config !== null && config !== void 0 && (_config$ssr3 = config.ssr) !== null && _config$ssr3 !== void 0 && _config$ssr3.getSSRDoneTime)
     });
   };
   // Detailed payload. Page visibility = visible
   var getDetailedInteractionMetrics = function getDetailedInteractionMetrics() {
-    if (experimental || window.__UFO_COMPACT_PAYLOAD__ || !isDetailedPayload) {
+    if (window.__UFO_COMPACT_PAYLOAD__ || !isDetailedPayload) {
       return {};
     }
     var spans = [].concat(_toConsumableArray(interaction.spans), _toConsumableArray(atlaskitInteractionSpans));
@@ -656,7 +710,7 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
       }),
       holdActive: _toConsumableArray(interaction.holdActive.values()),
       redirects: optimizeRedirects(interaction.redirects, start),
-      holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start),
+      holdInfo: optimizeHoldInfo(interaction.holdInfo, start),
       spans: optimizeSpans(spans, start),
       requestInfo: optimizeRequestInfo(interaction.requestInfo, start),
       customTimings: optimizeCustomTimings(interaction.customTimings, start),
@@ -666,21 +720,16 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
   };
   // Page load & detailed payload
   var getPageLoadDetailedInteractionMetrics = function getPageLoadDetailedInteractionMetrics() {
-    var _config$ssr2;
+    var _config$ssr4;
     if (!isPageLoad || !isDetailedPayload) {
       return {};
     }
     var config = getConfig();
     return {
       initialPageLoadExtraTimings: objectToArray(initialPageLoadExtraTiming.getTimings()),
-      SSRTimings: config !== null && config !== void 0 && (_config$ssr2 = config.ssr) !== null && _config$ssr2 !== void 0 && _config$ssr2.getSSRTimings ? config.ssr.getSSRTimings() : objectToArray(ssr.getSSRTimings())
+      SSRTimings: config !== null && config !== void 0 && (_config$ssr4 = config.ssr) !== null && _config$ssr4 !== void 0 && _config$ssr4.getSSRTimings ? config.ssr.getSSRTimings() : objectToArray(ssr.getSSRTimings())
     };
   };
-  if (experimental) {
-    expTTAI = getTTAI(interaction);
-  } else {
-    regularTTAI = getTTAI(interaction);
-  }
   var newUFOName = sanitizeUfoName(ufoName);
   var payload = {
     actionSubject: 'experience',
@@ -689,7 +738,7 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
     source: 'measured',
     tags: ['observability'],
     attributes: {
-      properties: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+      properties: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
         // basic
         'event:hostname': ((_window$location = window.location) === null || _window$location === void 0 ? void 0 : _window$location.hostname) || 'unknown',
         'event:product': config.product,
@@ -701,10 +750,10 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
           payloadSource: 'platform'
         },
         'event:region': config.region || 'unknown',
-        'experience:key': experimental ? 'custom.experimental-interaction-metrics' : 'custom.interaction-metrics',
+        'experience:key': 'custom.interaction-metrics',
         'experience:name': newUFOName
-      }, getBrowserMetadata()), getSSRProperties(type)), getPPSMetrics(interaction)), getPaintMetrics(type)), getNavigationMetrics(type)), getVCMetrics(interaction)), experimental ? getExperimentalVCMetrics(interaction) : undefined), (_config$additionalPay = config.additionalPayloadData) === null || _config$additionalPay === void 0 ? void 0 : _config$additionalPay.call(config, interaction)), getTracingContextData(interaction)), getStylesheetMetrics()), getErrorCounts(interaction)), {}, {
-        interactionMetrics: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+      }, getBrowserMetadata()), getSSRProperties(type)), getPPSMetrics(interaction)), getPaintMetrics(type)), getNavigationMetrics(type)), getVCMetrics(interaction)), (_config$additionalPay = config.additionalPayloadData) === null || _config$additionalPay === void 0 ? void 0 : _config$additionalPay.call(config, interaction)), getTracingContextData(interaction)), getStylesheetMetrics()), getErrorCounts(interaction)), {}, {
+        interactionMetrics: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
           namePrefix: config.namePrefix || '',
           segmentPrefix: config.segmentPrefix || '',
           interactionId: interactionId,
@@ -735,18 +784,11 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
           marks: optimizeMarks(interaction.marks),
           customData: optimizeCustomData(interaction),
           reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start)
-        }, labelStack), getPageLoadInteractionMetrics()), getDetailedInteractionMetrics()), getPageLoadDetailedInteractionMetrics()), getBm3TrackerTimings(interaction)), {}, {
-          'metric:ttai': experimental ? regularTTAI || expTTAI : undefined,
-          'metric:experimental:ttai': experimental ? expTTAI : undefined
-        }),
+        }, labelStack), getPageLoadInteractionMetrics()), getDetailedInteractionMetrics()), getPageLoadDetailedInteractionMetrics()), getBm3TrackerTimings(interaction)),
         'ufo:payloadTime': roundEpsilon(performance.now() - interactionPayloadStart)
       })
     }
   };
-  if (experimental) {
-    regularTTAI = undefined;
-    expTTAI = undefined;
-  }
   payload.attributes.properties['event:sizeInKb'] = getPayloadSize(payload.attributes.properties);
   return payload;
 }

package/dist/esm/interaction-metrics/common/constants.js

@@ -1,8 +1,2 @@
 var interactions = new Map();
-export var CLEANUP_TIMEOUT = 60 * 1000;
-export var CLEANUP_TIMEOUT_AFTER_APDEX = 15 * 1000;
-export var interactionQueue = [];
-export var segmentCache = new Map();
-export var segmentObservers = [];
-export var moduleLoadingRequests = {};
 export default interactions;

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

@@ -1,25 +1,30 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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) { _defineProperty(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; }
 import { v4 as createUUID } from 'uuid';
 import coinflip from '../coinflip';
 import { getAwaitBM3TTIList, getCapabilityRate, getConfig } from '../config';
-import { ExperimentalInteractionMetrics } from '../create-experimental-interaction-metrics-payload';
-import { getExperimentalVCMetrics, getTTAI } from '../create-payload/common/utils';
 import { clearActiveTrace } from '../experience-trace-id-context';
 import { allFeatureFlagsAccessed, currentFeatureFlagsAccessed } from '../feature-flags-accessed';
 import { getInteractionId } from '../interaction-id-context';
 import { getVCObserver } from '../vc';
-import { addHoldCriterion, addSegmentObserver, callCancelCallbacks, callCleanUpCallbacks, getSegmentCacheKey, isPerformanceTracingEnabled, labelStackToString, pushToQueue, reactProfilerTimingMap, removeHoldCriterion, removeSegmentObserver } from './common';
-import interactions, { CLEANUP_TIMEOUT, CLEANUP_TIMEOUT_AFTER_APDEX, interactionQueue, moduleLoadingRequests, segmentCache, segmentObservers } from './common/constants';
+import interactions from './common/constants';
 import PostInteractionLog from './post-interaction-log';
 var PreviousInteractionLog = {
   name: undefined,
   isAborted: undefined
 };
 export var postInteractionLog = new PostInteractionLog();
-export var experimentalInteractionLog = new ExperimentalInteractionMetrics();
+var interactionQueue = [];
+var segmentCache = new Map();
+var CLEANUP_TIMEOUT = 60 * 1000;
+var CLEANUP_TIMEOUT_AFTER_APDEX = 15 * 1000;
+var segmentObservers = [];
 export function getActiveInteraction() {
   var interactionId = getInteractionId();
   if (!interactionId.current) {
@@ -27,6 +32,51 @@ export function getActiveInteraction() {
   }
   return interactions.get(interactionId.current);
 }
+function isPerformanceTracingEnabled() {
+  var _getConfig;
+  return ((_getConfig = 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 = _toConsumableArray(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);
+  }
+}
 export function remove(interactionId) {
   interactions.delete(interactionId);
 }
@@ -175,6 +225,7 @@ export function addPreload(moduleId, timestamp) {
 export function addLoad(identifier, start, end) {
   addSpanToAll('bundle_load', identifier, null, start, end - start);
 }
+var moduleLoadingRequests = {};
 export function extractModuleName(input) {
   var result = input !== null && input !== void 0 ? input : '';
   result = result.replace(/^\.\/src\/packages\//, '');
@@ -182,27 +233,30 @@ export function extractModuleName(input) {
   result = result.replace(/(\/src)?\/(index|main)\.(tsx|ts|js|jsx)$/, '');
   return result;
 }
-export 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);
+}
+export function addHold(interactionId, labelStack, name) {
   var interaction = interactions.get(interactionId);
   var id = createUUID();
   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 = 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
-      }));
-    }
+      start: start
+    });
     addHoldCriterion(id, labelStack, name, start);
     return function () {
       var end = performance.now();
@@ -220,20 +274,11 @@ export function addHold(interactionId, labelStack, name, experimental) {
       removeHoldCriterion(id);
       var currentInteraction = interactions.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);
       }
     };
   }
@@ -361,10 +406,22 @@ export var addProfilerTimings = function addProfilerTimings(interactionId, label
     postInteractionLog.addProfilerTimings(labelStack, type, actualDuration, baseDuration, startTime, commitTime);
   }
 };
+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
@@ -376,20 +433,58 @@ var finishInteraction = function finishInteraction(id, data) {
     // do nothing
   }
   if (data.featureFlags) {
+    // eslint-disable-next-line no-param-reassign
     data.featureFlags.during = Object.fromEntries(currentFeatureFlagsAccessed);
   }
   clearActiveTrace();
   callCleanUpCallbacks(data);
   if ((_getConfig3 = getConfig()) !== null && _getConfig3 !== void 0 && (_getConfig3 = _getConfig3.vc) !== null && _getConfig3 !== void 0 && _getConfig3.stopVCAtInteractionFinish) {
-    data.vc = getVCObserver().getVCRawData();
+    data.vc = getVCObserver().getVCRawData(data.end);
   }
+  remove(id);
   PreviousInteractionLog.name = data.ufoName || 'unknown';
   PreviousInteractionLog.isAborted = data.abortReason != null;
   if (data.ufoName) {
     handleInteraction(id, data);
   }
   if (isPerformanceTracingEnabled()) {
-    reactProfilerTimingMap(data);
+    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 = _slicedToArray(_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
@@ -409,92 +504,57 @@ export var sinkInteractionHandler = function sinkInteractionHandler(sinkFn) {
     interactionQueue.length = 0;
   }
 };
-export var sinkExperimentalHandler = function sinkExperimentalHandler(sinkFn) {
-  experimentalInteractionLog.sinkHandler(sinkFn);
-};
 export var sinkPostInteractionLogHandler = function sinkPostInteractionLogHandler(sinkFn) {
   postInteractionLog.sinkHandler(sinkFn);
 };
-
-// a flag to prevent mutliple submittions
-var activeSubmitted = false;
 export function tryComplete(interactionId, endTime) {
   var interaction = interactions.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 = getConfig()) !== null && _getConfig4 !== void 0 && (_getConfig4 = _getConfig4.postInteractionLog) !== null && _getConfig4 !== void 0 && _getConfig4.enabled) {
-        var _getExperimentalVCMet;
-        var experimentalVC90 = (_getExperimentalVCMet = getExperimentalVCMetrics(interaction)) === null || _getExperimentalVCMet === void 0 ? void 0 : _getExperimentalVCMet['metric:experimental:vc90'];
-        var experimentalTTAI = 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 = 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();
+  });
+}
 export function abort(interactionId, abortReason) {
   var interaction = interactions.get(interactionId);
   if (interaction != null) {
-    var _getConfig6;
     callCancelCallbacks(interaction);
     interaction.abortReason = abortReason;
     finishInteraction(interactionId, interaction);
-    if ((_getConfig6 = getConfig()) !== null && _getConfig6 !== void 0 && (_getConfig6 = _getConfig6.experimentalInteractionMetrics) !== null && _getConfig6 !== void 0 && _getConfig6.enabled) {
-      experimentalInteractionLog.onInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   }
 }
 export function abortByNewInteraction(interactionId, interactionName) {
   var interaction = interactions.get(interactionId);
   if (interaction != null) {
-    var _getConfig7;
     callCancelCallbacks(interaction);
     interaction.abortReason = 'new_interaction';
     interaction.abortedByInteractionName = interactionName;
     finishInteraction(interactionId, interaction);
-    if ((_getConfig7 = getConfig()) !== null && _getConfig7 !== void 0 && (_getConfig7 = _getConfig7.experimentalInteractionMetrics) !== null && _getConfig7 !== void 0 && _getConfig7.enabled) {
-      experimentalInteractionLog.onInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   }
 }
 export function abortAll(abortReason, abortedByInteractionName) {
   interactions.forEach(function (interaction, interactionId) {
-    var _getConfig8;
     var noMoreHolds = interaction.holdActive.size === 0;
     if (!noMoreHolds) {
       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 = getConfig()) !== null && _getConfig8 !== void 0 && (_getConfig8 = _getConfig8.experimentalInteractionMetrics) !== null && _getConfig8 !== void 0 && _getConfig8.enabled) {
-      experimentalInteractionLog.onInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   });
 }
 export function addOnCancelCallback(id, cancelCallback) {
@@ -502,9 +562,9 @@ export function addOnCancelCallback(id, cancelCallback) {
   interaction === null || interaction === void 0 || interaction.cancelCallbacks.push(cancelCallback);
 }
 export 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 = getConfig()) !== null && _getConfig9 !== void 0 && (_getConfig9 = _getConfig9.postInteractionLog) !== null && _getConfig9 !== void 0 && _getConfig9.enabled) {
+  if ((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5 = _getConfig5.postInteractionLog) !== null && _getConfig5 !== void 0 && _getConfig5.enabled) {
     postInteractionLog.reset();
   }
   var previousTime = startTime;
@@ -544,11 +604,9 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     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,
@@ -659,6 +717,17 @@ export 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('|');
+}
 export function addSegment(labelStack) {
   var key = getSegmentCacheKey(labelStack);
   var existingSegment = segmentCache.get(key);