@atlaskit/react-ufo 2.7.0 → 2.8.0

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

@@ -1,22 +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 { experimentalVC, getExperimentalVCMetrics, onExperimentalInteractionComplete } from '../create-experimental-interaction-metrics-payload';
-import { getTTAI, postInteractionLog } 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 { CLEANUP_TIMEOUT, CLEANUP_TIMEOUT_AFTER_APDEX, interactionQueue, interactions, 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();
+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) {
@@ -24,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);
 }
@@ -172,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\//, '');
@@ -179,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();
@@ -217,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);
       }
     };
   }
@@ -358,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
@@ -373,6 +433,7 @@ 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();
@@ -380,13 +441,50 @@ var finishInteraction = function finishInteraction(id, data) {
   if ((_getConfig3 = getConfig()) !== null && _getConfig3 !== void 0 && (_getConfig3 = _getConfig3.vc) !== null && _getConfig3 !== void 0 && _getConfig3.stopVCAtInteractionFinish) {
     data.vc = getVCObserver().getVCRawData();
   }
+  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,85 +507,54 @@ export var sinkInteractionHandler = function sinkInteractionHandler(sinkFn) {
 export var sinkPostInteractionLogHandler = function sinkPostInteractionLogHandler(sinkFn) {
   postInteractionLog.sinkHandler(sinkFn);
 };
-
-// a flag to prevent multiple submitting
-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);
-    };
-    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) {
-          onExperimentalInteractionComplete(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) {
-      onExperimentalInteractionComplete(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) {
-      onExperimentalInteractionComplete(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) {
-      onExperimentalInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   });
 }
 export function addOnCancelCallback(id, cancelCallback) {
@@ -495,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;
@@ -537,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,
@@ -591,10 +656,6 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     postInteractionLog.startVCObserver({
       startTime: startTime
     });
-    experimentalVC.start({
-      startTime: startTime
-    });
-    activeSubmitted = false;
   }
 }
 export function addBrowserMetricEvent(event) {
@@ -656,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);

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

@@ -2,10 +2,8 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { unstable_IdlePriority as idlePriority, unstable_scheduleCallback as scheduleCallback } from 'scheduler';
 import { startLighthouseObserver } from '../additional-payload';
 import { setUFOConfig } from '../config';
-import { experimentalVC, sinkExperimentalHandler } from '../create-experimental-interaction-metrics-payload';
-import { postInteractionLog } from '../create-payload/common/utils';
 import { setupHiddenTimingCapture } from '../hidden-timing';
-import { sinkInteractionHandler, sinkPostInteractionLogHandler } from '../interaction-metrics';
+import { postInteractionLog, sinkInteractionHandler, sinkPostInteractionLogHandler } from '../interaction-metrics';
 import { getVCObserver } from '../vc';
 var initialized = false;
 function sinkInteraction(instance, payloadPackage) {
@@ -18,16 +16,6 @@ function sinkInteraction(instance, payloadPackage) {
     });
   });
 }
