@atlaskit/react-ufo 3.10.4 → 3.11.1

package/dist/cjs/vc/vc-observer/getVCRevisionsData.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getVCRevisionsData = getVCRevisionsData;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _config = require("../../config");
 var _hiddenTiming = require("../../hidden-timing");
 var _revisions = require("./revisions/revisions");
@@ -31,7 +32,7 @@ function createVCDetails(calculatedVC, shouldHaveVCmetric) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var key = _step.value;
       details[key] = {
-        t: VC[key],
+        t: VC[key] || -1,
         e: VCBox[key] || READONLY_EMPTY_ARRAY
       };
     }
@@ -52,8 +53,13 @@ function getVCRevisionsData(_ref) {
     multiHeatmap = _ref.multiHeatmap,
     ssr = _ref.ssr,
     calculatedVC = _ref.calculatedVC,
-    calculatedVCNext = _ref.calculatedVCNext;
-  if (!(0, _config.isVCRevisionEnabled)('fy25.03')) {
+    calculatedVCNext = _ref.calculatedVCNext,
+    experienceKey = _ref.experienceKey;
+  var isTTVCv3Enabled = (0, _platformFeatureFlags.fg)('platform_ufo_vc_enable_revisions_by_experience') ? (0, _config.isVCRevisionEnabled)('fy25.03', experienceKey) : (0, _config.isVCRevisionEnabled)('fy25.03');
+
+  // As part of `platform_ufo_vc_enable_revisions_by_experience`, we are looking to turn off the `multiHeatmap` branch of code
+  // for calculating TTVC, and instead rely on existing values already available, e.g. `calculatedVC` and `calculatedVCNext`
+  if (!isTTVCv3Enabled && !(0, _platformFeatureFlags.fg)('platform_ufo_vc_enable_revisions_by_experience')) {
     if (!multiHeatmap) {
       return null;
     }
@@ -76,29 +82,48 @@ function getVCRevisionsData(_ref) {
       clean: isVCClean
     }));
   }
-
-  // Calculate these conditions once
   var pageVisibilityUpToTTAI = (0, _hiddenTiming.getPageVisibilityState)(interaction.start, interaction.end);
   var isVisiblePageVisibleUpToTTAI = pageVisibilityUpToTTAI === 'visible';
   var shouldHaveVCmetric = isVCClean && !isEventAborted && isVisiblePageVisibleUpToTTAI;
