@atlaskit/react-ufo 4.11.1 → 4.11.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.11.3
+
+### Patch Changes
+
+- [`be9b699c35606`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/be9b699c35606) -
+  deprecate UFO segment highlighting
+
+## 4.11.2
+
+### Patch Changes
+
+- [`2237400c3b932`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2237400c3b932) -
+  FG cleanup - platform_ufo_unify_abort_status_in_ttvc_debug_data
+
 ## 4.11.1
 
 ### Patch Changes

package/dist/cjs/create-interaction-extra-metrics-payload/index.js

@@ -31,13 +31,13 @@ var _interactionMetrics = require("../interaction-metrics");
 var _excluded = ["labelStack"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function createInteractionExtraLogPayload(_x, _x2) {
+function createInteractionExtraLogPayload(_x, _x2, _x3, _x4) {
   return _createInteractionExtraLogPayload.apply(this, arguments);
 }
 function _createInteractionExtraLogPayload() {
-  _createInteractionExtraLogPayload = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(interactionId, interaction) {
-    var _getTTAI, _window$location;
-    var config, end, start, ufoName, rate, type, abortReason, routeName, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, knownSegments, sanitisedUfoName, configRate, pageVisibilityAtTTAI, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTAI, extraTTAI, newUFOName, finalVCMetrics, vcRevisionPayload, effectiveVCRevisionPayload, isThirdParty, filteredData, getDetailedInteractionMetrics, segments3p, segmentTree, payload;
+  _createInteractionExtraLogPayload = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(interactionId, interaction, lastInteractionFinish, lastInteractionFinishVCResult) {
+    var _getTTAI, _lastInteractionFinis, _getTTAI2, _window$location;
+    var config, end, start, ufoName, rate, type, abortReason, routeName, previousInteractionName, isPreviousInteractionAborted, abortedByInteractionName, knownSegments, minorInteractions, sanitisedUfoName, configRate, pageVisibilityAtTTAI, isPageLoad, calculatePageVisibilityFromTheStartOfPageLoad, moreAccuratePageVisibilityAtTTAI, extraTTAI, newUFOName, finalVCMetrics, vcRevisionPayload, effectiveVCRevisionPayload, normalTTAI, lastInteractionFinishStart, lastInteractionFinishEnd, lastInteractionFinishVC90, lastInteractionFinishVCClean, lastInteractionFinishVCRev, lastInteractionFinishRevision, isThirdParty, filteredData, getDetailedInteractionMetrics, segments3p, segmentTree, payload;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -48,7 +48,7 @@ function _createInteractionExtraLogPayload() {
           }
           throw Error('UFO Configuration not provided');
         case 3:
-          end = interaction.end, start = interaction.start, ufoName = interaction.ufoName, rate = interaction.rate, type = interaction.type, abortReason = interaction.abortReason, routeName = interaction.routeName, previousInteractionName = interaction.previousInteractionName, isPreviousInteractionAborted = interaction.isPreviousInteractionAborted, abortedByInteractionName = interaction.abortedByInteractionName, knownSegments = interaction.knownSegments;
+          end = interaction.end, start = interaction.start, ufoName = interaction.ufoName, rate = interaction.rate, type = interaction.type, abortReason = interaction.abortReason, routeName = interaction.routeName, previousInteractionName = interaction.previousInteractionName, isPreviousInteractionAborted = interaction.isPreviousInteractionAborted, abortedByInteractionName = interaction.abortedByInteractionName, knownSegments = interaction.knownSegments, minorInteractions = interaction.minorInteractions;
           sanitisedUfoName = (0, _utils.sanitizeUfoName)(ufoName);
           configRate = (0, _config.getExtraInteractionRate)(sanitisedUfoName, type);
           if ((0, _coinflip.default)(configRate)) {
@@ -59,7 +59,7 @@ function _createInteractionExtraLogPayload() {
         case 8:
           pageVisibilityAtTTAI = (0, _getPageVisibilityUpToTtai.default)(interaction);
           isPageLoad = type === 'page_load' || type === 'transition';
-          if (isPageLoad) {
+          if (!(!isPageLoad || minorInteractions !== undefined && minorInteractions.length > 0)) {
             _context.next = 12;
             break;
           }
@@ -85,6 +85,46 @@ function _createInteractionExtraLogPayload() {
           }
           return _context.abrupt("return", null);
         case 23:
+          if (!(!lastInteractionFinish || lastInteractionFinish !== null && lastInteractionFinish !== void 0 && lastInteractionFinish.abortReason || lastInteractionFinish !== null && lastInteractionFinish !== void 0 && (_lastInteractionFinis = lastInteractionFinish.errors) !== null && _lastInteractionFinis !== void 0 && _lastInteractionFinis.length)) {
+            _context.next = 25;
+            break;
+          }
+          return _context.abrupt("return", null);
+        case 25:
+          normalTTAI = (_getTTAI2 = (0, _getTtai.default)(lastInteractionFinish)) !== null && _getTTAI2 !== void 0 ? _getTTAI2 : undefined;
+          lastInteractionFinishStart = typeof lastInteractionFinish.start === 'number' ? Math.round(lastInteractionFinish.start) : undefined;
+          lastInteractionFinishEnd = typeof lastInteractionFinish.end === 'number' ? Math.round(lastInteractionFinish.end) : undefined;
+          lastInteractionFinishVC90 = null;
+          lastInteractionFinishVCClean = false;
+          if (!lastInteractionFinishVCResult) {
+            _context.next = 41;
+            break;
+          }
+          lastInteractionFinishVCRev = lastInteractionFinishVCResult['ufo:vc:rev'];
+          lastInteractionFinishRevision = lastInteractionFinishVCRev === null || lastInteractionFinishVCRev === void 0 ? void 0 : lastInteractionFinishVCRev.find(function (_ref2) {
+            var revision = _ref2.revision;
+            return revision === _config.DEFAULT_TTVC_REVISION;
+          });
+          if (!(lastInteractionFinishRevision !== null && lastInteractionFinishRevision !== void 0 && lastInteractionFinishRevision.clean)) {
+            _context.next = 38;
+            break;
+          }
+          lastInteractionFinishVCClean = true;
+          lastInteractionFinishVC90 = lastInteractionFinishRevision['metric:vc90'];
+          _context.next = 39;
+          break;
+        case 38:
+          return _context.abrupt("return", null);
+        case 39:
+          _context.next = 42;
+          break;
+        case 41:
+          if (normalTTAI !== undefined && typeof normalTTAI === 'number' && normalTTAI === extraTTAI) {
+            // Because TTAI is equal between with and without 3p, we can assume VC90 is also equal
+            lastInteractionFinishVC90 = effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90'];
+            lastInteractionFinishVCClean = effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload.clean;
+          }
+        case 42:
           // Helper function to check if labelStack contains third-party type
           isThirdParty = function isThirdParty(labelStack) {
             var _labelStack$some;
@@ -127,9 +167,9 @@ function _createInteractionExtraLogPayload() {
           getDetailedInteractionMetrics = function getDetailedInteractionMetrics() {
             var _interaction$hold3pIn;
             return {
-              errors: filteredData.errors.map(function (_ref2) {
-                var labelStack = _ref2.labelStack,
-                  others = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+              errors: filteredData.errors.map(function (_ref3) {
+                var labelStack = _ref3.labelStack,
+                  others = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
                 return _objectSpread(_objectSpread({}, others), {}, {
                   labelStack: labelStack && (0, _utils.optimizeLabelStack)(labelStack, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type))
                 });
@@ -190,13 +230,20 @@ function _createInteractionExtraLogPayload() {
                   reactProfilerTimings: (0, _optimizeReactProfilerTimings.optimizeReactProfilerTimings)(filteredData.reactProfilerTimings, start, (0, _getReactUfoPayloadVersion.getReactUFOPayloadVersion)(interaction.type)),
                   customData: filteredData.customData
                 }, getDetailedInteractionMetrics()),
-                'vc:effective:revision': _config.DEFAULT_TTVC_REVISION
+                'vc:effective:revision': _config.DEFAULT_TTVC_REVISION,
+                lastInteractionFinish: {
+                  start: lastInteractionFinishStart,
+                  end: lastInteractionFinishEnd,
+                  ttai: normalTTAI,
+                  vc90: lastInteractionFinishVC90,
+                  vcClean: lastInteractionFinishVCClean
+                }
               }
             }
           };
           payload.attributes.properties['event:sizeInKb'] = (0, _getPayloadSize.default)(payload.attributes.properties);
           return _context.abrupt("return", payload);
-        case 32:
+        case 51:
         case "end":
           return _context.stop();
       }

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

@@ -97,6 +97,7 @@ function _getVCMetrics() {
           if (!include3p) {
             // For Post Interaction, last interaction should be without 3p
             _interactionMetrics.postInteractionLog.setLastInteractionFinishVCResult(result);
+            _interactionMetrics.interactionExtraMetrics.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) {

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

@@ -734,7 +734,8 @@ function finishInteraction(id, data) {
   PreviousInteractionLog.isAborted = data.abortReason != null;
   if (data.ufoName) {
     if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      if (interactionExtraMetrics.finishedInteractionId !== id) {
+      var _interactionExtraMetr;
+      if (((_interactionExtraMetr = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr === void 0 ? void 0 : _interactionExtraMetr.id) !== id) {
         // If this same interaction was not already handled, handle it
         handleInteraction(id, data);
       }
@@ -819,7 +820,7 @@ function tryComplete(interactionId, endTime) {
     var postInteraction = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _getConfig7;
-        var _getConfig8, experimentalVC90, experimentalTTAI, _yield$getExperimenta, start, end, _getConfig9, _getConfig0;
+        var _getConfig8, experimentalVC90, experimentalTTAI, _yield$getExperimenta, start, end, _interactionExtraMetr2, _getConfig9, _getConfig0;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -862,7 +863,7 @@ function tryComplete(interactionId, endTime) {
               }));
             case 17:
               if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-                if (interactionExtraMetrics.finishedInteractionId !== interactionId) {
+                if (((_interactionExtraMetr2 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr2 === void 0 ? void 0 : _interactionExtraMetr2.id) !== interactionId) {
                   // If interactionExtraMetrics is not waiting for measuring this interaction
                   if ((_getConfig9 = (0, _config.getConfig)()) !== null && _getConfig9 !== void 0 && (_getConfig9 = _getConfig9.experimentalInteractionMetrics) !== null && _getConfig9 !== void 0 && _getConfig9.enabled) {
                     remove(interactionId);
@@ -885,15 +886,15 @@ function tryComplete(interactionId, endTime) {
       };
     }();
     if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      var _interaction$hold3pAc;
+      var _interaction$hold3pAc, _interactionExtraMetr3;
       var noMoreActive3pHolds = ((_interaction$hold3pAc = interaction.hold3pActive) === null || _interaction$hold3pAc === void 0 ? void 0 : _interaction$hold3pAc.size) === 0 || interaction.hold3pActive === undefined;
-      if (noMoreActiveHolds && interactionExtraMetrics.finishedInteractionId !== interactionId) {
+      if (noMoreActiveHolds && ((_interactionExtraMetr3 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr3 === void 0 ? void 0 : _interactionExtraMetr3.id) !== interactionId) {
         // If it's not waiting for extra metrics to complete, finish the interaction as normal
         if (!activeSubmitted) {
           var _getConfig1, _getConfig10, _getConfig11;
           finishInteraction(interactionId, interaction, endTime);
           if ((_getConfig1 = (0, _config.getConfig)()) !== null && _getConfig1 !== void 0 && (_getConfig1 = _getConfig1.extraInteractionMetrics) !== null && _getConfig1 !== void 0 && _getConfig1.enabled) {
-            interactionExtraMetrics.updateFinishedInteractionId(interactionId);
+            interactionExtraMetrics.updateFinishedInteraction(interaction);
           }
           if ((_getConfig10 = (0, _config.getConfig)()) !== null && _getConfig10 !== void 0 && (_getConfig10 = _getConfig10.extraSearchPageInteraction) !== null && _getConfig10 !== void 0 && _getConfig10.enabled && interaction.ufoName === ((_getConfig11 = (0, _config.getConfig)()) === null || _getConfig11 === void 0 || (_getConfig11 = _getConfig11.extraSearchPageInteraction) === null || _getConfig11 === void 0 ? void 0 : _getConfig11.searchPageMetricName) && (0, _platformFeatureFlags.fg)('react_ufo_unified_search_ignoring_sain_metric')) {
             (0, _createExtraSearchPageInteractionPayload.onSearchPageInteractionComplete)(interactionId, interaction);

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

@@ -16,8 +16,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var InteractionExtraMetrics = exports.default = /*#__PURE__*/function () {
   function InteractionExtraMetrics() {
     (0, _classCallCheck2.default)(this, InteractionExtraMetrics);
-    // Store the finished interaction ID (as non-3p interaction)
-    (0, _defineProperty2.default)(this, "finishedInteractionId", null);
+    // Store the finished interaction (as non-3p interaction)
+    (0, _defineProperty2.default)(this, "finishedInteraction", null);
     // independent VC observer, that observes until `custom.post-interaction-logs` event is sent
     (0, _defineProperty2.default)(this, "vcObserver", null);
     (0, _defineProperty2.default)(this, "sinkHandlerFn", function () {});
@@ -55,12 +55,17 @@ var InteractionExtraMetrics = exports.default = /*#__PURE__*/function () {
       return (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'page_load' || (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'transition';
     }
   }, {
-    key: "updateFinishedInteractionId",
-    value: function updateFinishedInteractionId(interactionId) {
-      if (this.eligibleToMeasure(interactionId)) {
-        this.finishedInteractionId = interactionId;
+    key: "updateFinishedInteraction",
+    value: function updateFinishedInteraction(interaction) {
+      if ((interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'page_load' || (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'transition') {
+        this.finishedInteraction = interaction;
       }
     }
+  }, {
+    key: "setLastInteractionFinishVCResult",
+    value: function setLastInteractionFinishVCResult(result) {
+      this.lastInteractionFinishVCResult = result;
+    }
   }, {
     key: "sinkHandler",
     value: function sinkHandler(fn) {
@@ -74,7 +79,7 @@ var InteractionExtraMetrics = exports.default = /*#__PURE__*/function () {
         var updatedData = _objectSpread(_objectSpread({}, data), {}, {
           vcObserver: (_this$vcObserver3 = this.vcObserver) !== null && _this$vcObserver3 !== void 0 ? _this$vcObserver3 : undefined
         });
-        this.sinkHandlerFn(id, updatedData);
+        this.sinkHandlerFn(id, updatedData, this.finishedInteraction, this.lastInteractionFinishVCResult);
       }
       this.stopVCObserver();
       (0, _index.remove)(id);
@@ -83,11 +88,13 @@ var InteractionExtraMetrics = exports.default = /*#__PURE__*/function () {
   }, {
     key: "reset",
     value: function reset() {
+      var _this$finishedInterac;
       this.stopVCObserver();
-      if (this.finishedInteractionId) {
-        (0, _index.remove)(this.finishedInteractionId);
+      if ((_this$finishedInterac = this.finishedInteraction) !== null && _this$finishedInterac !== void 0 && _this$finishedInterac.id) {
+        (0, _index.remove)(this.finishedInteraction.id);
       }
-      this.finishedInteractionId = null;
+      this.finishedInteraction = null;
+      this.lastInteractionFinishVCResult = undefined;
     }
   }, {
     key: "stopAll",

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

@@ -82,14 +82,14 @@ function sinkPostInteractionLog(instance, createPostInteractionLogPayload) {
   });
 }
 function sinkInteractionExtraMetrics(instance, createInteractionExtraLogPayload) {
-  _interactionMetrics.interactionExtraMetrics.sinkHandler(function (interactionId, interaction) {
+  _interactionMetrics.interactionExtraMetrics.sinkHandler(function (interactionId, interaction, lastInteractionFinish, lastInteractionFinishVCResult) {
     (0, _scheduleIdleCallback.default)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var payload, devToolObserver;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return createInteractionExtraLogPayload(interactionId, interaction);
+            return createInteractionExtraLogPayload(interactionId, interaction, lastInteractionFinish, lastInteractionFinishVCResult);
           case 2:
             payload = _context.sent;
             if (payload) {

package/dist/cjs/segment/segment.js

@@ -1,11 +1,11 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = UFOSegment;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -21,24 +21,13 @@ var _interactionMetrics = require("../interaction-metrics");
 var _routeNameContext = _interopRequireDefault(require("../route-name-context"));
 var _shortId = _interopRequireDefault(require("../short-id"));
 var _scheduleOnPaint = _interopRequireDefault(require("./schedule-on-paint"));
+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" != _typeof(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); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _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 tryCompleteHandle;
-var AsyncSegmentHighlight = /*#__PURE__*/(0, _react.lazy)(function () {
-  return Promise.resolve().then(function () {
-    return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_ufo-segment-highlight" */'./segment-highlight'));
-  }).then(function (module) {
-    return {
-      default: module.SegmentHighlight
-    };
-  });
-});
 
-// KARL TODO: finish self profiling
 /** A portion of the page we apply measurement to */
 function UFOSegment(_ref) {
-  var _getConfig2;
   var segmentName = _ref.name,
     children = _ref.children,
     _ref$mode = _ref.mode,
@@ -289,16 +278,11 @@ function UFOSegment(_ref) {
       return l.name;
     }).join('/');
   }, [labelStack]);
-  var enableSegmentHighlighting = (_getConfig2 = (0, _config.getConfig)()) === null || _getConfig2 === void 0 ? void 0 : _getConfig2.enableSegmentHighlighting;
   return /*#__PURE__*/_react.default.createElement(_interactionContext.default.Provider, {
     value: interactionContext
   }, /*#__PURE__*/_react.default.createElement(_react.Profiler, {
     id: reactProfilerId,
     onRender: onRender
-  }, children, enableSegmentHighlighting && /*#__PURE__*/_react.default.createElement(_react.Suspense, {
-    fallback: null
-  }, /*#__PURE__*/_react.default.createElement(AsyncSegmentHighlight, {
-    segmentName: segmentName
-  }))));
+  }, children));
 }
 UFOSegment.displayName = 'UFOSegment';

package/dist/cjs/vc/vc-observer-new/metric-calculator/abstract-base-vc-calculator.js

@@ -310,24 +310,14 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
               // Only create debug details if callbacks exist
               v3RevisionDebugDetails = null;
               if (shouldCalculateDebugDetails) {
-                if ((0, _platformFeatureFlags.fg)('platform_ufo_unify_abort_status_in_ttvc_debug_data')) {
-                  v3RevisionDebugDetails = {
-                    revision: this.revisionNo,
-                    isClean: isVCClean && !interactionAbortReason && isPageVisible,
-                    abortReason: !isPageVisible ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : interactionAbortReason,
-                    vcLogs: enhancedVcLogs,
-                    interactionId: interactionId,
-                    interactionType: interactionType
-                  };
-                } else {
-                  v3RevisionDebugDetails = {
-                    revision: this.revisionNo,
-                    isClean: isVCClean,
-                    abortReason: dirtyReason,
-                    vcLogs: enhancedVcLogs,
-                    interactionId: interactionId
-                  };
-                }
+                v3RevisionDebugDetails = {
+                  revision: this.revisionNo,
+                  isClean: isVCClean && !interactionAbortReason && isPageVisible,
+                  abortReason: !isPageVisible ? 'browser_backgrounded' : dirtyReason !== null && dirtyReason !== void 0 ? dirtyReason : interactionAbortReason,
+                  vcLogs: enhancedVcLogs,
+                  interactionId: interactionId,
+                  interactionType: interactionType
+                };
               }
 
               // Handle devtool callback

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

@@ -16,8 +16,8 @@ import { optimizeReactProfilerTimings } from '../create-payload/utils/optimize-r
 import { optimizeRequestInfo } from '../create-payload/utils/optimize-request-info';
 import { optimizeSpans } from '../create-payload/utils/optimize-spans';
 import { interactionSpans as atlaskitInteractionSpans } from '../interaction-metrics';
-async function createInteractionExtraLogPayload(interactionId, interaction) {
-  var _getTTAI, _window$location;
+async function createInteractionExtraLogPayload(interactionId, interaction, lastInteractionFinish, lastInteractionFinishVCResult) {
+  var _getTTAI, _lastInteractionFinis, _getTTAI2, _window$location;
   const config = getConfig();
   if (!config) {
     throw Error('UFO Configuration not provided');
@@ -33,7 +33,8 @@ async function createInteractionExtraLogPayload(interactionId, interaction) {
     previousInteractionName,
     isPreviousInteractionAborted,
     abortedByInteractionName,
-    knownSegments
+    knownSegments,
+    minorInteractions
   } = interaction;
   const sanitisedUfoName = sanitizeUfoName(ufoName);
   const configRate = getExtraInteractionRate(sanitisedUfoName, type);
@@ -42,7 +43,8 @@ async function createInteractionExtraLogPayload(interactionId, interaction) {
   }
   const pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
   const isPageLoad = type === 'page_load' || type === 'transition';
-  if (!isPageLoad) {
+  if (!isPageLoad || minorInteractions !== undefined && minorInteractions.length > 0) {
+    // Not send if aborted by minor interaction for now
     // Only create payload for page load
     return null;
   }
@@ -61,6 +63,32 @@ async function createInteractionExtraLogPayload(interactionId, interaction) {
     return null;
   }
 
+  // Get normal TTAI & VC90 for last finished interaction (without 3p)
+  if (!lastInteractionFinish || lastInteractionFinish !== null && lastInteractionFinish !== void 0 && lastInteractionFinish.abortReason || lastInteractionFinish !== null && lastInteractionFinish !== void 0 && (_lastInteractionFinis = lastInteractionFinish.errors) !== null && _lastInteractionFinis !== void 0 && _lastInteractionFinis.length) {
+    return null;
+  }
+  const normalTTAI = (_getTTAI2 = getTTAI(lastInteractionFinish)) !== null && _getTTAI2 !== void 0 ? _getTTAI2 : undefined;
+  const lastInteractionFinishStart = typeof lastInteractionFinish.start === 'number' ? Math.round(lastInteractionFinish.start) : undefined;
+  const lastInteractionFinishEnd = typeof lastInteractionFinish.end === 'number' ? Math.round(lastInteractionFinish.end) : undefined;
+  let lastInteractionFinishVC90 = null;
+  let lastInteractionFinishVCClean = false;
+  if (lastInteractionFinishVCResult) {
+    const lastInteractionFinishVCRev = lastInteractionFinishVCResult['ufo:vc:rev'];
+    const lastInteractionFinishRevision = lastInteractionFinishVCRev === null || lastInteractionFinishVCRev === void 0 ? void 0 : lastInteractionFinishVCRev.find(({
+      revision
+    }) => revision === DEFAULT_TTVC_REVISION);
+    if (lastInteractionFinishRevision !== null && lastInteractionFinishRevision !== void 0 && lastInteractionFinishRevision.clean) {
+      lastInteractionFinishVCClean = true;
+      lastInteractionFinishVC90 = lastInteractionFinishRevision['metric:vc90'];
+    } else {
+      return null;
+    }
+  } else if (normalTTAI !== undefined && typeof normalTTAI === 'number' && normalTTAI === extraTTAI) {
+    // Because TTAI is equal between with and without 3p, we can assume VC90 is also equal
+    lastInteractionFinishVC90 = effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload['metric:vc90'];
+    lastInteractionFinishVCClean = effectiveVCRevisionPayload === null || effectiveVCRevisionPayload === void 0 ? void 0 : effectiveVCRevisionPayload.clean;
+  }
+
   // Helper function to check if labelStack contains third-party type
   const isThirdParty = labelStack => {
     var _labelStack$some;
@@ -148,7 +176,14 @@ async function createInteractionExtraLogPayload(interactionId, interaction) {
           customData: filteredData.customData,
           ...getDetailedInteractionMetrics()
         },
-        'vc:effective:revision': DEFAULT_TTVC_REVISION
+        'vc:effective:revision': DEFAULT_TTVC_REVISION,
+        lastInteractionFinish: {
+          start: lastInteractionFinishStart,
+          end: lastInteractionFinishEnd,
+          ttai: normalTTAI,
+          vc90: lastInteractionFinishVC90,
+          vcClean: lastInteractionFinishVCClean
+        }
       }
     }
   };

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

@@ -1,5 +1,5 @@
 import { getConfig, getMostRecentVCRevision } from '../../config';
-import { postInteractionLog } from '../../interaction-metrics';
+import { interactionExtraMetrics, postInteractionLog } from '../../interaction-metrics';
 import getInteractionStatus from './get-interaction-status';
 import getPageVisibilityUpToTTAI from './get-page-visibility-up-to-ttai';
 import getSSRDoneTimeValue from './get-ssr-done-time-value';
@@ -50,6 +50,7 @@ async function getVCMetrics(interaction, include3p = false, excludeSmartAnswersI
   if (!include3p) {
     // For Post Interaction, last interaction should be without 3p
     postInteractionLog.setLastInteractionFinishVCResult(result);
+    interactionExtraMetrics.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

@@ -652,7 +652,8 @@ function finishInteraction(id, data, endTime = performance.now()) {
   PreviousInteractionLog.isAborted = data.abortReason != null;
   if (data.ufoName) {
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      if (interactionExtraMetrics.finishedInteractionId !== id) {
+      var _interactionExtraMetr;
+      if (((_interactionExtraMetr = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr === void 0 ? void 0 : _interactionExtraMetr.id) !== id) {
         // If this same interaction was not already handled, handle it
         handleInteraction(id, data);
       }
@@ -747,7 +748,8 @@ export function tryComplete(interactionId, endTime) {
         });
       }
       if (fg('platform_ufo_enable_ttai_with_3p')) {
-        if (interactionExtraMetrics.finishedInteractionId !== interactionId) {
+        var _interactionExtraMetr2;
+        if (((_interactionExtraMetr2 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr2 === void 0 ? void 0 : _interactionExtraMetr2.id) !== interactionId) {
           var _getConfig9, _getConfig9$experimen;
           // If interactionExtraMetrics is not waiting for measuring this interaction
           if ((_getConfig9 = getConfig()) !== null && _getConfig9 !== void 0 && (_getConfig9$experimen = _getConfig9.experimentalInteractionMetrics) !== null && _getConfig9$experimen !== void 0 && _getConfig9$experimen.enabled) {
@@ -763,15 +765,15 @@ export function tryComplete(interactionId, endTime) {
       activeSubmitted = false;
     };
     if (fg('platform_ufo_enable_ttai_with_3p')) {
-      var _interaction$hold3pAc;
+      var _interaction$hold3pAc, _interactionExtraMetr3;
       const noMoreActive3pHolds = ((_interaction$hold3pAc = interaction.hold3pActive) === null || _interaction$hold3pAc === void 0 ? void 0 : _interaction$hold3pAc.size) === 0 || interaction.hold3pActive === undefined;
-      if (noMoreActiveHolds && interactionExtraMetrics.finishedInteractionId !== interactionId) {
+      if (noMoreActiveHolds && ((_interactionExtraMetr3 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr3 === void 0 ? void 0 : _interactionExtraMetr3.id) !== interactionId) {
         // If it's not waiting for extra metrics to complete, finish the interaction as normal
         if (!activeSubmitted) {
           var _getConfig1, _getConfig1$extraInte, _getConfig10, _getConfig10$extraSea, _getConfig11, _getConfig11$extraSea;
           finishInteraction(interactionId, interaction, endTime);
           if ((_getConfig1 = getConfig()) !== null && _getConfig1 !== void 0 && (_getConfig1$extraInte = _getConfig1.extraInteractionMetrics) !== null && _getConfig1$extraInte !== void 0 && _getConfig1$extraInte.enabled) {
-            interactionExtraMetrics.updateFinishedInteractionId(interactionId);
+            interactionExtraMetrics.updateFinishedInteraction(interaction);
           }
           if ((_getConfig10 = getConfig()) !== null && _getConfig10 !== void 0 && (_getConfig10$extraSea = _getConfig10.extraSearchPageInteraction) !== null && _getConfig10$extraSea !== void 0 && _getConfig10$extraSea.enabled && interaction.ufoName === ((_getConfig11 = getConfig()) === null || _getConfig11 === void 0 ? void 0 : (_getConfig11$extraSea = _getConfig11.extraSearchPageInteraction) === null || _getConfig11$extraSea === void 0 ? void 0 : _getConfig11$extraSea.searchPageMetricName) && fg('react_ufo_unified_search_ignoring_sain_metric')) {
             onSearchPageInteractionComplete(interactionId, interaction);

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

@@ -4,8 +4,8 @@ import { interactions } from './common/constants';
 import { remove } from './index';
 export default class InteractionExtraMetrics {
   constructor() {
-    // Store the finished interaction ID (as non-3p interaction)
-    _defineProperty(this, "finishedInteractionId", null);
+    // Store the finished interaction (as non-3p interaction)
+    _defineProperty(this, "finishedInteraction", null);
     // independent VC observer, that observes until `custom.post-interaction-logs` event is sent
     _defineProperty(this, "vcObserver", null);
     _defineProperty(this, "sinkHandlerFn", () => {});
@@ -36,11 +36,14 @@ export default class InteractionExtraMetrics {
     const interaction = interactions.get(interactionId);
     return (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'page_load' || (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'transition';
   }
-  updateFinishedInteractionId(interactionId) {
-    if (this.eligibleToMeasure(interactionId)) {
-      this.finishedInteractionId = interactionId;
+  updateFinishedInteraction(interaction) {
+    if ((interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'page_load' || (interaction === null || interaction === void 0 ? void 0 : interaction.type) === 'transition') {
+      this.finishedInteraction = interaction;
     }
   }
+  setLastInteractionFinishVCResult(result) {
+    this.lastInteractionFinishVCResult = result;
+  }
   sinkHandler(fn) {
     this.sinkHandlerFn = fn;
   }
@@ -51,18 +54,20 @@ export default class InteractionExtraMetrics {
         ...data,
         vcObserver: (_this$vcObserver3 = this.vcObserver) !== null && _this$vcObserver3 !== void 0 ? _this$vcObserver3 : undefined
       };
-      this.sinkHandlerFn(id, updatedData);
+      this.sinkHandlerFn(id, updatedData, this.finishedInteraction, this.lastInteractionFinishVCResult);
     }
     this.stopVCObserver();
     remove(id);
     this.reset();
   }
   reset() {
+    var _this$finishedInterac;
     this.stopVCObserver();
-    if (this.finishedInteractionId) {
-      remove(this.finishedInteractionId);
+    if ((_this$finishedInterac = this.finishedInteraction) !== null && _this$finishedInterac !== void 0 && _this$finishedInterac.id) {
+      remove(this.finishedInteraction.id);
     }
-    this.finishedInteractionId = null;
+    this.finishedInteraction = null;
+    this.lastInteractionFinishVCResult = undefined;
   }
   stopAll(id) {
     remove(id);

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

@@ -70,9 +70,9 @@ function sinkPostInteractionLog(instance, createPostInteractionLogPayload) {
   });
 }
 function sinkInteractionExtraMetrics(instance, createInteractionExtraLogPayload) {
-  interactionExtraMetrics.sinkHandler((interactionId, interaction) => {
+  interactionExtraMetrics.sinkHandler((interactionId, interaction, lastInteractionFinish, lastInteractionFinishVCResult) => {
     scheduleIdleCallback(async () => {
-      const payload = await createInteractionExtraLogPayload(interactionId, interaction);
+      const payload = await createInteractionExtraLogPayload(interactionId, interaction, lastInteractionFinish, lastInteractionFinishVCResult);
       if (payload) {
         // NOTE: This API is used by the UFO DevTool Chrome Extension and also by Criterion
         // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix

package/dist/es2019/segment/segment.js

@@ -1,4 +1,4 @@
-import React, { lazy, Profiler, Suspense, useCallback, useContext, useEffect, useMemo, useRef } from 'react';
+import React, { Profiler, useCallback, useContext, useEffect, useMemo, useRef } from 'react';
 import { unstable_NormalPriority as NormalPriority, unstable_scheduleCallback as scheduleCallback } from 'scheduler';
 import { v4 as createUUID } from 'uuid';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -12,11 +12,7 @@ import UFORouteName from '../route-name-context';
 import generateId from '../short-id';
 import scheduleOnPaint from './schedule-on-paint';
 let tryCompleteHandle;
-const AsyncSegmentHighlight = /*#__PURE__*/lazy(() => import( /* webpackChunkName: "@atlaskit-internal_ufo-segment-highlight" */'./segment-highlight').then(module => ({
-  default: module.SegmentHighlight
-})));
 
-// KARL TODO: finish self profiling
 /** A portion of the page we apply measurement to */
 export default function UFOSegment({
   name: segmentName,
@@ -24,7 +20,6 @@ export default function UFOSegment({
   mode = 'single',
   type = 'first-party'
 }) {
-  var _getConfig2;
   const parentContext = useContext(UFOInteractionContext);
   const segmentIdMap = useMemo(() => {
     if (!(parentContext !== null && parentContext !== void 0 && parentContext.segmentIdMap)) {
@@ -260,16 +255,11 @@ export default function UFOSegment({
     };
   }, [interactionId, parentContext, interactionContext, labelStack]);
   const reactProfilerId = useMemo(() => labelStack.map(l => l.name).join('/'), [labelStack]);
-  const enableSegmentHighlighting = (_getConfig2 = getConfig()) === null || _getConfig2 === void 0 ? void 0 : _getConfig2.enableSegmentHighlighting;
   return /*#__PURE__*/React.createElement(UFOInteractionContext.Provider, {
     value: interactionContext
   }, /*#__PURE__*/React.createElement(Profiler, {
     id: reactProfilerId,
     onRender: onRender
-  }, children, enableSegmentHighlighting && /*#__PURE__*/React.createElement(Suspense, {
-    fallback: null
-  }, /*#__PURE__*/React.createElement(AsyncSegmentHighlight, {
-    segmentName: segmentName
-  }))));
+  }, children));
 }
 UFOSegment.displayName = 'UFOSegment';