@atlaskit/react-ufo 4.1.8 → 4.1.9

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.1.9
+
+### Patch Changes
+
+- [#192603](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/192603)
+  [`75c6397ec21b6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/75c6397ec21b6) -
+  Clean fg observer per interaction
+
 ## 4.1.8
 
 ### Patch Changes

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

@@ -11,7 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _config = require("../../config");
 var _interactionMetrics = require("../../interaction-metrics");
-var _vc = require("../../vc");
 var _getInteractionStatus = _interopRequireDefault(require("./get-interaction-status"));
 var _getPageVisibilityUpToTtai = _interopRequireDefault(require("./get-page-visibility-up-to-ttai"));
 var _getSsrDoneTimeValue = _interopRequireDefault(require("./get-ssr-done-time-value"));
@@ -22,7 +21,7 @@ function getVCMetrics(_x) {
 }
 function _getVCMetrics() {
   _getVCMetrics = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(interaction) {
-    var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _config$vc2, _config$vc3, _config$experimentalI, _result$ufoVcRev;
+    var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _config$vc2, _config$vc3, _result$ufoVcRev;
     var config, interactionStatus, pageVisibilityUpToTTAI, shouldReportVCMetrics, observer, isSSREnabled, ssr, tti, prefix, result, mostRecentVCRevision, mostRecentVCRevisionPayload;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -56,14 +55,20 @@ function _getVCMetrics() {
           interactionStatus = (0, _getInteractionStatus.default)(interaction);
           pageVisibilityUpToTTAI = (0, _getPageVisibilityUpToTtai.default)(interaction);
           shouldReportVCMetrics = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && pageVisibilityUpToTTAI === 'visible'; // Use per-interaction VC observer if available, otherwise fall back to global
-          observer = interaction.vcObserver || (0, _vc.getVCObserver)();
+          observer = interaction.vcObserver;
+          if (observer) {
+            _context.next = 16;
+            break;
+          }
+          return _context.abrupt("return", {});
+        case 16:
           if (!(!shouldReportVCMetrics && (0, _platformFeatureFlags.fg)('platform_ufo_no_vc_on_aborted'))) {
-            _context.next = 17;
+            _context.next = 19;
             break;
           }
           observer.stop(interaction.ufoName);
           return _context.abrupt("return", {});
-        case 17:
+        case 19:
           isSSREnabled = interaction.type === 'page_load' && ((config === null || config === void 0 ? void 0 : config.ssr) || (config === null || config === void 0 || (_config$vc$ssrWhiteli = config.vc.ssrWhitelist) === null || _config$vc$ssrWhiteli === void 0 ? void 0 : _config$vc$ssrWhiteli.includes(interaction.ufoName)));
           ssr = interaction.type === 'page_load' && isSSREnabled ? {
             ssr: (0, _getSsrDoneTimeValue.default)(config)
@@ -71,7 +76,7 @@ function _getVCMetrics() {
           _interactionMetrics.postInteractionLog.setVCObserverSSRConfig(ssr);
           tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime;
           prefix = 'ufo';
-          _context.next = 24;
+          _context.next = 26;
           return observer.getVCResult(_objectSpread({
             start: interaction.start,
             stop: interaction.end,
@@ -84,14 +89,9 @@ function _getVCMetrics() {
             interactionId: interaction.id,
             includeSSRRatio: (_config$vc3 = config.vc) === null || _config$vc3 === void 0 ? void 0 : _config$vc3.includeSSRRatio
           }, ssr));
-        case 24:
+        case 26:
           result = _context.sent;
-          if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_vc_observer_per_interaction')) {
-            observer.stop(interaction.ufoName);
-          }
-          if ((_config$experimentalI = config.experimentalInteractionMetrics) !== null && _config$experimentalI !== void 0 && _config$experimentalI.enabled) {
-            observer.stop(interaction.ufoName);
-          }
+          observer.stop(interaction.ufoName);
           _interactionMetrics.postInteractionLog.setLastInteractionFinishVCResult(result);
           mostRecentVCRevision = (0, _config.getMostRecentVCRevision)(interaction.ufoName);
           mostRecentVCRevisionPayload = result === null || result === void 0 || (_result$ufoVcRev = result['ufo:vc:rev']) === null || _result$ufoVcRev === void 0 ? void 0 : _result$ufoVcRev.find(function (_ref) {
@@ -99,15 +99,15 @@ function _getVCMetrics() {
             return revision === mostRecentVCRevision;
           });
           if (!(!shouldReportVCMetrics || !(mostRecentVCRevisionPayload !== null && mostRecentVCRevisionPayload !== void 0 && mostRecentVCRevisionPayload.clean))) {
-            _context.next = 32;
+            _context.next = 33;
             break;
           }
           return _context.abrupt("return", result);
-        case 32:
+        case 33:
           return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
             'metric:vc90': mostRecentVCRevisionPayload['metric:vc90']
           }));
-        case 33:
+        case 34:
         case "end":
           return _context.stop();
       }

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

@@ -569,8 +569,10 @@ function finishInteraction(id, data) {
   callCleanUpCallbacks(data);
   if ((_getConfig4 = (0, _config.getConfig)()) !== null && _getConfig4 !== void 0 && (_getConfig4 = _getConfig4.vc) !== null && _getConfig4 !== void 0 && _getConfig4.stopVCAtInteractionFinish) {
     // Use per-interaction VC observer if available, otherwise fall back to global
-    var observer = data.vcObserver || (0, _vc.getVCObserver)();
-    data.vc = observer.getVCRawData();
+    var observer = data.vcObserver;
+    if (observer) {
+      data.vc = observer.getVCRawData();
+    }
   }
   if (!((_getConfig5 = (0, _config.getConfig)()) !== null && _getConfig5 !== void 0 && (_getConfig5 = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5 !== void 0 && _getConfig5.enabled)) {
     remove(id);
@@ -817,7 +819,7 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
       ssrEnablePageLayoutPlaceholder: config.vc.ssrEnablePageLayoutPlaceholder,
       disableSizeAndPositionCheck: config.vc.disableSizeAndPositionCheck
     };
-    vcObserver = (0, _platformFeatureFlags.fg)('platform_ufo_enable_vc_observer_per_interaction') ? (0, _vc.newVCObserver)(vcOptions) : undefined;
+    vcObserver = (0, _vc.newVCObserver)(vcOptions);
   }
 
   // Create per-interaction VC observer when feature flag is enabled
@@ -894,31 +896,33 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
   }
   if (type === 'transition' || type === 'page_load') {
     // Use per-interaction VC observer if available, otherwise fall back to global
-    var observer = vcObserver || (0, _vc.getVCObserver)();
-    observer.start({
-      startTime: startTime,
-      experienceKey: ufoName
-    });
-    if (type === 'transition' || (0, _platformFeatureFlags.fg)('platform_ufo_enable_vc_observer_per_interaction')) {
-      if ((0, _coinflip.default)((0, _config.getPostInteractionRate)(routeName || ufoName, type))) {
-        postInteractionLog.startVCObserver({
-          startTime: startTime
-        });
-      }
-      if ((0, _coinflip.default)((0, _config.getExperimentalInteractionRate)(ufoName, type))) {
-        _createExperimentalInteractionMetricsPayload.experimentalVC.start({
-          startTime: startTime
-        });
-      }
+    var observer = vcObserver;
+    if (observer) {
+      observer.start({
+        startTime: startTime,
+        experienceKey: ufoName
+      });
+    }
+    if ((0, _coinflip.default)((0, _config.getPostInteractionRate)(routeName || ufoName, type))) {
+      postInteractionLog.startVCObserver({
+        startTime: startTime
+      });
+    }
+    if ((0, _coinflip.default)((0, _config.getExperimentalInteractionRate)(ufoName, type))) {
+      _createExperimentalInteractionMetricsPayload.experimentalVC.start({
+        startTime: startTime
+      });
     }
   }
   if (type === 'press' && (0, _platformFeatureFlags.fg)('platform_ufo_enable_vc_press_interactions')) {
     // Use per-interaction VC observer if available, otherwise fall back to global
-    var _observer = vcObserver || (0, _vc.getVCObserver)();
-    _observer.start({
-      startTime: startTime,
-      experienceKey: ufoName
-    });
+    var _observer = vcObserver;
+    if (_observer) {
+      _observer.start({
+        startTime: startTime,
+        experienceKey: ufoName
+      });
+    }
   }
 }
 function addBrowserMetricEvent(event) {

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

@@ -15,7 +15,6 @@ var _hiddenTiming = require("../hidden-timing");
 var _interactionMetrics = require("../interaction-metrics");
 var _interactionsPerformanceObserver = require("../interactions-performance-observer");
 var _machineUtilisation = require("../machine-utilisation");
-var _vc = require("../vc");
 var _scheduleIdleCallback = _interopRequireDefault(require("./schedule-idle-callback"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != (0, _typeof2.default)(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var initialized = false;
@@ -105,17 +104,6 @@ function init(analyticsWebClientAsync, config) {
         startTime: 0
       });
     }
-    if (!(0, _platformFeatureFlags.fg)('platform_ufo_enable_vc_observer_per_interaction')) {
-      var _config$postInteracti;
-      (0, _vc.getVCObserver)(vcOptions).start({
-        startTime: 0
-      });
-      if ((_config$postInteracti = config.postInteractionLog) !== null && _config$postInteracti !== void 0 && _config$postInteracti.enabled) {
-        _interactionMetrics.postInteractionLog.startVCObserver({
-          startTime: 0
-        });
-      }
-    }
   }
   (0, _hiddenTiming.setupHiddenTimingCapture)();
   (0, _additionalPayload.startLighthouseObserver)();
@@ -141,23 +129,23 @@ function init(analyticsWebClientAsync, config) {
       createPostInteractionLogPayloadPackage = _ref2[2];
     if (awc.getAnalyticsWebClientPromise) {
       awc.getAnalyticsWebClientPromise().then(function (client) {
-        var _config$experimentalI2, _config$postInteracti2;
+        var _config$experimentalI2, _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$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
+        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$postInteracti3;
+      var _config$experimentalI3, _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$postInteracti3 = config.postInteractionLog) !== null && _config$postInteracti3 !== void 0 && _config$postInteracti3.enabled) {
+      if ((_config$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
         sinkPostInteractionLog(awc, createPostInteractionLogPayloadPackage.default);
       }
     }

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

@@ -1,12 +1,11 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import { getConfig, getMostRecentVCRevision } from '../../config';
 import { postInteractionLog } from '../../interaction-metrics';
-import { getVCObserver } from '../../vc';
 import getInteractionStatus from './get-interaction-status';
 import getPageVisibilityUpToTTAI from './get-page-visibility-up-to-ttai';
 import getSSRDoneTimeValue from './get-ssr-done-time-value';
 async function getVCMetrics(interaction) {
-  var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _interaction$apdex$, _config$vc2, _config$vc3, _config$experimentalI, _result$ufoVcRev;
+  var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _interaction$apdex$, _config$vc2, _config$vc3, _result$ufoVcRev;
   const config = getConfig();
   if (!(config !== null && config !== void 0 && (_config$vc = config.vc) !== null && _config$vc !== void 0 && _config$vc.enabled)) {
     return {};
@@ -25,7 +24,10 @@ async function getVCMetrics(interaction) {
   const shouldReportVCMetrics = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && pageVisibilityUpToTTAI === 'visible';
 
   // Use per-interaction VC observer if available, otherwise fall back to global
-  const observer = interaction.vcObserver || getVCObserver();
+  const observer = interaction.vcObserver;
+  if (!observer) {
+    return {};
+  }
   if (!shouldReportVCMetrics && fg('platform_ufo_no_vc_on_aborted')) {
     observer.stop(interaction.ufoName);
     return {};
@@ -50,12 +52,7 @@ async function getVCMetrics(interaction) {
     includeSSRRatio: (_config$vc3 = config.vc) === null || _config$vc3 === void 0 ? void 0 : _config$vc3.includeSSRRatio,
     ...ssr
   });
-  if (fg('platform_ufo_enable_vc_observer_per_interaction')) {
-    observer.stop(interaction.ufoName);
-  }
-  if ((_config$experimentalI = config.experimentalInteractionMetrics) !== null && _config$experimentalI !== void 0 && _config$experimentalI.enabled) {
-    observer.stop(interaction.ufoName);
-  }
+  observer.stop(interaction.ufoName);
   postInteractionLog.setLastInteractionFinishVCResult(result);
   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(({

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

@@ -6,7 +6,7 @@ import { experimentalVC, getExperimentalVCMetrics, onExperimentalInteractionComp
 import { clearActiveTrace } from '../experience-trace-id-context';
 import { allFeatureFlagsAccessed, currentFeatureFlagsAccessed } from '../feature-flags-accessed';
 import { getInteractionId } from '../interaction-id-context';
-import { getVCObserver, newVCObserver } from '../vc';
+import { newVCObserver } from '../vc';
 import { interactions } from './common/constants';
 import PostInteractionLog from './post-interaction-log';
 const PreviousInteractionLog = {
@@ -487,8 +487,10 @@ function finishInteraction(id, data, endTime = performance.now()) {
   callCleanUpCallbacks(data);
   if ((_getConfig4 = getConfig()) !== null && _getConfig4 !== void 0 && (_getConfig4$vc = _getConfig4.vc) !== null && _getConfig4$vc !== void 0 && _getConfig4$vc.stopVCAtInteractionFinish) {
     // Use per-interaction VC observer if available, otherwise fall back to global
-    const observer = data.vcObserver || getVCObserver();
-    data.vc = observer.getVCRawData();
+    const observer = data.vcObserver;
+    if (observer) {
+      data.vc = observer.getVCRawData();
+    }
   }
   if (!((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5$experimen = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5$experimen !== void 0 && _getConfig5$experimen.enabled)) {
     remove(id);
@@ -692,7 +694,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
       ssrEnablePageLayoutPlaceholder: config.vc.ssrEnablePageLayoutPlaceholder,
       disableSizeAndPositionCheck: config.vc.disableSizeAndPositionCheck
     };
-    vcObserver = fg('platform_ufo_enable_vc_observer_per_interaction') ? newVCObserver(vcOptions) : undefined;
+    vcObserver = newVCObserver(vcOptions);
   }
 
   // Create per-interaction VC observer when feature flag is enabled
@@ -769,31 +771,33 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
   }
   if (type === 'transition' || type === 'page_load') {
     // Use per-interaction VC observer if available, otherwise fall back to global
-    const observer = vcObserver || getVCObserver();
-    observer.start({
-      startTime,
-      experienceKey: ufoName
-    });
-    if (type === 'transition' || fg('platform_ufo_enable_vc_observer_per_interaction')) {
-      if (coinflip(getPostInteractionRate(routeName || ufoName, type))) {
-        postInteractionLog.startVCObserver({
-          startTime
-        });
-      }
-      if (coinflip(getExperimentalInteractionRate(ufoName, type))) {
-        experimentalVC.start({
-          startTime
-        });
-      }
+    const observer = vcObserver;
+    if (observer) {
+      observer.start({
+        startTime,
+        experienceKey: ufoName
+      });
+    }
+    if (coinflip(getPostInteractionRate(routeName || ufoName, type))) {
+      postInteractionLog.startVCObserver({
+        startTime
+      });
+    }
+    if (coinflip(getExperimentalInteractionRate(ufoName, type))) {
+      experimentalVC.start({
+        startTime
+      });
     }
   }
   if (type === 'press' && fg('platform_ufo_enable_vc_press_interactions')) {
     // Use per-interaction VC observer if available, otherwise fall back to global
-    const observer = vcObserver || getVCObserver();
-    observer.start({
-      startTime,
-      experienceKey: ufoName
-    });
+    const observer = vcObserver;
+    if (observer) {
+      observer.start({
+        startTime,
+        experienceKey: ufoName
+      });
+    }
   }
 }
 export function addBrowserMetricEvent(event) {

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

@@ -6,7 +6,6 @@ import { setupHiddenTimingCapture } from '../hidden-timing';
 import { postInteractionLog, sinkInteractionHandler, sinkPostInteractionLogHandler } from '../interaction-metrics';
 import { getPerformanceObserver } from '../interactions-performance-observer';
 import { initialiseMemoryObserver, initialisePressureObserver } from '../machine-utilisation';
-import { getVCObserver } from '../vc';
 import scheduleIdleCallback from './schedule-idle-callback';
 let initialized = false;
 function sinkInteraction(instance, payloadPackage) {
@@ -95,17 +94,6 @@ export function init(analyticsWebClientAsync, config) {
         startTime: 0
       });
     }
-    if (!fg('platform_ufo_enable_vc_observer_per_interaction')) {
-      var _config$postInteracti;
-      getVCObserver(vcOptions).start({
-        startTime: 0
-      });
-      if ((_config$postInteracti = config.postInteractionLog) !== null && _config$postInteracti !== void 0 && _config$postInteracti.enabled) {
-        postInteractionLog.startVCObserver({
-          startTime: 0
-        });
-      }
-    }
   }
   setupHiddenTimingCapture();
   startLighthouseObserver();
@@ -123,23 +111,23 @@ export function init(analyticsWebClientAsync, config) {
   Promise.all([analyticsWebClientAsync, import( /* webpackChunkName: "create-payloads" */'../create-payload'), import( /* webpackChunkName: "create-post-interaction-log-payload" */'../create-post-interaction-log-payload')]).then(([awc, payloadPackage, createPostInteractionLogPayloadPackage]) => {
     if (awc.getAnalyticsWebClientPromise) {
       awc.getAnalyticsWebClientPromise().then(client => {
-        var _config$experimentalI2, _config$postInteracti2;
+        var _config$experimentalI2, _config$postInteracti;
         const 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$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
+        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$postInteracti3;
+      var _config$experimentalI3, _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$postInteracti3 = config.postInteractionLog) !== null && _config$postInteracti3 !== void 0 && _config$postInteracti3.enabled) {
+      if ((_config$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
         sinkPostInteractionLog(awc, createPostInteractionLogPayloadPackage.default);
       }
     }

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

@@ -6,7 +6,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { fg } from '@atlaskit/platform-feature-flags';
 import { getConfig, getMostRecentVCRevision } from '../../config';
 import { postInteractionLog } from '../../interaction-metrics';
-import { getVCObserver } from '../../vc';
 import getInteractionStatus from './get-interaction-status';
 import getPageVisibilityUpToTTAI from './get-page-visibility-up-to-ttai';
 import getSSRDoneTimeValue from './get-ssr-done-time-value';
@@ -15,7 +14,7 @@ function getVCMetrics(_x) {
 }
 function _getVCMetrics() {
   _getVCMetrics = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(interaction) {
-    var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _config$vc2, _config$vc3, _config$experimentalI, _result$ufoVcRev;
+    var _config$vc, _config$vc$ssrWhiteli, _interaction$apdex, _config$vc2, _config$vc3, _result$ufoVcRev;
     var config, interactionStatus, pageVisibilityUpToTTAI, shouldReportVCMetrics, observer, isSSREnabled, ssr, tti, prefix, result, mostRecentVCRevision, mostRecentVCRevisionPayload;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -49,14 +48,20 @@ function _getVCMetrics() {
           interactionStatus = getInteractionStatus(interaction);
           pageVisibilityUpToTTAI = getPageVisibilityUpToTTAI(interaction);
           shouldReportVCMetrics = interactionStatus.originalInteractionStatus === 'SUCCEEDED' && pageVisibilityUpToTTAI === 'visible'; // Use per-interaction VC observer if available, otherwise fall back to global
-          observer = interaction.vcObserver || getVCObserver();
+          observer = interaction.vcObserver;
+          if (observer) {
+            _context.next = 16;
+            break;
+          }
+          return _context.abrupt("return", {});
+        case 16:
           if (!(!shouldReportVCMetrics && fg('platform_ufo_no_vc_on_aborted'))) {
-            _context.next = 17;
+            _context.next = 19;
             break;
           }
           observer.stop(interaction.ufoName);
           return _context.abrupt("return", {});
-        case 17:
+        case 19:
           isSSREnabled = interaction.type === 'page_load' && ((config === null || config === void 0 ? void 0 : config.ssr) || (config === null || config === void 0 || (_config$vc$ssrWhiteli = config.vc.ssrWhitelist) === null || _config$vc$ssrWhiteli === void 0 ? void 0 : _config$vc$ssrWhiteli.includes(interaction.ufoName)));
           ssr = interaction.type === 'page_load' && isSSREnabled ? {
             ssr: getSSRDoneTimeValue(config)
@@ -64,7 +69,7 @@ function _getVCMetrics() {
           postInteractionLog.setVCObserverSSRConfig(ssr);
           tti = (_interaction$apdex = interaction.apdex) === null || _interaction$apdex === void 0 || (_interaction$apdex = _interaction$apdex[0]) === null || _interaction$apdex === void 0 ? void 0 : _interaction$apdex.stopTime;
           prefix = 'ufo';
-          _context.next = 24;
+          _context.next = 26;
           return observer.getVCResult(_objectSpread({
             start: interaction.start,
             stop: interaction.end,
@@ -77,14 +82,9 @@ function _getVCMetrics() {
             interactionId: interaction.id,
             includeSSRRatio: (_config$vc3 = config.vc) === null || _config$vc3 === void 0 ? void 0 : _config$vc3.includeSSRRatio
           }, ssr));
-        case 24:
+        case 26:
           result = _context.sent;
-          if (fg('platform_ufo_enable_vc_observer_per_interaction')) {
-            observer.stop(interaction.ufoName);
-          }
-          if ((_config$experimentalI = config.experimentalInteractionMetrics) !== null && _config$experimentalI !== void 0 && _config$experimentalI.enabled) {
-            observer.stop(interaction.ufoName);
-          }
+          observer.stop(interaction.ufoName);
           postInteractionLog.setLastInteractionFinishVCResult(result);
           mostRecentVCRevision = getMostRecentVCRevision(interaction.ufoName);
           mostRecentVCRevisionPayload = result === null || result === void 0 || (_result$ufoVcRev = result['ufo:vc:rev']) === null || _result$ufoVcRev === void 0 ? void 0 : _result$ufoVcRev.find(function (_ref) {
@@ -92,15 +92,15 @@ function _getVCMetrics() {
             return revision === mostRecentVCRevision;
           });
           if (!(!shouldReportVCMetrics || !(mostRecentVCRevisionPayload !== null && mostRecentVCRevisionPayload !== void 0 && mostRecentVCRevisionPayload.clean))) {
-            _context.next = 32;
+            _context.next = 33;
             break;
           }
           return _context.abrupt("return", result);
-        case 32:
+        case 33:
           return _context.abrupt("return", _objectSpread(_objectSpread({}, result), {}, {
             'metric:vc90': mostRecentVCRevisionPayload['metric:vc90']
           }));
-        case 33:
+        case 34:
         case "end":
           return _context.stop();
       }

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

@@ -16,7 +16,7 @@ import { experimentalVC, getExperimentalVCMetrics, onExperimentalInteractionComp
 import { clearActiveTrace } from '../experience-trace-id-context';
 import { allFeatureFlagsAccessed, currentFeatureFlagsAccessed } from '../feature-flags-accessed';
 import { getInteractionId } from '../interaction-id-context';
-import { getVCObserver, newVCObserver } from '../vc';
+import { newVCObserver } from '../vc';
 import { interactions } from './common/constants';
 import PostInteractionLog from './post-interaction-log';
 var PreviousInteractionLog = {
@@ -523,8 +523,10 @@ function finishInteraction(id, data) {
   callCleanUpCallbacks(data);
   if ((_getConfig4 = getConfig()) !== null && _getConfig4 !== void 0 && (_getConfig4 = _getConfig4.vc) !== null && _getConfig4 !== void 0 && _getConfig4.stopVCAtInteractionFinish) {
     // Use per-interaction VC observer if available, otherwise fall back to global
-    var observer = data.vcObserver || getVCObserver();
-    data.vc = observer.getVCRawData();
+    var observer = data.vcObserver;
+    if (observer) {
+      data.vc = observer.getVCRawData();
+    }
   }
   if (!((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5 = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5 !== void 0 && _getConfig5.enabled)) {
     remove(id);
@@ -771,7 +773,7 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
       ssrEnablePageLayoutPlaceholder: config.vc.ssrEnablePageLayoutPlaceholder,
       disableSizeAndPositionCheck: config.vc.disableSizeAndPositionCheck
     };
-    vcObserver = fg('platform_ufo_enable_vc_observer_per_interaction') ? newVCObserver(vcOptions) : undefined;
+    vcObserver = newVCObserver(vcOptions);
   }
 
   // Create per-interaction VC observer when feature flag is enabled
@@ -848,31 +850,33 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
   }
   if (type === 'transition' || type === 'page_load') {
     // Use per-interaction VC observer if available, otherwise fall back to global
-    var observer = vcObserver || getVCObserver();
-    observer.start({
-      startTime: startTime,
-      experienceKey: ufoName
-    });
-    if (type === 'transition' || fg('platform_ufo_enable_vc_observer_per_interaction')) {
-      if (coinflip(getPostInteractionRate(routeName || ufoName, type))) {
-        postInteractionLog.startVCObserver({
-          startTime: startTime
-        });
-      }
-      if (coinflip(getExperimentalInteractionRate(ufoName, type))) {
-        experimentalVC.start({
-          startTime: startTime
-        });
-      }
+    var observer = vcObserver;
+    if (observer) {
+      observer.start({
+        startTime: startTime,
+        experienceKey: ufoName
+      });
+    }
+    if (coinflip(getPostInteractionRate(routeName || ufoName, type))) {
+      postInteractionLog.startVCObserver({
+        startTime: startTime
+      });
+    }
+    if (coinflip(getExperimentalInteractionRate(ufoName, type))) {
+      experimentalVC.start({
+        startTime: startTime
+      });
     }
   }
   if (type === 'press' && fg('platform_ufo_enable_vc_press_interactions')) {
     // Use per-interaction VC observer if available, otherwise fall back to global
-    var _observer = vcObserver || getVCObserver();
-    _observer.start({
-      startTime: startTime,
-      experienceKey: ufoName
-    });
+    var _observer = vcObserver;
+    if (_observer) {
+      _observer.start({
+        startTime: startTime,
+        experienceKey: ufoName
+      });
+    }
   }
 }
 export function addBrowserMetricEvent(event) {

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

@@ -7,7 +7,6 @@ import { setupHiddenTimingCapture } from '../hidden-timing';
 import { postInteractionLog, sinkInteractionHandler, sinkPostInteractionLogHandler } from '../interaction-metrics';
 import { getPerformanceObserver } from '../interactions-performance-observer';
 import { initialiseMemoryObserver, initialisePressureObserver } from '../machine-utilisation';
-import { getVCObserver } from '../vc';
 import scheduleIdleCallback from './schedule-idle-callback';
 var initialized = false;
 function sinkInteraction(instance, payloadPackage) {
@@ -96,17 +95,6 @@ export function init(analyticsWebClientAsync, config) {
         startTime: 0
       });
     }
-    if (!fg('platform_ufo_enable_vc_observer_per_interaction')) {
-      var _config$postInteracti;
-      getVCObserver(vcOptions).start({
-        startTime: 0
-      });
-      if ((_config$postInteracti = config.postInteractionLog) !== null && _config$postInteracti !== void 0 && _config$postInteracti.enabled) {
-        postInteractionLog.startVCObserver({
-          startTime: 0
-        });
-      }
-    }
   }
   setupHiddenTimingCapture();
   startLighthouseObserver();
@@ -128,23 +116,23 @@ export function init(analyticsWebClientAsync, config) {
       createPostInteractionLogPayloadPackage = _ref2[2];
     if (awc.getAnalyticsWebClientPromise) {
       awc.getAnalyticsWebClientPromise().then(function (client) {
-        var _config$experimentalI2, _config$postInteracti2;
+        var _config$experimentalI2, _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$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
+        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$postInteracti3;
+      var _config$experimentalI3, _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$postInteracti3 = config.postInteractionLog) !== null && _config$postInteracti3 !== void 0 && _config$postInteracti3.enabled) {
+      if ((_config$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
         sinkPostInteractionLog(awc, createPostInteractionLogPayloadPackage.default);
       }
     }

package/dist/types/create-post-interaction-log-payload/index.d.ts

@@ -27,10 +27,10 @@ declare function createPostInteractionLogPayload({ lastInteractionFinish, reactP
                     vcClean: boolean;
                     type: import("../common").InteractionType;
                     abortReason?: import("../common").AbortReasonType | undefined;
-                    id: string;
-                    errors: import("../common").InteractionError[];
-                    abortedByInteractionName?: string | undefined;
                     routeName: string | null;
+                    abortedByInteractionName?: string | undefined;
+                    errors: import("../common").InteractionError[];
+                    id: string;
                     experimentalTTAI?: number | undefined;
                     experimentalVC90?: number | undefined;
                 };

package/dist/types-ts4.5/create-post-interaction-log-payload/index.d.ts

@@ -27,10 +27,10 @@ declare function createPostInteractionLogPayload({ lastInteractionFinish, reactP
                     vcClean: boolean;
                     type: import("../common").InteractionType;
                     abortReason?: import("../common").AbortReasonType | undefined;
-                    id: string;
-                    errors: import("../common").InteractionError[];
-                    abortedByInteractionName?: string | undefined;
                     routeName: string | null;
+                    abortedByInteractionName?: string | undefined;
+                    errors: import("../common").InteractionError[];
+                    id: string;
                     experimentalTTAI?: number | undefined;
                     experimentalVC90?: number | undefined;
                 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.1.8",
+	"version": "4.1.9",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -189,9 +189,6 @@
 		"platform_ufo_enable_vc_press_interactions": {
 			"type": "boolean"
 		},
-		"platform_ufo_enable_vc_observer_per_interaction": {
-			"type": "boolean"
-		},
 		"platform_ufo_abort_measurement_fix": {
 			"type": "boolean"
 		},