+  if ((0, _platformFeatureFlags.fg)('platform_ufo_vc_enable_revisions_by_experience')) {
+    var availableVCRevisionPayloads = [];
+    if ((0, _config.isVCRevisionEnabled)('fy25.01', experienceKey)) {
+      availableVCRevisionPayloads.push({
+        revision: 'fy25.01',
+        clean: isVCClean,
+        'metric:vc90': shouldHaveVCmetric ? calculatedVC.VC['90'] : null,
+        vcDetails: createVCDetails(calculatedVC, shouldHaveVCmetric)
+      });
+    }
+    if ((0, _config.isVCRevisionEnabled)('fy25.02', experienceKey)) {
+      availableVCRevisionPayloads.push({
+        revision: 'fy25.02',
+        clean: isVCClean,
+        'metric:vc90': shouldHaveVCmetric ? calculatedVCNext.VC['90'] : null,
+        vcDetails: createVCDetails(calculatedVCNext, shouldHaveVCmetric)
+      });
+    }
+    return (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:rev"), availableVCRevisionPayloads);
+  } else {
+    // Create the V2 revision object which is always needed
+    var ttvcV2Revision = {
+      revision: 'fy25.02',
+      clean: isVCClean,
+      'metric:vc90': shouldHaveVCmetric ? calculatedVCNext.VC['90'] : null,
+      vcDetails: createVCDetails(calculatedVCNext, shouldHaveVCmetric)
+    };
+    var isTTVCv1Disabled = !(0, _config.isVCRevisionEnabled)('fy25.01');
+    if (isTTVCv1Disabled) {
+      return (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:rev"), [ttvcV2Revision]);
+    }
 
-  // Create the V2 revision object which is always needed
-  var ttvcV2Revision = {
-    revision: 'fy25.02',
-    clean: isVCClean,
-    'metric:vc90': shouldHaveVCmetric ? calculatedVCNext.VC['90'] : null,
-    vcDetails: createVCDetails(calculatedVCNext, shouldHaveVCmetric)
-  };
-  if (!(0, _config.isVCRevisionEnabled)('fy25.01')) {
-    return (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:rev"), [ttvcV2Revision]);
+    // Only create ttvcV1Revision when we're actually going to use it
+    var ttvcV1Revision = {
+      revision: 'fy25.01',
+      clean: isVCClean,
+      'metric:vc90': shouldHaveVCmetric ? calculatedVC.VC['90'] : null,
+      vcDetails: createVCDetails(calculatedVC, shouldHaveVCmetric)
+    };
+    return (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:rev"), [ttvcV1Revision, ttvcV2Revision]);
   }
-
-  // Only create ttvcV1Revision when we're actually going to use it
-  var ttvcV1Revision = {
-    revision: 'fy25.01',
-    clean: isVCClean,
-    'metric:vc90': shouldHaveVCmetric ? calculatedVC.VC['90'] : null,
-    vcDetails: createVCDetails(calculatedVC, shouldHaveVCmetric)
-  };
-  return (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:rev"), [ttvcV1Revision, ttvcV2Revision]);
 }

package/dist/cjs/vc/vc-observer/index.js

@@ -15,6 +15,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _config = require("../../config");
+var _interactionMetrics = require("../../interaction-metrics");
 var _attachAbortListeners = require("./attachAbortListeners");
 var _getVCRevisionsData = require("./getVCRevisionsData");
 var _getViewport = require("./getViewport");
@@ -105,11 +106,11 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
     });
     (0, _defineProperty2.default)(this, "getVCResult", /*#__PURE__*/function () {
       var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref3) {
-        var start, stop, tti, prefix, ssr, vc, isEventAborted, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, multiHeatmap, isTTVCv1Disabled, vcAbortedResultWithRevisions, ttvcV1Result, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, ttvcV1DevToolInfo, ttvcV2DevToolInfo, isVCClean, revisionsData, speedIndex, isTTVCv3Enabled;
+        var start, stop, tti, prefix, ssr, vc, isEventAborted, experienceKey, startTime, fullPrefix, rawData, abortReason, abortReasonInfo, heatmap, heatmapNext, outOfBoundaryInfo, totalTime, componentsLog, viewport, devToolsEnabled, ratios, multiHeatmap, isTTVCv1Disabled, vcAbortedResultWithRevisions, ttvcV1Result, VC, VCBox, VCEntries, totalPainted, _componentsLog, vcNext, outOfBoundary, stopTime, ttvcV1DevToolInfo, ttvcV2DevToolInfo, isVCClean, revisionsData, speedIndex, isTTVCv3Enabled;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              start = _ref3.start, stop = _ref3.stop, tti = _ref3.tti, prefix = _ref3.prefix, ssr = _ref3.ssr, vc = _ref3.vc, isEventAborted = _ref3.isEventAborted;
+              start = _ref3.start, stop = _ref3.stop, tti = _ref3.tti, prefix = _ref3.prefix, ssr = _ref3.ssr, vc = _ref3.vc, isEventAborted = _ref3.isEventAborted, experienceKey = _ref3.experienceKey;
               startTime = performance.now(); // add local measurement
               fullPrefix = prefix !== undefined && prefix !== '' ? "".concat(prefix, ":") : '';
               rawData = vc !== undefined ? vc : _this.getVCRawData();
@@ -120,7 +121,7 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
               return _context.abrupt("return", {});
             case 6:
               abortReason = rawData.abortReason, abortReasonInfo = rawData.abortReasonInfo, heatmap = rawData.heatmap, heatmapNext = rawData.heatmapNext, outOfBoundaryInfo = rawData.outOfBoundaryInfo, totalTime = rawData.totalTime, componentsLog = rawData.componentsLog, viewport = rawData.viewport, devToolsEnabled = rawData.devToolsEnabled, ratios = rawData.ratios, multiHeatmap = rawData.multiHeatmap;
-              isTTVCv1Disabled = !(0, _config.isVCRevisionEnabled)('fy25.01'); // NOTE: as part of platform_ufo_add_vc_abort_reason_by_revisions feature,
+              isTTVCv1Disabled = (0, _platformFeatureFlags.fg)('platform_ufo_vc_enable_revisions_by_experience') ? !(0, _config.isVCRevisionEnabled)('fy25.01', experienceKey) : !(0, _config.isVCRevisionEnabled)('fy25.01'); // NOTE: as part of platform_ufo_add_vc_abort_reason_by_revisions feature,
               // we want to report abort by scroll events the same way as other abort reasons
               // i.e. not have the concept of `abortReason.blocking` anymore
               if (!(abortReasonInfo !== null && (0, _platformFeatureFlags.fg)('platform_ufo_add_vc_abort_reason_by_revisions'))) {
@@ -308,7 +309,8 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
                   VC: vcNext.VC,
                   VCBox: vcNext.VCBox
                 },
-                isEventAborted: isEventAborted
+                isEventAborted: isEventAborted,
+                experienceKey: experienceKey
               });
               speedIndex = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "ufo:speedIndex", isTTVCv1Disabled ? vcNext.VCEntries.speedIndex : VCEntries.speedIndex), "ufo:next:speedIndex", vcNext.VCEntries.speedIndex);
               if (!isTTVCv1Disabled) {
@@ -317,7 +319,7 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
               }
               return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:size"), viewport), "".concat(fullPrefix, "vc:time"), Math.round(totalTime + (stopTime - startTime))), "".concat(fullPrefix, "vc:ratios"), ratios), outOfBoundary), {}, (0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), revisionsData), speedIndex));
             case 32:
-              isTTVCv3Enabled = (0, _config.isVCRevisionEnabled)('fy25.03');
+              isTTVCv3Enabled = (0, _platformFeatureFlags.fg)('platform_ufo_vc_enable_revisions_by_experience') ? (0, _config.isVCRevisionEnabled)('fy25.03', experienceKey) : (0, _config.isVCRevisionEnabled)('fy25.03');
               return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
                 'metrics:vc': VC
               }, "".concat(fullPrefix, "vc:state"), true), "".concat(fullPrefix, "vc:clean"), isVCClean), "".concat(fullPrefix, "vc:dom"), VCBox), "".concat(fullPrefix, "vc:updates"), isTTVCv3Enabled ? undefined : VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:size"), viewport), "".concat(fullPrefix, "vc:time"), Math.round(totalTime + (stopTime - startTime))), "".concat(fullPrefix, "vc:total"), totalPainted), "".concat(fullPrefix, "vc:ratios"), ratios), outOfBoundary), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(fullPrefix, "vc:next"), vcNext.VC), "".concat(fullPrefix, "vc:next:updates"), isTTVCv3Enabled ? undefined : vcNext.VCEntries.rel.slice(0, 50)), "".concat(fullPrefix, "vc:next:dom"), vcNext.VCBox), "".concat(fullPrefix, "vc:ignored"), _this.getIgnoredElements(componentsLog)), revisionsData), speedIndex));
