@atlaskit/react-ufo 4.7.0 → 4.7.2

package/dist/cjs/create-payload/utils/optimize-marks.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.optimizeMarks = optimizeMarks;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _utils = require("../common/utils");
+var _excluded = ["labelStack", "time"];
+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 optimizeMarks(marks, reactUFOVersion) {
+  return marks.map(function (_ref) {
+    var labelStack = _ref.labelStack,
+      time = _ref.time,
+      others = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+    return _objectSpread(_objectSpread({}, others), {}, {
+      labelStack: labelStack && (0, _utils.optimizeLabelStack)(labelStack, reactUFOVersion),
+      time: Math.round(time)
+    });
+  });
+}

package/dist/cjs/create-payload/utils/optimize-react-profiler-timings.js

@@ -0,0 +1,53 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.optimizeReactProfilerTimings = optimizeReactProfilerTimings;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _interactionMetrics = require("../../interaction-metrics");
+var _utils = require("../common/utils");
+function optimizeReactProfilerTimings(reactProfilerTimings, interactionStart, reactUFOVersion) {
+  var reactProfilerTimingsMap = reactProfilerTimings.reduce(function (result, _ref) {
+    var labelStack = _ref.labelStack,
+      startTime = _ref.startTime,
+      commitTime = _ref.commitTime,
+      actualDuration = _ref.actualDuration,
+      type = _ref.type;
+    if (labelStack && startTime >= interactionStart) {
+      var label = (0, _utils.stringifyLabelStackFully)(labelStack);
+      var start = Math.round(startTime);
+      var end = Math.round(commitTime);
+      var timing = result.get(label) || {
+        labelStack: (0, _utils.optimizeLabelStack)(labelStack, reactUFOVersion),
+        startTime: start,
+        endTime: end,
+        mountCount: 0,
+        rerenderCount: 0,
+        renderDuration: 0
+      };
+      if (start < timing.startTime) {
+        timing.startTime = start;
+      }
+      if (end > timing.endTime) {
+        timing.endTime = end;
+      }
+      if (type === 'mount') {
+        timing.mountCount += 1;
+      }
+      if (type === 'update') {
+        timing.rerenderCount += 1;
+      }
+      if (_interactionMetrics.segmentUnmountCache.has(label) && (0, _platformFeatureFlags.fg)('platform_ufo_segment_unmount_count')) {
+        timing.unmountCount = _interactionMetrics.segmentUnmountCache.get(label) || 0;
+        _interactionMetrics.segmentUnmountCache.delete(label);
+      }
+      timing.renderDuration += Math.round(actualDuration);
+      result.set(label, timing);
+    }
+    return result;
+  }, new Map());
+  return (0, _toConsumableArray2.default)(reactProfilerTimingsMap.values());
+}

package/dist/cjs/create-payload/utils/optimize-request-info.js

@@ -0,0 +1,32 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.optimizeRequestInfo = optimizeRequestInfo;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _utils = require("../common/utils");
+function optimizeRequestInfo(requestInfo, interactionStart, reactUFOVersion) {
+  var updatedRequestInfo = requestInfo.reduce(function (result, reqInfo) {
+    var labelStack = reqInfo.labelStack,
+      name = reqInfo.name,
+      start = reqInfo.start,
+      end = reqInfo.end,
+      networkStart = reqInfo.networkStart,
+      networkComplete = reqInfo.networkComplete;
+    var startTime = networkStart !== null && networkStart !== void 0 ? networkStart : start;
+    var endTime = networkComplete !== null && networkComplete !== void 0 ? networkComplete : end;
+    if (labelStack && start >= interactionStart && endTime) {
+      result.push({
+        labelStack: (0, _utils.optimizeLabelStack)([].concat((0, _toConsumableArray2.default)(labelStack), [{
+          name: name
+        }]), reactUFOVersion),
+        startTime: Math.round(startTime),
+        endTime: Math.round(endTime)
+      });
+    }
+    return result;
+  }, []);
+  return updatedRequestInfo;
+}