-function sinkExperimentalInteractionMetrics(instance, payloadPackage) {
-  sinkExperimentalHandler(function (interactionId, interaction) {
-    scheduleCallback(idlePriority, function () {
-      var payload = payloadPackage.createExperimentalMetricsPayload(interactionId, interaction);
-      if (payload) {
-        instance.sendOperationalEvent(payload);
-      }
-    });
-  });
-}
 function sinkPostInteractionLog(instance, createPostInteractionLogPayload) {
   sinkPostInteractionLogHandler(function (logOutput) {
     scheduleCallback(idlePriority, function () {
@@ -45,7 +33,6 @@ export var init = function init(analyticsWebClientAsync, config) {
   }
   setUFOConfig(config);
   if ((_config$vc = config.vc) !== null && _config$vc !== void 0 && _config$vc.enabled) {
-    var _config$experimentalI;
     var vcOptions = {
       heatmapSize: config.vc.heatmapSize,
       oldDomUpdates: config.vc.oldDomUpdates,
@@ -59,38 +46,31 @@ export var init = function init(analyticsWebClientAsync, config) {
     postInteractionLog.startVCObserver({
       startTime: 0
     });
-    if (config !== null && config !== void 0 && (_config$experimentalI = config.experimentalInteractionMetrics) !== null && _config$experimentalI !== void 0 && _config$experimentalI.enabled) {
-      experimentalVC.initialize(vcOptions).start({
-        startTime: 0
-      });
-    }
   }
   setupHiddenTimingCapture();
   startLighthouseObserver();
   initialized = true;
-  Promise.all([analyticsWebClientAsync, import( /* webpackChunkName: "create-payloads" */'../create-payload'), import( /* webpackChunkName: "create-post-interaction-log-payload" */'../create-post-interaction-log-payload')]).then(function (_ref) {
+  Promise.all([analyticsWebClientAsync,
+  // eslint-disable-next-line import/dynamic-import-chunkname
+  import( /* webpackChunkName: "create-payloads" */'../create-payload'),
+  // eslint-disable-next-line import/dynamic-import-chunkname
+  import( /* webpackChunkName: "create-post-intreaction-log-payload" */'../create-post-interaction-log-payload')]).then(function (_ref) {
     var _ref2 = _slicedToArray(_ref, 3),
       awc = _ref2[0],
       payloadPackage = _ref2[1],
       createPostInteractionLogPayloadPackage = _ref2[2];
     if (awc.getAnalyticsWebClientPromise) {
       awc.getAnalyticsWebClientPromise().then(function (client) {
-        var _config$experimentalI2, _config$postInteracti;
+        var _config$postInteracti;
         var instance = client.getInstance();
         sinkInteraction(instance, payloadPackage);
-        if (config !== null && config !== void 0 && (_config$experimentalI2 = config.experimentalInteractionMetrics) !== null && _config$experimentalI2 !== void 0 && _config$experimentalI2.enabled) {
-          sinkExperimentalInteractionMetrics(instance, payloadPackage);
-        }
         if ((_config$postInteracti = config.postInteractionLog) !== null && _config$postInteracti !== void 0 && _config$postInteracti.enabled) {
           sinkPostInteractionLog(instance, createPostInteractionLogPayloadPackage.default);
         }
       });
     } else if (awc.sendOperationalEvent) {
-      var _config$experimentalI3, _config$postInteracti2;
+      var _config$postInteracti2;
       sinkInteraction(awc, payloadPackage);
-      if (config !== null && config !== void 0 && (_config$experimentalI3 = config.experimentalInteractionMetrics) !== null && _config$experimentalI3 !== void 0 && _config$experimentalI3.enabled) {
-        sinkExperimentalInteractionMetrics(awc, payloadPackage);
-      }
       if ((_config$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
         sinkPostInteractionLog(awc, createPostInteractionLogPayloadPackage.default);
       }

package/dist/esm/load-hold/UFOLoadHold.js

@@ -22,7 +22,8 @@ var useLayoutEffectSAFE = typeof window === 'undefined' ? useEffect : useLayoutE
  *   return (
  *     <>
  *       <Skeleton />
- *       <UFOLoadHold name="card" />
+ *       <UFOLoadHold name="card">
+ *     </UFOLoadHold>
  *   )
  * }
  * ```
@@ -57,10 +58,7 @@ export default function UFOLoadHold(_ref) {
   // react-18: useId instead
   var context = useContext(UFOInteractionContext);
   useLayoutEffectSAFE(function () {
-    if (hold && context != null) {
-      if (experimental && context.holdExperimental) {
-        return context.holdExperimental(name);
-      }
+    if (hold && !experimental && context != null) {
       return context.hold(name);
     }
   }, [hold, context, name]);

package/dist/esm/segment/segment.js

@@ -79,14 +79,15 @@ export default function UFOSegment(_ref) {
         }
       }
     }
-    function _internalHold(labelStack, name) {
-      var experimental = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    function _internalHold(labelStack, name
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    ) {
       if (interactionId.current != null) {
         if (parentContext) {
-          return parentContext._internalHold(labelStack, name, experimental);
+          return parentContext._internalHold(labelStack, name);
         } else {
           var capturedInteractionId = interactionId.current;
-          var disposeHold = addHold(interactionId.current, labelStack, name, experimental);
+          var disposeHold = addHold(interactionId.current, labelStack, name);
           return function () {
             if (capturedInteractionId === interactionId.current) {
               disposeHold();
@@ -95,7 +96,9 @@ export default function UFOSegment(_ref) {
         }
       }
     }
-    function _internalHoldByID(labelStack, id, name, remove) {
+    function _internalHoldByID(labelStack, id, name, remove
+    // eslint-disable-next-line @typescript-eslint/no-invalid-void-type
+    ) {
       if (interactionId.current != null) {
         if (parentContext) {
           parentContext._internalHoldByID(labelStack, name, id, remove);
@@ -120,10 +123,6 @@ export default function UFOSegment(_ref) {
         var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'unknown';
         return this._internalHold(this.labelStack, name);
       },
-      holdExperimental: function holdExperimental() {
-        var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'unknown';
-        return this._internalHold(this.labelStack, name, true);
-      },
       addHoldByID: function addHoldByID(labelStack, id) {
         var name = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'unknown';
         this._internalHoldByID(labelStack, id, name, false);

package/dist/types/common/common/types.d.ts

@@ -63,7 +63,7 @@ export interface SegmentInfo {
     labelStack: LabelStack;
 }
 export interface CustomData {
-    [key: string]: null | string | number | boolean | undefined | CustomData | Record<string, CustomData>;
+    [key: string]: null | undefined | string | number | boolean | undefined | CustomData | Record<string, CustomData>;
 }
 export type CustomTiming = Record<string, {
     startTime: number;
@@ -104,9 +104,7 @@ export interface InteractionMetrics {
         labelStack: LabelStack;
     })[];
     holdInfo: HoldInfo[];
-    holdExpInfo: HoldInfo[];
     holdActive: Map<string, HoldActive>;
-    holdExpActive: Map<string, HoldActive>;
     reactProfilerTimings: ReactProfilerTiming[];
     measureStart: number;
     rate: number;
@@ -117,11 +115,11 @@ export interface InteractionMetrics {
     abortReason?: AbortReasonType;
     abortedByInteractionName?: string;
     /**
-     * Apdex is a legacy performance measurement where it is
+     * Apdex is legacy performance measurement where it is
      * capturing TTI at arbitrary point in the code (bm3/UFOv1)
      *
      * We are intercepting its values now just so we can use it for
-     * topline metric, but should encourage teams to adopt TTAI
+     * topline metric, but should encourage teams adopt TTAI
      *
      * This field might be ignored/dropped in the future.
      */
@@ -166,7 +164,7 @@ export interface LazyLoadProfilerContext {
     addLoad(identifier: string, start: number, end: number): void;
 }
 export interface EnhancedUFOInteractionContextType extends UFOInteractionContextType, RelayMetricsRecorder, LazyLoadProfilerContext {
-    _internalHold(labelStack: LabelStack, name: string, experimental?: boolean): void | (() => void);
+    _internalHold(labelStack: LabelStack, name: string): void | (() => void);
     _internalHoldByID(labelStack: LabelStack, id: string, name: string, remove: boolean): void | (() => void);
     addHoldByID(labelStack: LabelStack, id: string, name?: string): void;
     removeHoldByID(labelStack: LabelStack, id: string, name?: string): void;

package/dist/types/config/index.d.ts

@@ -73,11 +73,6 @@ export type Config = {
         readonly rates?: Rates;
         readonly kind?: Record<InteractionType, number>;
     };
-    readonly experimentalInteractionMetrics?: {
-        readonly enabled?: boolean;
-        readonly rates?: Rates;
-        readonly kind?: Record<InteractionType, number>;
-    };
     readonly enableSegmentHighlighting?: boolean;
     readonly enableAdditionalPerformanceMarks?: boolean;
     readonly shouldCalculateLighthouseMetricsFromTTAI?: boolean;
@@ -91,7 +86,6 @@ export type Config = {
 export declare function setUFOConfig(newConfig: Config): void;
 export declare function getConfig(): Config | undefined;
 export declare function getInteractionRate(name: string, interactionKind: InteractionKind): number;
-export declare function getExperimentalInteractionRate(name: string, interactionType: InteractionType): number;
 export declare function getPostInteractionRate(name: string, interactionType: InteractionType): number;
 export declare function getCapabilityRate(capability: Capability): number;
 declare const validTypingMethods: readonly ["timeout", "timeoutNoAlloc", "mutationObserver"];

package/dist/types/create-payload/common/utils/index.d.ts

@@ -1,8 +1,4 @@
-import type { InteractionMetrics } from '../../../common';
-import { type Config } from '../../../config';
 import type { LabelStack, SegmentLabel } from '../../../interaction-context';
-import PostInteractionLog from '../../../interaction-metrics/post-interaction-log';
-export declare const postInteractionLog: PostInteractionLog;
 export type SegmentItem = {
     n: string;
     c?: Record<string, SegmentItem>;
@@ -19,8 +15,3 @@ export declare function optimizeLabelStack(labelStack: LabelStack): string | {
     s?: string | undefined;
     n: string;
 }[];
-export declare const getPageVisibilityUpToTTAI: (interaction: InteractionMetrics) => import("../../../hidden-timing").PageVisibility;
-export declare const calculateVCMetrics: (interaction: InteractionMetrics, prefix: string, getVCResultFn: (props: any) => any) => any;
-export declare function getSSRDoneTimeValue(config: Config | undefined): number | undefined;
-export declare const getVCMetrics: (interaction: InteractionMetrics) => any;
-export declare const getTTAI: (interaction: InteractionMetrics) => number | undefined;