@atlaskit/react-ufo 2.4.7 → 2.5.1

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

@@ -8,12 +8,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) {
   const {
     ufoName,
     apdex
@@ -27,6 +28,7 @@ export function getUfoNameOverride(interaction) {
       }
     }
     return ufoName;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } catch (e) {
     return ufoName;
   }
@@ -61,6 +63,13 @@ const getPageVisibilityUpToTTI = interaction => {
   const bm3EndTimeOrInteractionEndTime = getBm3EndTimeOrFallbackValue(interaction);
   return getPageVisibilityState(start, bm3EndTimeOrInteractionEndTime);
 };
+const getPageVisibilityUpToTTAI = interaction => {
+  const {
+    start,
+    end
+  } = interaction;
+  return getPageVisibilityState(start, end);
+};
 const getVisibilityStateFromPerformance = stop => {
   try {
     const results = performance.getEntriesByType('visibility-state');
@@ -115,6 +124,15 @@ const getMoreAccuratePageVisibilityUpToTTAI = interaction => {
   }
   return old;
 };
+const getInteractionStatus = interaction => {
+  const originalInteractionStatus = interaction.abortReason ? 'ABORTED' : 'SUCCEEDED';
+  const hasBm3TTI = interaction.apdex.length > 0;
+  const overrideStatus = hasBm3TTI ? 'SUCCEEDED' : originalInteractionStatus;
+  return {
+    originalInteractionStatus,
+    overrideStatus
+  };
+};
 const getResourceTimings = (start, end) => {
   var _resourceTiming$getRe;
   return (_resourceTiming$getRe = resourceTiming.getResourceTimings(start, end)) !== null && _resourceTiming$getRe !== void 0 ? _resourceTiming$getRe : undefined;
@@ -137,6 +155,44 @@ const getPaintMetrics = type => {
   });
   return metrics;
 };