package/dist/cjs/create-payload/utils/optimize-spans.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.optimizeSpans = optimizeSpans;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _utils = require("../common/utils");
+function optimizeSpans(spans, interactionStart, reactUFOVersion) {
+  var updatedSpans = spans.reduce(function (result, span) {
+    var labelStack = span.labelStack,
+      type = span.type,
+      name = span.name,
+      start = span.start,
+      end = span.end;
+    if (labelStack && start >= interactionStart) {
+      result.push({
+        labelStack: (0, _utils.optimizeLabelStack)([].concat((0, _toConsumableArray2.default)(labelStack), [{
+          name: name
+        }]), reactUFOVersion),
+        startTime: Math.round(start),
+        endTime: Math.round(end),
+        type: type
+      });
+    }
+    return result;
+  }, []);
+  return updatedSpans;
+}

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

@@ -135,7 +135,7 @@ function init(analyticsWebClientAsync, config) {
         startTime: 0
       });
     }
-    if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled && (0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
+    if (config !== null && config !== void 0 && (_config$extraInteract = config.extraInteractionMetrics) !== null && _config$extraInteract !== void 0 && _config$extraInteract.enabled) {
       _interactionMetrics.interactionExtraMetrics.initializeVCObserver(vcOptions);
     }
   }

package/dist/cjs/vc/vc-observer/observers/ssr-placeholders/index.js

@@ -214,7 +214,7 @@ var SSRPlaceholderHandlers = exports.SSRPlaceholderHandlers = /*#__PURE__*/funct
       return element;
     }
 
-    // NOTE - for use when the FG `platform_ufo_ssr_placeholder_resolution_ttvc_v3` is disabled
+    // Validates placeholder match using asynchronous observation and resolves with the result
   }, {
     key: "checkIfExistedAndSizeMatching",
     value: function checkIfExistedAndSizeMatching(el) {
@@ -233,7 +233,7 @@ var SSRPlaceholderHandlers = exports.SSRPlaceholderHandlers = /*#__PURE__*/funct
       });
     }
 
-    // NOTE - for use when the FG `platform_ufo_ssr_placeholder_resolution_ttvc_v3` is enabled
+    // Validates placeholder match synchronously using stored SSR dimensions and current bounds
   }, {
     key: "checkIfExistedAndSizeMatchingV3",
     value: function checkIfExistedAndSizeMatchingV3(el) {

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

@@ -204,15 +204,14 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
                 }
               }
               enhancedVcLogs = vcLogs ? vcLogs.map(function (log) {
-                return _objectSpread(_objectSpread(_objectSpread({}, log), (0, _platformFeatureFlags.fg)('platform_ufo_serialise_ttvc_v3_debug_data') && {
+                return _objectSpread(_objectSpread({}, log), {}, {
                   entries: log.entries.map(function (entry) {
                     var _entry$rect, _entry$previousRect;
                     return _objectSpread(_objectSpread({}, entry), {}, {
                       rect: (_entry$rect = entry.rect) === null || _entry$rect === void 0 ? void 0 : _entry$rect.toJSON(),
                       previousRect: (_entry$previousRect = entry.previousRect) === null || _entry$previousRect === void 0 ? void 0 : _entry$previousRect.toJSON()
                     });
-                  })
-                }), {}, {
+                  }),
                   viewportPercentage: log.viewportPercentage
                 });
               }) : []; // If 3p metric enabled - calculate the debug details
