@atlaskit/react-ufo 3.1.0 → 3.1.2

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

@@ -4,7 +4,7 @@ import { getLighthouseMetrics } from '../additional-payload';
 import { CHRReporter } from '../assets';
 import * as bundleEvalTiming from '../bundle-eval-timing';
 import coinflip from '../coinflip';
-import { REACT_UFO_VERSION } from '../common/constants';
+import { getReactUFOVersion } from '../common/constants';
 import { getConfig, getExperimentalInteractionRate, getUfoNameOverrides } from '../config';
 import { getExperimentalVCMetrics } from '../create-experimental-interaction-metrics-payload';
 import { getBm3Timings } from '../custom-timings';
@@ -383,7 +383,7 @@ function optimizeCustomData(interaction) {
     const label = stringifyLabelStackFully(labelStack);
     const value = (_result$get$data = (_result$get = result.get(label)) === null || _result$get === void 0 ? void 0 : _result$get.data) !== null && _result$get$data !== void 0 ? _result$get$data : {};
     result.set(label, {
-      labelStack: optimizeLabelStack(labelStack),
+      labelStack: optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type)),
       data: Object.assign(value, data)
     });
     return result;
@@ -395,7 +395,7 @@ function optimizeCustomData(interaction) {
         const label = stringifyLabelStackFully([]);
         const labelValue = (_result$get$data2 = (_result$get2 = result.get(label)) === null || _result$get2 === void 0 ? void 0 : _result$get2.data) !== null && _result$get$data2 !== void 0 ? _result$get$data2 : {};
         result.set(label, {
-          labelStack: optimizeLabelStack([]),
+          labelStack: optimizeLabelStack([], getReactUFOVersion(interaction.type)),
           data: Object.assign(labelValue, {
             [key]: value
           })
@@ -407,7 +407,7 @@ function optimizeCustomData(interaction) {
   }
   return [...customDataMap.values()];
 }
-function optimizeReactProfilerTimings(reactProfilerTimings, interactionStart) {
+function optimizeReactProfilerTimings(reactProfilerTimings, interactionStart, reactUFOVersion) {
   const reactProfilerTimingsMap = reactProfilerTimings.reduce((result, {
     labelStack,
     startTime,
@@ -420,7 +420,7 @@ function optimizeReactProfilerTimings(reactProfilerTimings, interactionStart) {
       const start = Math.round(startTime);
       const end = Math.round(commitTime);
       const timing = result.get(label) || {
-        labelStack: optimizeLabelStack(labelStack),
+        labelStack: optimizeLabelStack(labelStack, reactUFOVersion),
         startTime: start,
         endTime: end,
         mountCount: 0,
@@ -467,7 +467,7 @@ function optimizeRedirects(redirects, interactionStart) {
   }, []);
   return updatedRedirects;
 }
-function optimizeHoldInfo(holdInfo, interactionStart) {
+function optimizeHoldInfo(holdInfo, interactionStart, reactUFOVersion) {
   const holdInfoMap = holdInfo.reduce((result, hold) => {
     const {
       labelStack,
@@ -485,7 +485,7 @@ function optimizeHoldInfo(holdInfo, interactionStart) {
       const timing = result.get(label) || {
         labelStack: optimizeLabelStack([...labelStack, {
           name
-        }]),
+        }], reactUFOVersion),
         startTime,
         endTime
       };
@@ -501,7 +501,7 @@ function optimizeHoldInfo(holdInfo, interactionStart) {
   }, new Map());
   return [...holdInfoMap.values()];
 }
-function optimizeSpans(spans, interactionStart) {
+function optimizeSpans(spans, interactionStart, reactUFOVersion) {
   const updatedSpans = spans.reduce((result, span) => {
     const {
       labelStack,
@@ -514,7 +514,7 @@ function optimizeSpans(spans, interactionStart) {
       result.push({
         labelStack: optimizeLabelStack([...labelStack, {
           name
-        }]),
+        }], reactUFOVersion),
         startTime: Math.round(start),
         endTime: Math.round(end),
         type
@@ -524,7 +524,7 @@ function optimizeSpans(spans, interactionStart) {
   }, []);
   return updatedSpans;
 }
-function optimizeRequestInfo(requestInfo, interactionStart) {
+function optimizeRequestInfo(requestInfo, interactionStart, reactUFOVersion) {
   const updatedRequestInfo = requestInfo.reduce((result, reqInfo) => {
     const {
       labelStack,
@@ -540,7 +540,7 @@ function optimizeRequestInfo(requestInfo, interactionStart) {
       result.push({
         labelStack: optimizeLabelStack([...labelStack, {
           name
-        }]),
+        }], reactUFOVersion),
         startTime: Math.round(startTime),
         endTime: Math.round(endTime)
       });
@@ -565,18 +565,18 @@ function optimizeCustomTimings(customTimings, interactionStart) {
     return result;
   }, []);
 }
-function optimizeMarks(marks) {
+function optimizeMarks(marks, reactUFOVersion) {
   return marks.map(({
     labelStack,
     time,
     ...others
   }) => ({
     ...others,
-    labelStack: labelStack && optimizeLabelStack(labelStack),
+    labelStack: labelStack && optimizeLabelStack(labelStack, reactUFOVersion),
     time: Math.round(time)
   }));
 }
-function optimizeApdex(apdex) {
+function optimizeApdex(apdex, reactUFOVersion) {
   return apdex.map(({
     stopTime,
     labelStack,
@@ -585,7 +585,7 @@ function optimizeApdex(apdex) {
     ...others,
     stopTime: Math.round(stopTime),
     ...(labelStack ? {
-      labelStack: optimizeLabelStack(labelStack)
+      labelStack: optimizeLabelStack(labelStack, reactUFOVersion)
     } : {})
   }));
 }
@@ -723,14 +723,14 @@ function createInteractionMetricsPayload(interaction, interactionId, experimenta
   const pageVisibilityAtTTI = getPageVisibilityUpToTTI(interaction);
   const pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
   const segments = config.killswitchNestedSegments ? [] : knownSegments;
-  const segmentTree = REACT_UFO_VERSION === '2.0.0' ? buildSegmentTree(segments.map(segment => segment.labelStack)) : {};
+  const segmentTree = getReactUFOVersion(interaction.type) === '2.0.0' ? buildSegmentTree(segments.map(segment => segment.labelStack)) : {};
   const isDetailedPayload = pageVisibilityAtTTAI === 'visible';
   const isPageLoad = type === 'page_load';
   const calculatePageVisibilityFromTheStartOfPageLoad = config.enableBetterPageVisibilityApi && isPageLoad;
   const moreAccuratePageVisibilityAtTTI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTI(interaction) : null;
   const moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTAI(interaction) : null;
   const labelStack = interaction.labelStack ? {
-    labelStack: optimizeLabelStack(interaction.labelStack)
+    labelStack: optimizeLabelStack(interaction.labelStack, getReactUFOVersion(interaction.type))
   } : {};
   // Page Load
   const getPageLoadInteractionMetrics = () => {
@@ -762,13 +762,13 @@ function createInteractionMetricsPayload(interaction, interactionId, experimenta
         ...others
       }) => ({
         ...others,
-        labelStack: labelStack && optimizeLabelStack(labelStack)
+        labelStack: labelStack && optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type))
       })),
       holdActive: [...interaction.holdActive.values()],
       redirects: optimizeRedirects(interaction.redirects, start),
-      holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start),
-      spans: optimizeSpans(spans, start),
-      requestInfo: optimizeRequestInfo(interaction.requestInfo, start),
+      holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start, getReactUFOVersion(interaction.type)),
+      spans: optimizeSpans(spans, start, getReactUFOVersion(interaction.type)),
+      requestInfo: optimizeRequestInfo(interaction.requestInfo, start, getReactUFOVersion(interaction.type)),
       customTimings: optimizeCustomTimings(interaction.customTimings, start),
       bundleEvalTimings: objectToArray(getBundleEvalTimings(start)),
       resourceTimings: objectToArray(resourceTimings)
@@ -808,8 +808,7 @@ function createInteractionMetricsPayload(interaction, interactionId, experimenta
         'event:sizeInKb': 0,
         'event:source': {
           name: 'react-ufo/web',
-          version: REACT_UFO_VERSION,
-          payloadSource: 'platform'
+          version: getReactUFOVersion(interaction.type)
         },
         'event:region': config.region || 'unknown',
         'experience:key': experimental ? 'custom.experimental-interaction-metrics' : 'custom.interaction-metrics',
@@ -845,19 +844,19 @@ function createInteractionMetricsPayload(interaction, interactionId, experimenta
           isPreviousInteractionAborted,
           abortedByInteractionName,
           // performance
-          apdex: optimizeApdex(interaction.apdex),
+          apdex: optimizeApdex(interaction.apdex, getReactUFOVersion(interaction.type)),
           end: Math.round(end),
           start: Math.round(start),
-          segments: REACT_UFO_VERSION === '2.0.0' ? segmentTree : segments.map(({
+          segments: getReactUFOVersion(interaction.type) === '2.0.0' ? segmentTree : segments.map(({
             labelStack,
             ...others
           }) => ({
             ...others,
-            labelStack: optimizeLabelStack(labelStack)
+            labelStack: optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type))
           })),
-          marks: optimizeMarks(interaction.marks),
+          marks: optimizeMarks(interaction.marks, getReactUFOVersion(interaction.type)),
           customData: optimizeCustomData(interaction),
-          reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start),
+          reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOVersion(interaction.type)),
           ...labelStack,
           ...getPageLoadInteractionMetrics(),
           ...getDetailedInteractionMetrics(resourceTimings),

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

@@ -1,5 +1,5 @@
 import coinflip from '../coinflip';
-import { REACT_UFO_VERSION } from '../common/constants';
+import { getReactUFOVersion } from '../common/constants';
 import { getConfig, getPostInteractionRate } from '../config';
 import { isSegmentLabel, sanitizeUfoName } from '../create-payload/common/utils';
 import { getPageVisibilityState } from '../hidden-timing';
@@ -168,7 +168,7 @@ export default function createPostInteractionLogPayload({
         'event:schema': '1.0.0',
         'event:source': {
           name: 'react-ufo/web',
-          version: REACT_UFO_VERSION,
+          version: getReactUFOVersion(lastInteractionFinish.type),
           payloadSource: 'platform'
         },
         'event:region': config.region || 'unknown',

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

@@ -541,7 +541,7 @@ export class VCObserver {
         if ((VC[key] === null || VC[key] === undefined) && VCRatio >= value / 100) {
           var _componentsLog$time;
           VC[key] = time;
-          VCBox[key] = (_componentsLog$time = componentsLog[time]) === null || _componentsLog$time === void 0 ? void 0 : _componentsLog$time.map(v => v.targetName);
+          VCBox[key] = [...new Set((_componentsLog$time = componentsLog[time]) === null || _componentsLog$time === void 0 ? void 0 : _componentsLog$time.map(v => v.targetName))];
         }
       });
       return VCRatio;
@@ -550,7 +550,7 @@ export class VCObserver {
       var _acc$abs, _componentsLog$timest, _acc$rel$vc, _acc$rel;
       const currentlyPainted = entryPainted + (((_acc$abs = acc.abs[i - 1]) === null || _acc$abs === void 0 ? void 0 : _acc$abs[1]) || 0);
       const currentlyPaintedRatio = Math.round(currentlyPainted / totalPainted * 1000) / 10;
-      const logEntry = (_componentsLog$timest = componentsLog[timestamp]) === null || _componentsLog$timest === void 0 ? void 0 : _componentsLog$timest.map(v => v.targetName);
+      const logEntry = [...new Set((_componentsLog$timest = componentsLog[timestamp]) === null || _componentsLog$timest === void 0 ? void 0 : _componentsLog$timest.map(v => v.targetName))];
       const ratioDelta = (currentlyPaintedRatio - ((_acc$rel$vc = (_acc$rel = acc.rel[i - 1]) === null || _acc$rel === void 0 ? void 0 : _acc$rel.vc) !== null && _acc$rel$vc !== void 0 ? _acc$rel$vc : 0)) / 100;
       if (isCalcSpeedIndexEnabled) {
         const speedIndex = timestamp * ratioDelta;

package/dist/es2019/vc/vc-observer/revisions/fy25_01.js

@@ -1,43 +1,56 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { fg } from '@atlaskit/platform-feature-flags';
-import { FY24_01Classifier } from './fy24_01';
-export class FY25_01Classifier extends FY24_01Classifier {
-  // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
-  filterComponentsLog({
-    componentsLog,
-    ttai
+import { ViewportUpdateClassifier } from './ViewportUpdateClassifier';
+const legacyIgnoreReasons = ['image', 'ssr-hydration', 'editor-lazy-node-view', 'editor-container-mutation'];
+export class FY25_01Classifier extends ViewportUpdateClassifier {
+  VCCalculationMethod({
+    VCParts,
+    entries,
+    totalPainted,
+    componentsLog
   }) {
-    let _componentsLog = {};
-
-    // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
-    if (fg('ufo-remove-vc-component-observations-after-ttai')) {
-      Object.entries(componentsLog).forEach(([_timestamp, value]) => {
-        const timestamp = Number(_timestamp);
-        if (ttai > timestamp) {
-          _componentsLog[timestamp] = value;
+    const VC = {};
+    const VCBox = {};
+    entries.reduce((acc = 0, v) => {
+      let VCRatio = v[1] / totalPainted + acc;
+      const time = v[0];
+      if (fg('platform_ufo_fix_vc_observer_rounding_error')) {
+        // @todo apply fix to include small changes into accumulator
+        const preciseCurrRatio = Math.round(100 * (v[1] / totalPainted));
+        const preciseAccRatio = Math.round(acc * 100);
+        VCRatio = (preciseCurrRatio + preciseAccRatio) / 100;
+      }
+      VCParts.forEach(value => {
+        if ((VC[value] === null || VC[value] === undefined) && VCRatio >= value / 100) {
+          var _componentsLog$time;
+          VC[value] = time;
+          VCBox[value] = new Set();
+          (_componentsLog$time = componentsLog[time]) === null || _componentsLog$time === void 0 ? void 0 : _componentsLog$time.forEach(v => {
+            var _VCBox$value;
+            return (_VCBox$value = VCBox[value]) === null || _VCBox$value === void 0 ? void 0 : _VCBox$value.add(v.targetName);
+          });
         }
       });
-    } else {
-      _componentsLog = {
-        ...componentsLog
-      };
-    }
-    return _componentsLog;
+      return VCRatio;
+    }, 0);
+    return {
+      VC,
+      VCBox
+    };
   }
   constructor() {
     super();
     _defineProperty(this, "revision", 'fy25.01');
-    _defineProperty(this, "types", ['attr']);
+    _defineProperty(this, "types", ['html', 'text']);
     _defineProperty(this, "filters", [{
-      name: 'not-visible',
+      name: 'default-ignore-reasons',
       filter: ({
         type,
         ignoreReason
       }) => {
-        return !(ignoreReason !== null && ignoreReason !== void 0 && ignoreReason.includes('not-visible'));
+        return !ignoreReason || !legacyIgnoreReasons.includes(ignoreReason);
       }
     }]);
-    _defineProperty(this, "removedFilters", []);
     this.mergeConfig();
   }
 }

package/dist/es2019/vc/vc-observer/revisions/fy25_02.js

@@ -0,0 +1,44 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { fg } from '@atlaskit/platform-feature-flags';
+import { FY25_01Classifier } from './fy25_01';
+export class FY25_02Classifier extends FY25_01Classifier {
+  // @todo remove it once fixed as described: https://product-fabric.atlassian.net/browse/AFO-3443
+  filterComponentsLog({
+    componentsLog,
+    ttai
+  }) {
+    let _componentsLog = {};
+
+    // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+    if (fg('ufo-remove-vc-component-observations-after-ttai')) {
+      Object.entries(componentsLog).forEach(([_timestamp, value]) => {
+        const timestamp = Number(_timestamp);
+        if (ttai > timestamp) {
+          _componentsLog[timestamp] = value;
+        }
+      });
+    } else {
+      _componentsLog = {
+        ...componentsLog
+      };
+    }
+    return _componentsLog;
+  }
+  constructor() {
+    super();
+    _defineProperty(this, "revision", 'fy25.02');
+    _defineProperty(this, "types", ['attr']);
+    _defineProperty(this, "filters", [{
+      name: 'not-visible',
+      filter: ({
+        type,
+        ignoreReason
+      }) => {
+        return !(ignoreReason !== null && ignoreReason !== void 0 && ignoreReason.includes('not-visible'));
+      }
+    }]);
+    _defineProperty(this, "removedFilters", []);
+    this.mergeConfig();
+  }
+}
+export const revFY25_02Classifier = new FY25_02Classifier();

package/dist/es2019/vc/vc-observer/revisions/revisions.js

@@ -1,11 +1,11 @@
-import { revFY24_01Classifier } from './fy24_01';
 import { revFY25_01Classifier } from './fy25_01';
+import { revFY25_02Classifier } from './fy25_02';
 const Revisions = [{
-  name: 'fy24.01',
-  classifier: revFY24_01Classifier
-}, {
   name: 'fy25.01',
   classifier: revFY25_01Classifier
+}, {
+  name: 'fy25.02',
+  classifier: revFY25_02Classifier
 }];
 let revisionResultCache = null;
 export const getRevisions = () => {

package/dist/esm/common/constants.js

@@ -1,4 +1,12 @@
 import { fg } from '@atlaskit/platform-feature-flags';
+export var getReactUFOVersion = function getReactUFOVersion(interactionType) {
+  if (interactionType !== 'page_load' && interactionType !== 'transition') {
+    return '1.0.1';
+  }
 
-// eslint-disable-next-line @atlaskit/platform/no-module-level-eval
-export var REACT_UFO_VERSION = fg('enable-react-ufo-payload-segment-compressed') ? '2.0.0' : '1.0.1';
+  // eslint-disable-next-line @atlaskit/platform/ensure-feature-flag-prefix
+  if (!fg('enable-react-ufo-payload-segment-compressed')) {
+    return '1.0.1';
+  }
+  return '2.0.0';
+};

package/dist/esm/create-payload/common/utils/index.js

@@ -1,8 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
-/* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */
-import { REACT_UFO_VERSION } from '../../../common/constants';
 export var sanitizeUfoName = function sanitizeUfoName(name) {
   return name.replace(/_/g, '-');
 };
@@ -51,8 +49,8 @@ function getLabelStackReference(labelStack) {
 export function labelStackStartWith(labelStack, startWith) {
   return stringifyLabelStackFully(labelStack).startsWith(stringifyLabelStackFully(startWith));
 }
-export function optimizeLabelStack(labelStack) {
-  return REACT_UFO_VERSION === '2.0.0' ? getLabelStackReference(labelStack) : labelStack.map(function (ls) {
+export function optimizeLabelStack(labelStack, reactUFOVersion) {
+  return reactUFOVersion ? getLabelStackReference(labelStack) : labelStack.map(function (ls) {
     return _objectSpread({
       n: ls.name
     }, ls.segmentId ? {

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

@@ -14,7 +14,7 @@ import { getLighthouseMetrics } from '../additional-payload';
 import { CHRReporter } from '../assets';
 import * as bundleEvalTiming from '../bundle-eval-timing';
 import coinflip from '../coinflip';
-import { REACT_UFO_VERSION } from '../common/constants';
+import { getReactUFOVersion } from '../common/constants';
 import { getConfig, getExperimentalInteractionRate, getUfoNameOverrides } from '../config';
 import { getExperimentalVCMetrics } from '../create-experimental-interaction-metrics-payload';
 import { getBm3Timings } from '../custom-timings';
@@ -382,7 +382,7 @@ function optimizeCustomData(interaction) {
     var label = stringifyLabelStackFully(labelStack);
     var value = (_result$get$data = (_result$get = result.get(label)) === null || _result$get === void 0 ? void 0 : _result$get.data) !== null && _result$get$data !== void 0 ? _result$get$data : {};
     result.set(label, {
-      labelStack: optimizeLabelStack(labelStack),
+      labelStack: optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type)),
       data: Object.assign(value, data)
     });
     return result;
@@ -399,7 +399,7 @@ function optimizeCustomData(interaction) {
         var label = stringifyLabelStackFully([]);
         var labelValue = (_result$get$data2 = (_result$get2 = result.get(label)) === null || _result$get2 === void 0 ? void 0 : _result$get2.data) !== null && _result$get$data2 !== void 0 ? _result$get$data2 : {};
         result.set(label, {
-          labelStack: optimizeLabelStack([]),
+          labelStack: optimizeLabelStack([], getReactUFOVersion(interaction.type)),
           data: Object.assign(labelValue, _defineProperty({}, _key, value))
         });
       }
@@ -409,7 +409,7 @@ function optimizeCustomData(interaction) {
   }
   return _toConsumableArray(customDataMap.values());
 }
-function optimizeReactProfilerTimings(reactProfilerTimings, interactionStart) {
+function optimizeReactProfilerTimings(reactProfilerTimings, interactionStart, reactUFOVersion) {
   var reactProfilerTimingsMap = reactProfilerTimings.reduce(function (result, _ref3) {
     var labelStack = _ref3.labelStack,
       startTime = _ref3.startTime,
@@ -421,7 +421,7 @@ function optimizeReactProfilerTimings(reactProfilerTimings, interactionStart) {
       var start = Math.round(startTime);
       var end = Math.round(commitTime);
       var timing = result.get(label) || {
-        labelStack: optimizeLabelStack(labelStack),
+        labelStack: optimizeLabelStack(labelStack, reactUFOVersion),
         startTime: start,
         endTime: end,
         mountCount: 0,
@@ -468,7 +468,7 @@ function optimizeRedirects(redirects, interactionStart) {
   }, []);
   return updatedRedirects;
 }
-function optimizeHoldInfo(holdInfo, interactionStart) {
+function optimizeHoldInfo(holdInfo, interactionStart, reactUFOVersion) {
   var holdInfoMap = holdInfo.reduce(function (result, hold) {
     var labelStack = hold.labelStack,
       name = hold.name,
@@ -484,7 +484,7 @@ function optimizeHoldInfo(holdInfo, interactionStart) {
       var timing = result.get(label) || {
         labelStack: optimizeLabelStack([].concat(_toConsumableArray(labelStack), [{
           name: name
-        }])),
+        }]), reactUFOVersion),
         startTime: startTime,
         endTime: endTime
       };
@@ -500,7 +500,7 @@ function optimizeHoldInfo(holdInfo, interactionStart) {
   }, new Map());
   return _toConsumableArray(holdInfoMap.values());
 }
-function optimizeSpans(spans, interactionStart) {
+function optimizeSpans(spans, interactionStart, reactUFOVersion) {
   var updatedSpans = spans.reduce(function (result, span) {
     var labelStack = span.labelStack,
       type = span.type,
@@ -511,7 +511,7 @@ function optimizeSpans(spans, interactionStart) {
       result.push({
         labelStack: optimizeLabelStack([].concat(_toConsumableArray(labelStack), [{
           name: name
-        }])),
+        }]), reactUFOVersion),
         startTime: Math.round(start),
         endTime: Math.round(end),
         type: type
@@ -521,7 +521,7 @@ function optimizeSpans(spans, interactionStart) {
   }, []);
   return updatedSpans;
 }
-function optimizeRequestInfo(requestInfo, interactionStart) {
+function optimizeRequestInfo(requestInfo, interactionStart, reactUFOVersion) {
   var updatedRequestInfo = requestInfo.reduce(function (result, reqInfo) {
     var labelStack = reqInfo.labelStack,
       name = reqInfo.name,
@@ -535,7 +535,7 @@ function optimizeRequestInfo(requestInfo, interactionStart) {
       result.push({
         labelStack: optimizeLabelStack([].concat(_toConsumableArray(labelStack), [{
           name: name
-        }])),
+        }]), reactUFOVersion),
         startTime: Math.round(startTime),
         endTime: Math.round(endTime)
       });
@@ -560,18 +560,18 @@ function optimizeCustomTimings(customTimings, interactionStart) {
     return result;
   }, []);
 }
-function optimizeMarks(marks) {
+function optimizeMarks(marks, reactUFOVersion) {
   return marks.map(function (_ref4) {
     var labelStack = _ref4.labelStack,
       time = _ref4.time,
       others = _objectWithoutProperties(_ref4, _excluded);
     return _objectSpread(_objectSpread({}, others), {}, {
-      labelStack: labelStack && optimizeLabelStack(labelStack),
+      labelStack: labelStack && optimizeLabelStack(labelStack, reactUFOVersion),
       time: Math.round(time)
     });
   });
 }
-function optimizeApdex(apdex) {
+function optimizeApdex(apdex, reactUFOVersion) {
   return apdex.map(function (_ref5) {
     var stopTime = _ref5.stopTime,
       labelStack = _ref5.labelStack,
@@ -579,7 +579,7 @@ function optimizeApdex(apdex) {
     return _objectSpread(_objectSpread({}, others), {}, {
       stopTime: Math.round(stopTime)
     }, labelStack ? {
-      labelStack: optimizeLabelStack(labelStack)
+      labelStack: optimizeLabelStack(labelStack, reactUFOVersion)
     } : {});
   });
 }
@@ -715,7 +715,7 @@ function createInteractionMetricsPayload(interaction, interactionId, experimenta
   var pageVisibilityAtTTI = getPageVisibilityUpToTTI(interaction);
   var pageVisibilityAtTTAI = getPageVisibilityUpToTTAI(interaction);
   var segments = config.killswitchNestedSegments ? [] : knownSegments;
-  var segmentTree = REACT_UFO_VERSION === '2.0.0' ? buildSegmentTree(segments.map(function (segment) {
+  var segmentTree = getReactUFOVersion(interaction.type) === '2.0.0' ? buildSegmentTree(segments.map(function (segment) {
     return segment.labelStack;
   })) : {};
   var isDetailedPayload = pageVisibilityAtTTAI === 'visible';
@@ -724,7 +724,7 @@ function createInteractionMetricsPayload(interaction, interactionId, experimenta
   var moreAccuratePageVisibilityAtTTI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTI(interaction) : null;
   var moreAccuratePageVisibilityAtTTAI = calculatePageVisibilityFromTheStartOfPageLoad ? getMoreAccuratePageVisibilityUpToTTAI(interaction) : null;
   var labelStack = interaction.labelStack ? {
-    labelStack: optimizeLabelStack(interaction.labelStack)
+    labelStack: optimizeLabelStack(interaction.labelStack, getReactUFOVersion(interaction.type))
   } : {};
   // Page Load
   var getPageLoadInteractionMetrics = function getPageLoadInteractionMetrics() {
@@ -754,14 +754,14 @@ function createInteractionMetricsPayload(interaction, interactionId, experimenta
         var labelStack = _ref6.labelStack,
           others = _objectWithoutProperties(_ref6, _excluded3);
         return _objectSpread(_objectSpread({}, others), {}, {
-          labelStack: labelStack && optimizeLabelStack(labelStack)
+          labelStack: labelStack && optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type))
         });
       }),
       holdActive: _toConsumableArray(interaction.holdActive.values()),
       redirects: optimizeRedirects(interaction.redirects, start),
-      holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start),
-      spans: optimizeSpans(spans, start),
-      requestInfo: optimizeRequestInfo(interaction.requestInfo, start),
+      holdInfo: optimizeHoldInfo(experimental ? interaction.holdExpInfo : interaction.holdInfo, start, getReactUFOVersion(interaction.type)),
+      spans: optimizeSpans(spans, start, getReactUFOVersion(interaction.type)),
+      requestInfo: optimizeRequestInfo(interaction.requestInfo, start, getReactUFOVersion(interaction.type)),
       customTimings: optimizeCustomTimings(interaction.customTimings, start),
       bundleEvalTimings: objectToArray(getBundleEvalTimings(start)),
       resourceTimings: objectToArray(resourceTimings)
@@ -801,8 +801,7 @@ function createInteractionMetricsPayload(interaction, interactionId, experimenta
         'event:sizeInKb': 0,
         'event:source': {
           name: 'react-ufo/web',
-          version: REACT_UFO_VERSION,
-          payloadSource: 'platform'
+          version: getReactUFOVersion(interaction.type)
         },
         'event:region': config.region || 'unknown',
         'experience:key': experimental ? 'custom.experimental-interaction-metrics' : 'custom.interaction-metrics',
@@ -826,19 +825,19 @@ function createInteractionMetricsPayload(interaction, interactionId, experimenta
           isPreviousInteractionAborted: isPreviousInteractionAborted,
           abortedByInteractionName: abortedByInteractionName,
           // performance
-          apdex: optimizeApdex(interaction.apdex),
+          apdex: optimizeApdex(interaction.apdex, getReactUFOVersion(interaction.type)),
           end: Math.round(end),
           start: Math.round(start),
-          segments: REACT_UFO_VERSION === '2.0.0' ? segmentTree : segments.map(function (_ref7) {
+          segments: getReactUFOVersion(interaction.type) === '2.0.0' ? segmentTree : segments.map(function (_ref7) {
             var labelStack = _ref7.labelStack,
               others = _objectWithoutProperties(_ref7, _excluded4);
             return _objectSpread(_objectSpread({}, others), {}, {
-              labelStack: optimizeLabelStack(labelStack)
+              labelStack: optimizeLabelStack(labelStack, getReactUFOVersion(interaction.type))
             });
           }),
-          marks: optimizeMarks(interaction.marks),
+          marks: optimizeMarks(interaction.marks, getReactUFOVersion(interaction.type)),
           customData: optimizeCustomData(interaction),
-          reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start)
+          reactProfilerTimings: optimizeReactProfilerTimings(interaction.reactProfilerTimings, start, getReactUFOVersion(interaction.type))
         }, labelStack), getPageLoadInteractionMetrics()), getDetailedInteractionMetrics(resourceTimings)), getPageLoadDetailedInteractionMetrics()), getBm3TrackerTimings(interaction)), {}, {
           'metric:ttai': experimental ? regularTTAI || expTTAI : undefined,
           'metric:experimental:ttai': expTTAI

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

@@ -3,7 +3,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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) { _defineProperty(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; }
 import coinflip from '../coinflip';
-import { REACT_UFO_VERSION } from '../common/constants';
+import { getReactUFOVersion } from '../common/constants';
 import { getConfig, getPostInteractionRate } from '../config';
 import { isSegmentLabel, sanitizeUfoName } from '../create-payload/common/utils';
 import { getPageVisibilityState } from '../hidden-timing';
@@ -181,7 +181,7 @@ export default function createPostInteractionLogPayload(_ref2) {
         'event:schema': '1.0.0',
         'event:source': {
           name: 'react-ufo/web',
-          version: REACT_UFO_VERSION,
+          version: getReactUFOVersion(lastInteractionFinish.type),
           payloadSource: 'platform'
         },
         'event:region': config.region || 'unknown',