@@ -334,7 +336,12 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "handleUpdate", function (rawTime, intersectionRect, targetName, element, type, ignoreReason, attributeName, oldValue, newValue) {
       _this.measureStart();
       _this.legacyHandleUpdate(rawTime, intersectionRect, targetName, element, type, ignoreReason, attributeName, oldValue, newValue);
-      if (!(0, _config.isVCRevisionEnabled)('fy25.03')) {
+      var isTTVCv3Disabled = !(0, _config.isVCRevisionEnabled)('fy25.03');
+      if ((0, _platformFeatureFlags.fg)('platform_ufo_vc_enable_revisions_by_experience')) {
+        var interaction = (0, _interactionMetrics.getActiveInteraction)();
+        isTTVCv3Disabled = !(0, _config.isVCRevisionEnabled)('fy25.03', interaction === null || interaction === void 0 ? void 0 : interaction.ufoName);
+      }
+      if (isTTVCv3Disabled) {
         _this.onViewportChangeDetected({
           timestamp: rawTime,
           intersectionRect: intersectionRect,
@@ -358,6 +365,10 @@ var VCObserver = exports.VCObserver = /*#__PURE__*/function () {
           _this.applyChangesToHeatMap(mappedValues, time, _this.heatmapNext);
         }
         var isTTVCv1Disabled = !(0, _config.isVCRevisionEnabled)('fy25.01');
+        if ((0, _platformFeatureFlags.fg)('platform_ufo_vc_enable_revisions_by_experience')) {
+          var interaction = (0, _interactionMetrics.getActiveInteraction)();
+          isTTVCv1Disabled = !(0, _config.isVCRevisionEnabled)('fy25.01', interaction === null || interaction === void 0 ? void 0 : interaction.ufoName);
+        }
         if (!isTTVCv1Disabled && (!ignoreReason || ignoreReason === 'not-visible') && type !== 'attr') {
           _this.applyChangesToHeatMap(mappedValues, time, _this.heatmap);
         }

package/dist/es2019/config/index.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 let config;
 const DEFAULT_TTVC_REVISION = 'fy25.02';
 
@@ -5,28 +6,70 @@ const DEFAULT_TTVC_REVISION = 'fy25.02';
 // and they could delete empty members
 
 export function setUFOConfig(newConfig) {
-  config = newConfig;
+  if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
+    var _newConfig$vc;
+    // Handle edge cases with `enabledVCRevisions`
+    const {
+      enabledVCRevisions
+    } = (_newConfig$vc = newConfig === null || newConfig === void 0 ? void 0 : newConfig.vc) !== null && _newConfig$vc !== void 0 ? _newConfig$vc : {};
+    if (typeof (enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.byExperience) === 'object') {
+      config = {
+        ...newConfig,
+        vc: {
+          ...newConfig.vc,
+          enabledVCRevisions: {
+            // enforce axiom about `enabledVCRevisions.all` config
+            all: Array.from(new Set([DEFAULT_TTVC_REVISION, ...(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.all), ...Object.values(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.byExperience).flat()])),
+            byExperience: {
+              ...(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.byExperience)
+            }
+          }
+        }
+      };
+    } else {
+      config = newConfig;
+    }
+  } else {
+    config = newConfig;
+  }
 }
 export function getConfig() {
   return config;
 }
-export function getEnabledVCRevisions() {
+const isValidConfigArray = array => {
+  return Array.isArray(array) && array.length > 0;
+};
+export function getEnabledVCRevisions(experienceKey = '') {
   try {
     var _config$vc;
     if (!config) {
       return [];
     }
     if ((_config$vc = config.vc) !== null && _config$vc !== void 0 && _config$vc.enabled) {
-      var _config$vc2, _config$vc3;
-      return Array.isArray((_config$vc2 = config.vc) === null || _config$vc2 === void 0 ? void 0 : _config$vc2.enabledVCRevisions) && ((_config$vc3 = config.vc) === null || _config$vc3 === void 0 ? void 0 : _config$vc3.enabledVCRevisions.length) > 0 ? config.vc.enabledVCRevisions : [DEFAULT_TTVC_REVISION];
+      var _config$vc2, _enabledVCRevisions$b;
+      const {
+        enabledVCRevisions
+      } = (_config$vc2 = config.vc) !== null && _config$vc2 !== void 0 ? _config$vc2 : {};
+      if (isValidConfigArray(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : (_enabledVCRevisions$b = enabledVCRevisions.byExperience) === null || _enabledVCRevisions$b === void 0 ? void 0 : _enabledVCRevisions$b[experienceKey]) && fg('platform_ufo_vc_enable_revisions_by_experience')) {
+        var _enabledVCRevisions$b2;
+        return (_enabledVCRevisions$b2 = enabledVCRevisions.byExperience) === null || _enabledVCRevisions$b2 === void 0 ? void 0 : _enabledVCRevisions$b2[experienceKey];
+      }
+      if (isValidConfigArray(enabledVCRevisions === null || enabledVCRevisions === void 0 ? void 0 : enabledVCRevisions.all)) {
+        return enabledVCRevisions.all;
+      }
+      return [DEFAULT_TTVC_REVISION];
     }
     return [];
   } catch {
     return [];
   }
 }
-export function isVCRevisionEnabled(revision) {
-  return getEnabledVCRevisions().includes(revision);
+export function isVCRevisionEnabled(revision, experienceKey) {
+  return getEnabledVCRevisions(experienceKey).includes(revision);
+}
+export function getMostRecentVCRevision(experienceKey = '') {
+  const enabledVCRevisions = getEnabledVCRevisions(experienceKey);
+  return enabledVCRevisions[enabledVCRevisions.length - 1];
 }
 export function getInteractionRate(name, interactionKind) {
   try {

package/dist/es2019/create-experimental-interaction-metrics-payload/index.js

@@ -67,7 +67,8 @@ export async function getExperimentalVCMetrics(interaction) {
       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,
       isEventAborted: !!interaction.abortReason,
       prefix,
-      vc: interaction.vc
+      vc: interaction.vc,
+      experienceKey: interaction.ufoName
     });
     const VC = result === null || result === void 0 ? void 0 : result['metrics:vc'];
     if (!VC || !(result !== null && result !== void 0 && result[`${prefix}:vc:clean`])) {

package/dist/es2019/create-payload/utils/get-vc-metrics.js

@@ -1,5 +1,5 @@
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getConfig, isVCRevisionEnabled } from '../../config';
+import { getConfig, getMostRecentVCRevision, isVCRevisionEnabled } from '../../config';
 import { postInteractionLog } from '../../interaction-metrics';
 import { getVCObserver } from '../../vc';
 import getInteractionStatus from './get-interaction-status';
@@ -16,8 +16,9 @@ async function getVCMetrics(interaction) {
   }
   const interactionStatus = getInteractionStatus(interaction);
   const pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
-  if ((interactionStatus.originalInteractionStatus !== 'SUCCEEDED' || pageVisibilityUpToTTAI !== 'visible') && fg('platform_ufo_no_vc_on_aborted')) {
-    getVCObserver().stop();
+  const shouldReportVCMetrics = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && pageVisibilityUpToTTAI === 'visible';
+  if (!shouldReportVCMetrics && fg('platform_ufo_no_vc_on_aborted')) {
+    getVCObserver().stop(interaction.ufoName);
     return {};
   }
   const isSSREnabled = (config === null || config === void 0 ? void 0 : config.ssr) || (config === null || config === void 0 ? void 0 : (_config$vc$ssrWhiteli = config.vc.ssrWhitelist) === null || _config$vc$ssrWhiteli === void 0 ? void 0 : _config$vc$ssrWhiteli.includes(interaction.ufoName));
@@ -34,36 +35,52 @@ async function getVCMetrics(interaction) {
     prefix,
     vc: interaction.vc,
     isEventAborted: interactionStatus.originalInteractionStatus !== 'SUCCEEDED',
+    experienceKey: interaction.ufoName,
     ...ssr
   });
   if ((_config$experimentalI = config.experimentalInteractionMetrics) !== null && _config$experimentalI !== void 0 && _config$experimentalI.enabled) {
-    getVCObserver().stop();
+    getVCObserver().stop(interaction.ufoName);
   }
   postInteractionLog.setLastInteractionFinishVCResult(result);
-  if (!isVCRevisionEnabled('fy25.01')) {
+  if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
     var _result$ufoVcRev;
-    const ttvcV2Revision = result === null || result === void 0 ? void 0 : (_result$ufoVcRev = result['ufo:vc:rev']) === null || _result$ufoVcRev === void 0 ? void 0 : _result$ufoVcRev.find(({
+    const mostRecentVCRevision = getMostRecentVCRevision(interaction.ufoName);
+    const mostRecentVCRevisionPayload = result === null || result === void 0 ? void 0 : (_result$ufoVcRev = result['ufo:vc:rev']) === null || _result$ufoVcRev === void 0 ? void 0 : _result$ufoVcRev.find(({
       revision
-    }) => revision === 'fy25.02');
-    if (!(ttvcV2Revision !== null && ttvcV2Revision !== void 0 && ttvcV2Revision.clean)) {
+    }) => revision === mostRecentVCRevision);
+    if (!shouldReportVCMetrics || !(mostRecentVCRevisionPayload !== null && mostRecentVCRevisionPayload !== void 0 && mostRecentVCRevisionPayload.clean)) {
       return result;
     }
     return {
       ...result,
-      'metric:vc90': ttvcV2Revision['metric:vc90']
+      'metric:vc90': mostRecentVCRevisionPayload['metric:vc90']
     };
   } else {
-    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;
-    }
-    if (interactionStatus.originalInteractionStatus !== 'SUCCEEDED' || pageVisibilityUpToTTAI !== 'visible') {
-      return result;
+    if (!isVCRevisionEnabled('fy25.01')) {
+      var _result$ufoVcRev2;
+      const ttvcV2Revision = result === null || result === void 0 ? void 0 : (_result$ufoVcRev2 = result['ufo:vc:rev']) === null || _result$ufoVcRev2 === void 0 ? void 0 : _result$ufoVcRev2.find(({
+        revision
+      }) => revision === 'fy25.02');
+      if (!(ttvcV2Revision !== null && ttvcV2Revision !== void 0 && ttvcV2Revision.clean)) {
+        return result;
+      }
+      return {
+        ...result,
+        'metric:vc90': ttvcV2Revision['metric:vc90']
+      };
+    } else {
+      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;
+      }
+      if (interactionStatus.originalInteractionStatus !== 'SUCCEEDED' || pageVisibilityUpToTTAI !== 'visible') {
+        return result;
+      }
+      return {
+        ...result,
+        'metric:vc90': VC['90']
+      };
     }
-    return {
-      ...result,
-      'metric:vc90': VC['90']
-    };
   }
 }
 export default getVCMetrics;

package/dist/es2019/create-post-interaction-log-payload/index.js

@@ -120,6 +120,17 @@ function createPostInteractionLogPayload({
   if (pageVisibilityState !== 'visible') {
     return null;
   }
+
+  // Align post-interaction-logs closer to UFO event behaviour,
+  // e.g. also check for aborted or failed events
+  if (fg('platform_ufo_vc_align_revisions_on_watchdog_event')) {
+    if (lastInteractionFinish.abortReason) {
+      return null;
+    }
+    if (lastInteractionFinish.errors.length > 0) {
+      return null;
+    }
+  }
   const maxEndTimeFromProfiler = reactProfilerTimings ? Math.max(...reactProfilerTimings.map(t => t.commitTime)) : lastInteractionFinish.end;
   const revisedEndTime = Math.round(maxEndTimeFromProfiler);
   const revisedTtai = Math.round(maxEndTimeFromProfiler - lastInteractionFinish.start);

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

@@ -719,7 +719,8 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
   if (type === 'transition') {
     var _getConfig14, _getConfig14$experime;
     getVCObserver().start({
-      startTime
+      startTime,
+      experienceKey: ufoName
     });
     postInteractionLog.startVCObserver({
       startTime

package/dist/es2019/interaction-metrics/post-interaction-log.js

@@ -1,5 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getConfig } from '../config';
+import { VCObserverWrapper } from '../vc';
 import { VCObserver } from '../vc/vc-observer';
 const POST_INTERACTION_LOG_SEND_DEFAULT_TIMEOUT = 3000;
 export default class PostInteractionLog {
@@ -27,7 +29,12 @@ export default class PostInteractionLog {
     _defineProperty(this, "sinkHandlerFn", () => {});
   }
   initializeVCObserver(options) {
-    if (this.vcObserver === null) {
+    if (fg('platform_ufo_vc_align_revisions_on_watchdog_event')) {
+      this.vcObserver = new VCObserverWrapper({
+        ...options,
+        isPostInteraction: true
+      });
+    } else if (this.vcObserver === null) {
       this.vcObserver = new VCObserver({
         ...options,
         isPostInteraction: true
@@ -103,7 +110,8 @@ export default class PostInteractionLog {
       // no need for TTI value here
       isEventAborted: !!this.lastInteractionFinish.abortReason,
       prefix: 'ufo',
-      ...this.vcObserverSSRConfig
+      ...this.vcObserverSSRConfig,
+      experienceKey: this.lastInteractionFinish.ufoName
     }));
     if ((_getConfig2 = getConfig()) !== null && _getConfig2 !== void 0 && (_getConfig2$experimen = _getConfig2.experimentalInteractionMetrics) !== null && _getConfig2$experimen !== void 0 && _getConfig2$experimen.enabled) {
       var _this$vcObserver4;
@@ -134,7 +142,8 @@ export default class PostInteractionLog {
     routeName,
     type,
     experimentalTTAI,
-    experimentalVC90
+    experimentalVC90,
+    errors
   }) {
     var _getConfig3;
     this.lastInteractionFinish = {
@@ -147,7 +156,8 @@ export default class PostInteractionLog {
       routeName,
       type,
       experimentalTTAI,
-      experimentalVC90
+      experimentalVC90,
+      errors
     };
     const timeout = ((_getConfig3 = getConfig()) === null || _getConfig3 === void 0 ? void 0 : _getConfig3.timeWindowForLateMutationsInMilliseconds) || POST_INTERACTION_LOG_SEND_DEFAULT_TIMEOUT;
     this.sinkTimeoutId = window.setTimeout(async () => {

package/dist/es2019/vc/index.js

@@ -1,60 +1,123 @@
 var _process, _process$env;
+import { fg } from '@atlaskit/platform-feature-flags';
 import { isVCRevisionEnabled } from '../config';
 import { VCObserverNOOP } from './no-op-vc-observer';
 import { VCObserver } from './vc-observer';
 import VCObserverNew from './vc-observer-new';
-class VCObserverWrapper {
+export class VCObserverWrapper {
   constructor(opts = {}) {
     this.newVCObserver = null;
-    if (isVCRevisionEnabled('fy25.03')) {
-      this.newVCObserver = new VCObserverNew({
-        selectorConfig: opts.selectorConfig
-      });
+    if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
+      this.oldVCObserver = null;
+      if (isVCRevisionEnabled('fy25.03')) {
+        this.newVCObserver = new VCObserverNew({
+          selectorConfig: opts.selectorConfig
+        });
+      }
+      if (isVCRevisionEnabled('fy25.01') || isVCRevisionEnabled('fy25.02')) {
+        this.oldVCObserver = new VCObserver(opts);
+      }
+    } else {
+      if (isVCRevisionEnabled('fy25.03')) {
+        this.newVCObserver = new VCObserverNew({
+          selectorConfig: opts.selectorConfig
+        });
+      }
+      this.oldVCObserver = new VCObserver(opts);
     }
-    this.oldVCObserver = new VCObserver(opts);
   }
-  start(startArg) {
-    var _this$oldVCObserver, _this$newVCObserver;
-    (_this$oldVCObserver = this.oldVCObserver) === null || _this$oldVCObserver === void 0 ? void 0 : _this$oldVCObserver.start(startArg);
-    (_this$newVCObserver = this.newVCObserver) === null || _this$newVCObserver === void 0 ? void 0 : _this$newVCObserver.start({
-      startTime: startArg.startTime
-    });
+  start({
+    startTime,
+    experienceKey
+  }) {
+    if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
+      if (isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey)) {
+        var _this$oldVCObserver;
+        (_this$oldVCObserver = this.oldVCObserver) === null || _this$oldVCObserver === void 0 ? void 0 : _this$oldVCObserver.start({
+          startTime
+        });
+      }
+      if (isVCRevisionEnabled('fy25.03', experienceKey)) {
+        var _this$newVCObserver;
+        (_this$newVCObserver = this.newVCObserver) === null || _this$newVCObserver === void 0 ? void 0 : _this$newVCObserver.start({
+          startTime
+        });
+      }
+    } else {
+      var _this$oldVCObserver2, _this$newVCObserver2;
+      (_this$oldVCObserver2 = this.oldVCObserver) === null || _this$oldVCObserver2 === void 0 ? void 0 : _this$oldVCObserver2.start({
+        startTime
+      });
+      (_this$newVCObserver2 = this.newVCObserver) === null || _this$newVCObserver2 === void 0 ? void 0 : _this$newVCObserver2.start({
+        startTime
+      });
+    }
   }
-  stop() {
-    var _this$oldVCObserver2, _this$newVCObserver2;
-    (_this$oldVCObserver2 = this.oldVCObserver) === null || _this$oldVCObserver2 === void 0 ? void 0 : _this$oldVCObserver2.stop();
-    (_this$newVCObserver2 = this.newVCObserver) === null || _this$newVCObserver2 === void 0 ? void 0 : _this$newVCObserver2.stop();
+  stop(experienceKey) {
+    if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
+      if (isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey)) {
+        var _this$oldVCObserver3;
+        (_this$oldVCObserver3 = this.oldVCObserver) === null || _this$oldVCObserver3 === void 0 ? void 0 : _this$oldVCObserver3.stop();
+      }
+      if (isVCRevisionEnabled('fy25.03', experienceKey)) {
+        var _this$newVCObserver3;
+        (_this$newVCObserver3 = this.newVCObserver) === null || _this$newVCObserver3 === void 0 ? void 0 : _this$newVCObserver3.stop();
+      }
+    } else {
+      var _this$oldVCObserver4, _this$newVCObserver4;
+      (_this$oldVCObserver4 = this.oldVCObserver) === null || _this$oldVCObserver4 === void 0 ? void 0 : _this$oldVCObserver4.stop();
+      (_this$newVCObserver4 = this.newVCObserver) === null || _this$newVCObserver4 === void 0 ? void 0 : _this$newVCObserver4.stop();
+    }
   }
   getVCRawData() {
-    var _this$oldVCObserver$g, _this$oldVCObserver3;
-    return (_this$oldVCObserver$g = (_this$oldVCObserver3 = this.oldVCObserver) === null || _this$oldVCObserver3 === void 0 ? void 0 : _this$oldVCObserver3.getVCRawData()) !== null && _this$oldVCObserver$g !== void 0 ? _this$oldVCObserver$g : null;
+    var _this$oldVCObserver$g, _this$oldVCObserver5;
+    return (_this$oldVCObserver$g = (_this$oldVCObserver5 = this.oldVCObserver) === null || _this$oldVCObserver5 === void 0 ? void 0 : _this$oldVCObserver5.getVCRawData()) !== null && _this$oldVCObserver$g !== void 0 ? _this$oldVCObserver$g : null;
   }
   async getVCResult(param) {
-    var _this$oldVCObserver4, _this$newVCObserver3, _ref;
-    const oldResult = await ((_this$oldVCObserver4 = this.oldVCObserver) === null || _this$oldVCObserver4 === void 0 ? void 0 : _this$oldVCObserver4.getVCResult(param));
-    const newResult = await ((_this$newVCObserver3 = this.newVCObserver) === null || _this$newVCObserver3 === void 0 ? void 0 : _this$newVCObserver3.getVCResult({
-      start: param.start,
-      stop: param.stop
-    }));
-    if (oldResult && !newResult) {
-      return oldResult;
+    if (fg('platform_ufo_vc_enable_revisions_by_experience')) {
+      var _this$oldVCObserver6, _this$newVCObserver5, _ref;
+      const {
+        experienceKey
+      } = param;
+      const v1v2Result = isVCRevisionEnabled('fy25.01', experienceKey) || isVCRevisionEnabled('fy25.02', experienceKey) ? await ((_this$oldVCObserver6 = this.oldVCObserver) === null || _this$oldVCObserver6 === void 0 ? void 0 : _this$oldVCObserver6.getVCResult(param)) : {};
+      const v3Result = isVCRevisionEnabled('fy25.03', experienceKey) ? await ((_this$newVCObserver5 = this.newVCObserver) === null || _this$newVCObserver5 === void 0 ? void 0 : _this$newVCObserver5.getVCResult({
+        start: param.start,
+        stop: param.stop
+      })) : [];
+      if (!v3Result) {
+        return v1v2Result !== null && v1v2Result !== void 0 ? v1v2Result : {};
+      }
+      return {
+        ...v1v2Result,
+        'ufo:vc:rev': [...((_ref = v1v2Result === null || v1v2Result === void 0 ? void 0 : v1v2Result['ufo:vc:rev']) !== null && _ref !== void 0 ? _ref : []), ...(v3Result !== null && v3Result !== void 0 ? v3Result : [])]
+      };
+    } else {
+      var _this$oldVCObserver7, _this$newVCObserver6, _ref2;
+      const oldResult = await ((_this$oldVCObserver7 = this.oldVCObserver) === null || _this$oldVCObserver7 === void 0 ? void 0 : _this$oldVCObserver7.getVCResult(param));
+      const newResult = await ((_this$newVCObserver6 = this.newVCObserver) === null || _this$newVCObserver6 === void 0 ? void 0 : _this$newVCObserver6.getVCResult({
+        start: param.start,
+        stop: param.stop
+      }));
+      if (oldResult && !newResult) {
+        return oldResult;
+      }
+      return {
+        ...(oldResult !== null && oldResult !== void 0 ? oldResult : {}),
+        'ufo:vc:rev': [...((_ref2 = oldResult === null || oldResult === void 0 ? void 0 : oldResult['ufo:vc:rev']) !== null && _ref2 !== void 0 ? _ref2 : []), ...(newResult !== null && newResult !== void 0 ? newResult : [])]
+      };
     }
-    return {
-      ...(oldResult !== null && oldResult !== void 0 ? oldResult : {}),
-      'ufo:vc:rev': [...((_ref = oldResult === null || oldResult === void 0 ? void 0 : oldResult['ufo:vc:rev']) !== null && _ref !== void 0 ? _ref : []), ...(newResult !== null && newResult !== void 0 ? newResult : [])]
-    };
   }
   setSSRElement(element) {
-    var _this$oldVCObserver5;
-    (_this$oldVCObserver5 = this.oldVCObserver) === null || _this$oldVCObserver5 === void 0 ? void 0 : _this$oldVCObserver5.setSSRElement(element);
+    var _this$oldVCObserver8;
+    (_this$oldVCObserver8 = this.oldVCObserver) === null || _this$oldVCObserver8 === void 0 ? void 0 : _this$oldVCObserver8.setSSRElement(element);
   }
   setReactRootRenderStart(startTime) {
-    var _this$oldVCObserver6;
-    (_this$oldVCObserver6 = this.oldVCObserver) === null || _this$oldVCObserver6 === void 0 ? void 0 : _this$oldVCObserver6.setReactRootRenderStart(startTime || performance.now());
+    var _this$oldVCObserver9;
+    (_this$oldVCObserver9 = this.oldVCObserver) === null || _this$oldVCObserver9 === void 0 ? void 0 : _this$oldVCObserver9.setReactRootRenderStart(startTime || performance.now());
   }
   setReactRootRenderStop(stopTime) {
-    var _this$oldVCObserver7;
-    (_this$oldVCObserver7 = this.oldVCObserver) === null || _this$oldVCObserver7 === void 0 ? void 0 : _this$oldVCObserver7.setReactRootRenderStop(stopTime || performance.now());
+    var _this$oldVCObserver10;
+    (_this$oldVCObserver10 = this.oldVCObserver) === null || _this$oldVCObserver10 === void 0 ? void 0 : _this$oldVCObserver10.setReactRootRenderStop(stopTime || performance.now());
   }
 }