@@ -268,10 +267,9 @@ var AbstractVCCalculatorBase = exports.default = /*#__PURE__*/function () {
                       if (!ignoredEntriesByTime.has(timestamp)) {
                         ignoredEntriesByTime.set(timestamp, []);
                       }
-                      (_ignoredEntriesByTime = ignoredEntriesByTime.get(timestamp)) === null || _ignoredEntriesByTime === void 0 || _ignoredEntriesByTime.push(_objectSpread(_objectSpread(_objectSpread({}, viewportData), (0, _platformFeatureFlags.fg)('platform_ufo_serialise_ttvc_v3_debug_data') && {
+                      (_ignoredEntriesByTime = ignoredEntriesByTime.get(timestamp)) === null || _ignoredEntriesByTime === void 0 || _ignoredEntriesByTime.push(_objectSpread(_objectSpread({}, viewportData), {}, {
                         rect: (_viewportData$rect = viewportData.rect) === null || _viewportData$rect === void 0 ? void 0 : _viewportData$rect.toJSON(),
-                        previousRect: (_viewportData$previou = viewportData.previousRect) === null || _viewportData$previou === void 0 ? void 0 : _viewportData$previou.toJSON()
-                      }), {}, {
+                        previousRect: (_viewportData$previou = viewportData.previousRect) === null || _viewportData$previou === void 0 ? void 0 : _viewportData$previou.toJSON(),
                         ignoreReason: viewportData.visible ? viewportData.type : 'not-visible'
                       }));
                     }

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

@@ -125,7 +125,7 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
               _iterator = _createForOfIteratorHelper(addedNodes);
               _context2.prev = 4;
               _loop = /*#__PURE__*/_regenerator.default.mark(function _loop() {
-                var addedNodeRef, addedNode, ssrState, SSRStateEnum, _this$intersectionObs, _this$intersectionObs2, ssrPlaceholderHandler, _this$intersectionObs3, result, _this$intersectionObs4, _result, _this$intersectionObs5, sameDeletedNode, isInIgnoreLsMarker, _this$intersectionObs6, _this$intersectionObs7, _checkWithinComponent, isWithinThirdPartySegment, _this$intersectionObs8, validTargets, _iterator2, _step2, _this$intersectionObs9, validTarget, _this$intersectionObs0;
+                var addedNodeRef, addedNode, ssrState, SSRStateEnum, _this$intersectionObs, _this$intersectionObs2, ssrPlaceholderHandler, _this$intersectionObs3, result, _this$intersectionObs4, sameDeletedNode, isInIgnoreLsMarker, _this$intersectionObs5, _this$intersectionObs6, _checkWithinComponent, isWithinThirdPartySegment, _this$intersectionObs7, validTargets, _iterator2, _step2, _this$intersectionObs8, validTarget, _this$intersectionObs9;
                 return _regenerator.default.wrap(function _loop$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -173,58 +173,40 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
                       ssrState.state = SSRStateEnum.normal;
                     case 19:
                       if (!_this.getSSRPlaceholderHandler) {
-                        _context.next = 42;
+                        _context.next = 33;
                         break;
                       }
                       ssrPlaceholderHandler = _this.getSSRPlaceholderHandler();
                       if (!ssrPlaceholderHandler) {
-                        _context.next = 42;
+                        _context.next = 33;
                         break;
                       }
                       if (!(ssrPlaceholderHandler.isPlaceholder(addedNode) || ssrPlaceholderHandler.isPlaceholderIgnored(addedNode))) {
-                        _context.next = 35;
-                        break;
-                      }
-                      if (!(0, _platformFeatureFlags.fg)('platform_ufo_ssr_placeholder_resolution_ttvc_v3')) {
-                        _context.next = 29;
+                        _context.next = 26;
                         break;
                       }
                       if (!ssrPlaceholderHandler.checkIfExistedAndSizeMatchingV3(addedNode)) {
-                        _context.next = 27;
+                        _context.next = 26;
                         break;
                       }
                       (_this$intersectionObs3 = _this.intersectionObserver) === null || _this$intersectionObs3 === void 0 || _this$intersectionObs3.watchAndTag(addedNode, 'mutation:ssr-placeholder');
                       return _context.abrupt("return", 0);
-                    case 27:
-                      _context.next = 35;
-                      break;
-                    case 29:
-                      _context.next = 31;
-                      return ssrPlaceholderHandler.checkIfExistedAndSizeMatching(addedNode);
-                    case 31:
-                      result = _context.sent;
-                      if (!(result !== false)) {
-                        _context.next = 35;
-                        break;
-                      }
-                      (_this$intersectionObs4 = _this.intersectionObserver) === null || _this$intersectionObs4 === void 0 || _this$intersectionObs4.watchAndTag(addedNode, 'mutation:ssr-placeholder');
-                      return _context.abrupt("return", 0);
-                    case 35:
+                    case 26:
                       if (!(ssrPlaceholderHandler.isPlaceholderReplacement(addedNode) || ssrPlaceholderHandler.isPlaceholderIgnored(addedNode))) {
-                        _context.next = 42;
+                        _context.next = 33;
                         break;
                       }
-                      _context.next = 38;
+                      _context.next = 29;
                       return ssrPlaceholderHandler.validateReactComponentMatchToPlaceholder(addedNode);
-                    case 38:
-                      _result = _context.sent;
-                      if (!(_result !== false)) {
-                        _context.next = 42;
+                    case 29:
+                      result = _context.sent;
+                      if (!(result !== false)) {
+                        _context.next = 33;
                         break;
                       }
-                      (_this$intersectionObs5 = _this.intersectionObserver) === null || _this$intersectionObs5 === void 0 || _this$intersectionObs5.watchAndTag(addedNode, 'mutation:ssr-placeholder');
+                      (_this$intersectionObs4 = _this.intersectionObserver) === null || _this$intersectionObs4 === void 0 || _this$intersectionObs4.watchAndTag(addedNode, 'mutation:ssr-placeholder');
                       return _context.abrupt("return", 0);
-                    case 42:
+                    case 33:
                       sameDeletedNode = removedNodes.find(function (ref) {
                         var n = ref.deref();
                         if (!n || !addedNode) {
@@ -234,27 +216,27 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
                       });
                       isInIgnoreLsMarker = (0, _isInVcIgnoreIfNoLayoutShiftMarker.default)(addedNode);
                       if (!(sameDeletedNode && isInIgnoreLsMarker)) {
-                        _context.next = 47;
+                        _context.next = 38;
                         break;
                       }
-                      (_this$intersectionObs6 = _this.intersectionObserver) === null || _this$intersectionObs6 === void 0 || _this$intersectionObs6.watchAndTag(addedNode, 'mutation:remount');
+                      (_this$intersectionObs5 = _this.intersectionObserver) === null || _this$intersectionObs5 === void 0 || _this$intersectionObs5.watchAndTag(addedNode, 'mutation:remount');
                       return _context.abrupt("return", 0);
-                    case 47:
+                    case 38:
                       if (!(0, _vcUtils.isContainedWithinMediaWrapper)(addedNode)) {
-                        _context.next = 50;
+                        _context.next = 41;
                         break;
                       }
-                      (_this$intersectionObs7 = _this.intersectionObserver) === null || _this$intersectionObs7 === void 0 || _this$intersectionObs7.watchAndTag(addedNode, 'mutation:media');
+                      (_this$intersectionObs6 = _this.intersectionObserver) === null || _this$intersectionObs6 === void 0 || _this$intersectionObs6.watchAndTag(addedNode, 'mutation:media');
                       return _context.abrupt("return", 0);
-                    case 50:
+                    case 41:
                       _checkWithinComponent = (0, _checkWithinComponent2.default)(addedNode, 'UFOThirdPartySegment', _this.mapIs3pResult), isWithinThirdPartySegment = _checkWithinComponent.isWithin;
                       if (!isWithinThirdPartySegment) {
-                        _context.next = 54;
+                        _context.next = 45;
                         break;
                       }
-                      (_this$intersectionObs8 = _this.intersectionObserver) === null || _this$intersectionObs8 === void 0 || _this$intersectionObs8.watchAndTag(addedNode, 'mutation:third-party-element');
+                      (_this$intersectionObs7 = _this.intersectionObserver) === null || _this$intersectionObs7 === void 0 || _this$intersectionObs7.watchAndTag(addedNode, 'mutation:third-party-element');
                       return _context.abrupt("return", 0);
-                    case 54:
+                    case 45:
                       if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_resolution_ttvc_v3')) {
                         // Check if the target has display:content css property, return array of valid targets
                         validTargets = (0, _checkDisplayContent.default)(addedNode);
@@ -262,7 +244,7 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
                         try {
                           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
                             validTarget = _step2.value;
-                            (_this$intersectionObs9 = _this.intersectionObserver) === null || _this$intersectionObs9 === void 0 || _this$intersectionObs9.watchAndTag(validTarget, createElementMutationsWatcher(removedNodeRects));
+                            (_this$intersectionObs8 = _this.intersectionObserver) === null || _this$intersectionObs8 === void 0 || _this$intersectionObs8.watchAndTag(validTarget, createElementMutationsWatcher(removedNodeRects));
                           }
                         } catch (err) {
                           _iterator2.e(err);
@@ -273,9 +255,9 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
                         if ((0, _platformFeatureFlags.fg)('platform_ufo_display_content_track_occurrence')) {
                           (0, _trackDisplayContentOccurrence.default)(addedNode);
                         }
-                        (_this$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
+                        (_this$intersectionObs9 = _this.intersectionObserver) === null || _this$intersectionObs9 === void 0 || _this$intersectionObs9.watchAndTag(addedNode, createElementMutationsWatcher(removedNodeRects));
                       }
-                    case 55:
+                    case 46:
                     case "end":
                       return _context.stop();
                   }
@@ -320,12 +302,12 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
       };
     }());
     (0, _defineProperty2.default)(this, "handleAttributeMutation", function (_ref6) {
-      var _this$intersectionObs1;
+      var _this$intersectionObs0;
       var target = _ref6.target,
         attributeName = _ref6.attributeName,
         oldValue = _ref6.oldValue,
         newValue = _ref6.newValue;
-      (_this$intersectionObs1 = _this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.watchAndTag(target, function (_ref7) {
+      (_this$intersectionObs0 = _this.intersectionObserver) === null || _this$intersectionObs0 === void 0 || _this$intersectionObs0.watchAndTag(target, function (_ref7) {
         var target = _ref7.target,
           rect = _ref7.rect;
         if ((0, _vcUtils.isContainedWithinMediaWrapper)(target)) {
@@ -465,12 +447,12 @@ var ViewportObserver = exports.default = /*#__PURE__*/function () {
   }, {
     key: "stop",
     value: function stop() {
-      var _this$mutationObserve2, _this$intersectionObs10, _this$performanceObse2;
+      var _this$mutationObserve2, _this$intersectionObs1, _this$performanceObse2;
       if (!this.isStarted) {
         return;
       }
       (_this$mutationObserve2 = this.mutationObserver) === null || _this$mutationObserve2 === void 0 || _this$mutationObserve2.disconnect();
-      (_this$intersectionObs10 = this.intersectionObserver) === null || _this$intersectionObs10 === void 0 || _this$intersectionObs10.disconnect();
+      (_this$intersectionObs1 = this.intersectionObserver) === null || _this$intersectionObs1 === void 0 || _this$intersectionObs1.disconnect();
       (_this$performanceObse2 = this.performanceObserver) === null || _this$performanceObse2 === void 0 || _this$performanceObse2.disconnect();
       this.isStarted = false;
       // Clean up caches when stopping

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

@@ -1,15 +1,23 @@
 import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../coinflip';
-import { getConfig, getExtraInteractionRate } from '../config';
-import { getMoreAccuratePageVisibilityUpToTTAI, optimizeHoldInfo } from '../create-payload';
-import { buildSegmentTree, getOldSegmentsLabelStack, sanitizeUfoName } from '../create-payload/common/utils';
+import { DEFAULT_TTVC_REVISION, getConfig, getExtraInteractionRate, getMostRecentVCRevision } from '../config';
+import { buildSegmentTree, getOldSegmentsLabelStack, optimizeLabelStack, sanitizeUfoName } from '../create-payload/common/utils';
+import { getMoreAccuratePageVisibilityUpToTTAI } from '../create-payload/utils/get-more-accurate-page-visibility-up-to-ttai';
 import getPageVisibilityUpToTTAI from '../create-payload/utils/get-page-visibility-up-to-ttai';
 import getPayloadSize from '../create-payload/utils/get-payload-size';
 import { getReactUFOPayloadVersion } from '../create-payload/utils/get-react-ufo-payload-version';
 import getTTAI from '../create-payload/utils/get-ttai';
 import getVCMetrics from '../create-payload/utils/get-vc-metrics';
+import { optimizeApdex } from '../create-payload/utils/optimize-apdex';
+import { optimizeCustomTimings } from '../create-payload/utils/optimize-custom-timings';
+import { optimizeHoldInfo } from '../create-payload/utils/optimize-hold-info';
+import { optimizeMarks } from '../create-payload/utils/optimize-marks';
+import { optimizeReactProfilerTimings } from '../create-payload/utils/optimize-react-profiler-timings';
+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, _interaction$hold3pIn, _window$location;
+  var _getTTAI, _getMostRecentVCRevis, _window$location;
   const config = getConfig();
   if (!config) {
     throw Error('UFO Configuration not provided');
@@ -42,9 +50,49 @@ async function createInteractionExtraLogPayload(interactionId, interaction) {
   const moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTAI(interaction) : null;
   const extraTTAI = (_getTTAI = getTTAI(interaction)) !== null && _getTTAI !== void 0 ? _getTTAI : undefined;
   const newUFOName = sanitizeUfoName(ufoName);
+  const mostRecentVCRevision = (_getMostRecentVCRevis = getMostRecentVCRevision(newUFOName)) !== null && _getMostRecentVCRevis !== void 0 ? _getMostRecentVCRevis : DEFAULT_TTVC_REVISION;
   const finalVCMetrics = await getVCMetrics(interaction, true);
-  const holdInfo = optimizeHoldInfo((_interaction$hold3pIn = interaction.hold3pInfo) !== null && _interaction$hold3pIn !== void 0 ? _interaction$hold3pIn : [], start, getReactUFOPayloadVersion(interaction.type));
-  const segments3p = !fg('platform_ufo_remove_deprecated_config_fields') && config.killswitchNestedSegments ? [] : knownSegments.filter(knownSegment => knownSegment.labelStack.some(entry => 'type' in entry && entry.type === 'third-party'));
+
+  // Helper function to check if labelStack contains third-party type
+  const isThirdParty = labelStack => {
+    var _labelStack$some;
+    return (_labelStack$some = labelStack === null || labelStack === void 0 ? void 0 : labelStack.some(entry => 'type' in entry && entry.type === 'third-party')) !== null && _labelStack$some !== void 0 ? _labelStack$some : false;
+  };
+
+  // Pre-filter 3p data
+  const filteredData = {
+    errors: interaction.errors.filter(error => isThirdParty(error.labelStack)),
+    spans: [...interaction.spans, ...atlaskitInteractionSpans].filter(span => isThirdParty(span.labelStack)),
+    requestInfo: interaction.requestInfo.filter(req => isThirdParty(req.labelStack)),
+    customTimings: interaction.customTimings.filter(timing => isThirdParty(timing.labelStack)),
+    apdex: interaction.apdex.filter(apdex => isThirdParty(apdex.labelStack)),
+    reactProfilerTimings: interaction.reactProfilerTimings.filter(timing => isThirdParty(timing.labelStack)),
+    customData: interaction.customData.filter(data => isThirdParty(data.labelStack)),
+    segments: knownSegments.filter(segment => isThirdParty(segment.labelStack)),
+    marks: interaction.marks.filter(mark => isThirdParty(mark.labelStack))
+  };
+  // Clear atlaskit spans after filtering
+  atlaskitInteractionSpans.length = 0;
+
+  // Detailed payload
+  const getDetailedInteractionMetrics = () => {
+    var _interaction$hold3pIn;
+    return {
+      errors: filteredData.errors.map(({
+        labelStack,
+        ...others
+      }) => ({
+        ...others,
+        labelStack: labelStack && optimizeLabelStack(labelStack, getReactUFOPayloadVersion(interaction.type))
+      })),
+      holdActive: interaction.hold3pActive ? [...interaction.hold3pActive.values()] : [],
+      holdInfo: optimizeHoldInfo((_interaction$hold3pIn = interaction.hold3pInfo) !== null && _interaction$hold3pIn !== void 0 ? _interaction$hold3pIn : [], start, getReactUFOPayloadVersion(interaction.type)),
+      spans: optimizeSpans(filteredData.spans, start, getReactUFOPayloadVersion(interaction.type)),
+      requestInfo: optimizeRequestInfo(filteredData.requestInfo, start, getReactUFOPayloadVersion(interaction.type)),
+      customTimings: optimizeCustomTimings(filteredData.customTimings, start)
+    };
+  };
+  const segments3p = !fg('platform_ufo_remove_deprecated_config_fields') && config.killswitchNestedSegments ? [] : filteredData.segments;
   const segmentTree = getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? buildSegmentTree(segments3p.map(segment => segment.labelStack)) : {};
   const payload = {
     actionSubject: 'experience',
@@ -85,9 +133,14 @@ async function createInteractionExtraLogPayload(interactionId, interaction) {
           start: Math.round(start),
           'metric:ttai:3p': extraTTAI,
           ...finalVCMetrics,
-          holdInfo,
-          segments: getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? segmentTree : getOldSegmentsLabelStack(segments3p, interaction.type)
-        }
+          segments: getReactUFOPayloadVersion(interaction.type) === '2.0.0' ? segmentTree : getOldSegmentsLabelStack(segments3p, interaction.type),
+          marks: optimizeMarks(filteredData.marks, getReactUFOPayloadVersion(interaction.type)),
+          apdex: optimizeApdex(filteredData.apdex, getReactUFOPayloadVersion(interaction.type)),
+          reactProfilerTimings: optimizeReactProfilerTimings(filteredData.reactProfilerTimings, start, getReactUFOPayloadVersion(interaction.type)),
+          customData: filteredData.customData,
+          ...getDetailedInteractionMetrics()
+        },
+        'vc:effective:revision': mostRecentVCRevision
       }
     }
   };