+const getVCMetrics = interaction => {
+  var _config$vc, _interaction$apdex, _interaction$apdex$;
+  const 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 {};
+  }
+  const ssr = interaction.type === 'page_load' && config !== null && config !== void 0 && config.ssr ? {
+    ssr: getSSRDoneTimeValue(config)
+  } : null;
+  postInteractionLog.setVCObserverSSRConfig(ssr);
+  const tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 ? void 0 : (_interaction$apdex$ = _interaction$apdex[0]) === null || _interaction$apdex$ === void 0 ? void 0 : _interaction$apdex$.stopTime;
+  const prefix = 'ufo';
+  const result = getVCObserver().getVCResult({
+    start: interaction.start,
+    stop: interaction.end,
+    tti,
+    prefix,
+    vc: interaction.vc,
+    ...ssr
+  });
+  postInteractionLog.setLastInteractionFinishVCResult(result);
+  const VC = result === null || result === void 0 ? void 0 : result['metrics:vc'];
+  if (!VC || !(result !== null && result !== void 0 && result[`${prefix}:vc:clean`])) {
+    return result;
+  }
+  const interactionStatus = getInteractionStatus(interaction);
+  const pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
+  if (interactionStatus.originalInteractionStatus !== 'SUCCEEDED' || pageVisibilityUpToTTAI !== 'visible') {
+    return result;
+  }
+  return {
+    ...result,
+    'metric:vc90': VC['90']
+  };
+};
 const getNavigationMetrics = type => {
   if (type !== 'page_load') {
     return {};
@@ -184,7 +240,7 @@ const getNavigationMetrics = type => {
   };
 };
 const getPPSMetrics = interaction => {
-  var _interaction$apdex, _interaction$apdex$;
+  var _interaction$apdex2, _interaction$apdex2$;
   const {
     start,
     end
@@ -192,7 +248,7 @@ const getPPSMetrics = interaction => {
   const config = getConfig();
   const interactionStatus = getInteractionStatus(interaction);
   const pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
-  const tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 ? void 0 : (_interaction$apdex$ = _interaction$apdex[0]) === null || _interaction$apdex$ === void 0 ? void 0 : _interaction$apdex$.stopTime;
+  const tti = (_interaction$apdex2 = interaction.apdex) === null || _interaction$apdex2 === void 0 ? void 0 : (_interaction$apdex2$ = _interaction$apdex2[0]) === null || _interaction$apdex2$ === void 0 ? void 0 : _interaction$apdex2$.stopTime;
   const ttai = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && pageVisibilityUpToTTAI === 'visible' ? Math.round(end - start) : undefined;
   const PPSMetricsAtTTI = tti !== undefined ? getLighthouseMetrics({
     start,
@@ -538,6 +594,10 @@ function getBm3TrackerTimings(interaction) {
     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 ? 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);
 }
@@ -580,15 +640,13 @@ function getStylesheetMetrics() {
     return {};
   }
 }
-let regularTTAI;
-let 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;
   const interactionPayloadStart = performance.now();
   const config = getConfig();
@@ -623,7 +681,7 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
   } : {};
   // Page Load
   const getPageLoadInteractionMetrics = () => {
-    var _config$ssr;
+    var _config$ssr3;
     if (!isPageLoad) {
       return {};
     }
@@ -635,12 +693,12 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
     return {
       ...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
   const getDetailedInteractionMetrics = () => {
-    if (experimental || window.__UFO_COMPACT_PAYLOAD__ || !isDetailedPayload) {
+    if (window.__UFO_COMPACT_PAYLOAD__ || !isDetailedPayload) {
       return {};
     }
     const spans = [...interaction.spans, ...atlaskitInteractionSpans];
@@ -655,7 +713,7 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
       })),
       holdActive: [...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),
@@ -665,21 +723,16 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
   };
   // Page load & detailed payload
   const getPageLoadDetailedInteractionMetrics = () => {
-    var _config$ssr2;
+    var _config$ssr4;
     if (!isPageLoad || !isDetailedPayload) {
       return {};
     }
     const 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);
-  }
   const newUFOName = sanitizeUfoName(ufoName);
   const payload = {
     actionSubject: 'experience',
@@ -700,7 +753,7 @@ 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,
         // root
         ...getBrowserMetadata(),
@@ -709,7 +762,6 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
         ...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(),
@@ -749,18 +801,12 @@ export function createInteractionMetricsPayload(interaction, interactionId, expe
           ...getPageLoadInteractionMetrics(),
           ...getDetailedInteractionMetrics(),
           ...getPageLoadDetailedInteractionMetrics(),
-          ...getBm3TrackerTimings(interaction),
-          'metric:ttai': experimental ? regularTTAI || expTTAI : undefined,
-          'metric:experimental:ttai': experimental ? expTTAI : undefined
+          ...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/es2019/interaction-metrics/common/constants.js

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

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

@@ -1,21 +1,22 @@
 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';
 const PreviousInteractionLog = {
   name: undefined,
   isAborted: undefined
 };
 export const postInteractionLog = new PostInteractionLog();
-export const experimentalInteractionLog = new ExperimentalInteractionMetrics();
+const interactionQueue = [];
+const segmentCache = new Map();
+const CLEANUP_TIMEOUT = 60 * 1000;
+const CLEANUP_TIMEOUT_AFTER_APDEX = 15 * 1000;
+const segmentObservers = [];
 export function getActiveInteraction() {
   const interactionId = getInteractionId();
   if (!interactionId.current) {
@@ -23,6 +24,36 @@ 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;
+  const stack = [...(labelStack !== null && labelStack !== void 0 ? labelStack : [])];
+  if (name) {
+    stack.push({
+      name
+    });
+  }
+  return (_stack$map = stack.map(l => l.name)) === null || _stack$map === void 0 ? void 0 : _stack$map.join('/');
+}
+function labelStackToIdString(labelStack) {
+  var _labelStack$map;
+  return labelStack === null || labelStack === void 0 ? void 0 : (_labelStack$map = labelStack.map(l => 'segmentId' in l ? `${l.name}:${l.segmentId}` : `${l.name}`)) === null || _labelStack$map === void 0 ? void 0 : _labelStack$map.join('/');
+}
+function addSegmentObserver(observer) {
+  segmentObservers.push(observer);
+  for (const segmentInfo of segmentCache.values()) {
+    observer.onAdd(segmentInfo);
+  }
+}
+function removeSegmentObserver(observer) {
+  const index = segmentObservers.findIndex(obs => obs === observer);
+  if (index !== -1) {
+    segmentObservers.splice(index, 1);
+  }
+}
 export function remove(interactionId) {
   interactions.delete(interactionId);
 }
@@ -165,6 +196,7 @@ export function addPreload(moduleId, timestamp) {
 export function addLoad(identifier, start, end) {
   addSpanToAll('bundle_load', identifier, null, start, end - start);
 }
+const moduleLoadingRequests = {};
 export function extractModuleName(input) {
   let result = input !== null && input !== void 0 ? input : '';
   result = result.replace(/^\.\/src\/packages\//, '');
@@ -172,29 +204,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) {
   const interaction = interactions.get(interactionId);
   const id = createUUID();
   if (interaction != null) {
-    var _getConfig, _getConfig$experiment;
-    const holdActive = {
+    const start = performance.now();
+    interaction.holdActive.set(id, {
       labelStack,
       name,
-      start: 0
-    };
-    const start = performance.now();
-    if ((_getConfig = getConfig()) !== null && _getConfig !== void 0 && (_getConfig$experiment = _getConfig.experimentalInteractionMetrics) !== null && _getConfig$experiment !== void 0 && _getConfig$experiment.enabled && experimental) {
-      interaction.holdExpActive.set(id, {
-        ...holdActive,
-        start
-      });
-    }
-    if (!experimental) {
-      interaction.holdActive.set(id, {
-        ...holdActive,
-        start
-      });
-    }
+      start
+    });
     addHoldCriterion(id, labelStack, name, start);
     return () => {
       const end = performance.now();
@@ -212,22 +245,12 @@ export function addHold(interactionId, labelStack, name, experimental) {
       removeHoldCriterion(id);
       const currentInteraction = interactions.get(interactionId);
       const currentHold = interaction.holdActive.get(id);
-      const expHold = interaction.holdExpActive.get(id);
-      if (currentInteraction != null) {
-        if (currentHold != null) {
-          currentInteraction.holdInfo.push({
-            ...currentHold,
-            end
-          });
-          interaction.holdActive.delete(id);
-        }
-        if (expHold != null) {
-          currentInteraction.holdExpInfo.push({
-            ...expHold,
-            end
-          });
-          interaction.holdExpActive.delete(id);
-        }
+      if (currentInteraction != null && currentHold != null) {
+        currentInteraction.holdInfo.push({
+          ...currentHold,
+          end
+        });
+        interaction.holdActive.delete(id);
       }
     };
   }
@@ -356,9 +379,21 @@ export const addProfilerTimings = (interactionId, labelStack, type, actualDurati
     postInteractionLog.addProfilerTimings(labelStack, type, actualDuration, baseDuration, startTime, commitTime);
   }
 };
+const pushToQueue = (id, data) => {
+  interactionQueue.push({
+    id,
+    data
+  });
+};
 let handleInteraction = pushToQueue;
+function callCleanUpCallbacks(interaction) {
+  interaction.cleanupCallbacks.reverse().forEach(cleanUpCallback => {
+    cleanUpCallback();
+  });
+}
 const finishInteraction = (id, data, endTime = performance.now()) => {
   var _getConfig3, _getConfig3$vc;
+  // eslint-disable-next-line no-param-reassign
   data.end = endTime;
   try {
     // for Firefox 102 and older
@@ -370,20 +405,49 @@ const finishInteraction = (id, data, endTime = performance.now()) => {
     // 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$vc = _getConfig3.vc) !== null && _getConfig3$vc !== void 0 && _getConfig3$vc.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);
+    const profilerTimingMap = new Map();
+    data.reactProfilerTimings.forEach(profilerTiming => {
+      const labelStackId = labelStackToIdString(profilerTiming.labelStack);
+      if (labelStackId) {
+        var _profilerTimingMap$ge, _timing$start, _timing$end;
+        const 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
+      for (const [, {
+        labelStack,
+        start,
+        end
+      }] of profilerTimingMap.entries()) {
+        performance.measure(`🛸 ${labelStackToString(labelStack)} [segment_ttai]`, {
+          start,
+          end
+        });
+      }
+    } catch (e) {
+      // do nothing
+    }
   }
   try {
     // dispatch a global window event to notify the measure is completed
@@ -403,93 +467,57 @@ export const sinkInteractionHandler = sinkFn => {
     interactionQueue.length = 0;
   }
 };
-export const sinkExperimentalHandler = sinkFn => {
-  experimentalInteractionLog.sinkHandler(sinkFn);
-};
 export const sinkPostInteractionLogHandler = sinkFn => {
   postInteractionLog.sinkHandler(sinkFn);
 };
-
-// a flag to prevent mutliple submittions
-let activeSubmitted = false;
 export function tryComplete(interactionId, endTime) {
   const interaction = interactions.get(interactionId);
   if (interaction != null) {
-    const noMoreActiveHolds = interaction.holdActive.size === 0;
-    const noMoreExpHolds = interaction.holdExpActive.size === 0;
-    const postInteraction = () => {
+    const noMoreHolds = interaction.holdActive.size === 0;
+    if (noMoreHolds) {
       var _getConfig4, _getConfig4$postInter;
+      finishInteraction(interactionId, interaction, endTime);
       if ((_getConfig4 = getConfig()) !== null && _getConfig4 !== void 0 && (_getConfig4$postInter = _getConfig4.postInteractionLog) !== null && _getConfig4$postInter !== void 0 && _getConfig4$postInter.enabled) {
-        var _getExperimentalVCMet;
-        const experimentalVC90 = (_getExperimentalVCMet = getExperimentalVCMetrics(interaction)) === null || _getExperimentalVCMet === void 0 ? void 0 : _getExperimentalVCMet['metric:experimental:vc90'];
-        const experimentalTTAI = getTTAI(interaction);
-        postInteractionLog.onInteractionComplete({
-          ...interaction,
-          experimentalTTAI,
-          experimentalVC90
-        });
-      }
-      remove(interactionId);
-      activeSubmitted = false;
-    };
-    if (noMoreActiveHolds) {
-      if (!activeSubmitted) {
-        finishInteraction(interactionId, interaction, endTime);
-        activeSubmitted = true;
-      }
-      if (noMoreExpHolds) {
-        var _getConfig5, _getConfig5$experimen;
-        if ((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5$experimen = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5$experimen !== void 0 && _getConfig5$experimen.enabled) {
-          experimentalInteractionLog.onInteractionComplete(interactionId, interaction, endTime);
-        }
-        postInteraction();
+        postInteractionLog.onInteractionComplete(interaction);
       }
     }
   }
 }
+function callCancelCallbacks(interaction) {
+  interaction.cancelCallbacks.reverse().forEach(cancelCallback => {
+    cancelCallback();
+  });
+}
 export function abort(interactionId, abortReason) {
   const interaction = interactions.get(interactionId);
   if (interaction != null) {
-    var _getConfig6, _getConfig6$experimen;
     callCancelCallbacks(interaction);
     interaction.abortReason = abortReason;
     finishInteraction(interactionId, interaction);
-    if ((_getConfig6 = getConfig()) !== null && _getConfig6 !== void 0 && (_getConfig6$experimen = _getConfig6.experimentalInteractionMetrics) !== null && _getConfig6$experimen !== void 0 && _getConfig6$experimen.enabled) {
-      experimentalInteractionLog.onInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   }
 }
 export function abortByNewInteraction(interactionId, interactionName) {
   const interaction = interactions.get(interactionId);
   if (interaction != null) {
-    var _getConfig7, _getConfig7$experimen;
     callCancelCallbacks(interaction);
     interaction.abortReason = 'new_interaction';
     interaction.abortedByInteractionName = interactionName;
     finishInteraction(interactionId, interaction);
-    if ((_getConfig7 = getConfig()) !== null && _getConfig7 !== void 0 && (_getConfig7$experimen = _getConfig7.experimentalInteractionMetrics) !== null && _getConfig7$experimen !== void 0 && _getConfig7$experimen.enabled) {
-      experimentalInteractionLog.onInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   }
 }
 export function abortAll(abortReason, abortedByInteractionName) {
   interactions.forEach((interaction, interactionId) => {
-    var _getConfig8, _getConfig8$experimen;
     const 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$experimen = _getConfig8.experimentalInteractionMetrics) !== null && _getConfig8$experimen !== void 0 && _getConfig8$experimen.enabled) {
-      experimentalInteractionLog.onInteractionComplete(interactionId, interaction);
-    }
-    remove(interactionId);
   });
 }
 export function addOnCancelCallback(id, cancelCallback) {
@@ -497,8 +525,8 @@ export function addOnCancelCallback(id, cancelCallback) {
   interaction === null || interaction === void 0 ? void 0 : interaction.cancelCallbacks.push(cancelCallback);
 }
 export function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelStack, routeName, trace = null) {
-  var _getConfig9, _getConfig9$postInter;
-  if ((_getConfig9 = getConfig()) !== null && _getConfig9 !== void 0 && (_getConfig9$postInter = _getConfig9.postInteractionLog) !== null && _getConfig9$postInter !== void 0 && _getConfig9$postInter.enabled) {
+  var _getConfig5, _getConfig5$postInter;
+  if ((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5$postInter = _getConfig5.postInteractionLog) !== null && _getConfig5$postInter !== void 0 && _getConfig5$postInter.enabled) {
     postInteractionLog.reset();
   }
   let previousTime = startTime;
@@ -538,11 +566,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,
@@ -654,6 +680,17 @@ export function addRequestInfo(interactionId, labelStack, requestInfo) {
     });
   }
 }
+function isSegmentLabel(obj) {
+  return obj && typeof obj.name === 'string' && typeof obj.segmentId === 'string';
+}
+function getSegmentCacheKey(labelStack) {
+  return labelStack.map(l => {
+    if (isSegmentLabel(l)) {
+      return `${l.name}_${l.segmentId}`;
+    }
+    return l.name;
+  }).join('|');
+}
 export function addSegment(labelStack) {
   const key = getSegmentCacheKey(labelStack);
   const existingSegment = segmentCache.get(key);