@atlaskit/react-ufo 4.4.3 → 4.4.4

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

@@ -10,12 +10,14 @@ import { allFeatureFlagsAccessed, currentFeatureFlagsAccessed } from '../feature
 import { getInteractionId } from '../interaction-id-context';
 import { newVCObserver } from '../vc';
 import { interactions } from './common/constants';
+import InteractionExtraMetrics from './interaction-extra-metrics';
 import PostInteractionLog from './post-interaction-log';
 const PreviousInteractionLog = {
   name: undefined,
   isAborted: undefined
 };
 export const postInteractionLog = new PostInteractionLog();
+export const interactionExtraMetrics = new InteractionExtraMetrics();
 const interactionQueue = [];
 const segmentCache = new Map();
 export const segmentUnmountCache = new Map(); // Temporarily store segment unmount counts
@@ -158,23 +160,16 @@ export function addCustomTiming(interactionId, labelStack, data) {
         } = timingData;
         try {
           // for Firefox 102 and older
-          if (fg('ufo_chrome_devtools_uplift')) {
-            performance.measure(`🛸 ${labelStackToString(labelStack, key)} [custom_timing]`, {
-              start: startTime,
-              end: endTime,
-              detail: {
-                devtools: {
-                  track: '🛸 reactUFO detailed timings',
-                  color: 'tertiary-light'
-                }
+          performance.measure(`🛸 ${labelStackToString(labelStack, key)} [custom_timing]`, {
+            start: startTime,
+            end: endTime,
+            detail: {
+              devtools: {
+                track: '🛸 reactUFO detailed timings',
+                color: 'tertiary-light'
               }
-            });
-          } else {
-            performance.measure(`🛸 ${labelStackToString(labelStack, key)} [custom_timing]`, {
-              start: startTime,
-              end: endTime
-            });
-          }
+            }
+          });
         } catch (e) {
           // do nothing
         }
@@ -227,23 +222,16 @@ export function addSpan(interactionId, type, name, labelStack, start, end = perf
     if (isPerformanceTracingEnabled()) {
       try {
         // for Firefox 102 and older
-        if (fg('ufo_chrome_devtools_uplift')) {
-          performance.measure(`🛸 ${labelStackToString(labelStack, name)} [${type}]`, {
-            start,
-            end,
-            detail: {
-              devtools: {
-                track: '🛸 reactUFO detailed timings',
-                color: 'secondary'
-              }
+        performance.measure(`🛸 ${labelStackToString(labelStack, name)} [${type}]`, {
+          start,
+          end,
+          detail: {
+            devtools: {
+              track: '🛸 reactUFO detailed timings',
+              color: 'secondary'
             }
-          });
-        } else {
-          performance.measure(`🛸 ${labelStackToString(labelStack, name)} [${type}]`, {
-            start,
-            end
-          });
-        }
+          }
+        });
       } catch (e) {
         // do nothing
       }
@@ -264,23 +252,16 @@ export function addSpanToAll(type, name, labelStack, start, end = performance.no
   if (isPerformanceTracingEnabled()) {
     try {
       // for Firefox 102 and older
-      if (fg('ufo_chrome_devtools_uplift')) {
-        performance.measure(`🛸 ${labelStackToString(labelStack, name)} [${type}]`, {
-          start,
-          end,
-          detail: {
-            devtools: {
-              track: '🛸 reactUFO detailed timings',
-              color: 'secondary'
-            }
+      performance.measure(`🛸 ${labelStackToString(labelStack, name)} [${type}]`, {
+        start,
+        end,
+        detail: {
+          devtools: {
+            track: '🛸 reactUFO detailed timings',
+            color: 'secondary'
           }
-        });
-      } else {
-        performance.measure(`🛸 ${labelStackToString(labelStack, name)} [${type}]`, {
-          start,
-          end
-        });
-      }
+        }
+      });
     } catch (e) {
       // do nothing
     }
@@ -318,48 +299,60 @@ export function addHold(interactionId, labelStack, name, experimental) {
   const interaction = interactions.get(interactionId);
   const id = createUUID();
   if (interaction != null) {
-    var _getConfig2, _getConfig2$experimen;
     const start = performance.now();
     const holdActive = {
       labelStack,
       name,
       start
     };
-    if ((_getConfig2 = getConfig()) !== null && _getConfig2 !== void 0 && (_getConfig2$experimen = _getConfig2.experimentalInteractionMetrics) !== null && _getConfig2$experimen !== void 0 && _getConfig2$experimen.enabled && experimental) {
-      interaction.holdExpActive.set(id, {
-        ...holdActive,
-        start
-      });
-    }
-    if (!experimental) {
-      interaction.holdActive.set(id, {
-        ...holdActive,
-        start
-      });
+    if (fg('platform_ufo_enable_ttai_with_3p')) {
+      const is3pHold = labelStack.some(l => 'type' in l && l.type === 'third-party');
+      if (is3pHold) {
+        if (!interaction.hold3pActive) {
+          interaction.hold3pActive = new Map();
+        }
+        interaction.hold3pActive.set(id, {
+          ...holdActive,
+          start
+        });
+      } else {
+        interaction.holdActive.set(id, {
+          ...holdActive,
+          start
+        });
+        addHoldCriterion(id, labelStack, name, start);
+      }
+    } else {
+      var _getConfig2, _getConfig2$experimen;
+      if ((_getConfig2 = getConfig()) !== null && _getConfig2 !== void 0 && (_getConfig2$experimen = _getConfig2.experimentalInteractionMetrics) !== null && _getConfig2$experimen !== void 0 && _getConfig2$experimen.enabled && experimental) {
+        interaction.holdExpActive.set(id, {
+          ...holdActive,
+          start
+        });
+      }
+      if (!experimental) {
+        interaction.holdActive.set(id, {
+          ...holdActive,
+          start
+        });
+      }
+      addHoldCriterion(id, labelStack, name, start);
     }
-    addHoldCriterion(id, labelStack, name, start);
     return () => {
       const end = performance.now();
       if (isPerformanceTracingEnabled()) {
         try {
           // for Firefox 102 and older
-          if (fg('ufo_chrome_devtools_uplift')) {
-            performance.measure(`🛸 ${labelStackToString(labelStack, name)} [hold]`, {
-              start,
-              end,
-              detail: {
-                devtools: {
-                  track: '🛸 reactUFO detailed timings',
-                  color: 'secondary-light'
-                }
+          performance.measure(`🛸 ${labelStackToString(labelStack, name)} [hold]`, {
+            start,
+            end,
+            detail: {
+              devtools: {
+                track: '🛸 reactUFO detailed timings',
+                color: 'secondary-light'
               }
-            });
-          } else {
-            performance.measure(`🛸 ${labelStackToString(labelStack, name)} [hold]`, {
-              start,
-              end
-            });
-          }
+            }
+          });
         } catch (e) {
           // do nothing
         }
@@ -383,6 +376,21 @@ export function addHold(interactionId, labelStack, name, experimental) {
           });
           interaction.holdExpActive.delete(id);
         }
+        if (fg('platform_ufo_enable_ttai_with_3p')) {
+          if (interaction.hold3pActive) {
+            const current3pHold = interaction.hold3pActive.get(id);
+            if (current3pHold != null) {
+              if (!currentInteraction.hold3pInfo) {
+                currentInteraction.hold3pInfo = [];
+              }
+              currentInteraction.hold3pInfo.push({
+                ...current3pHold,
+                end
+              });
+              interaction.hold3pActive.delete(id);
+            }
+          }
+        }
       }
     };
   }
@@ -392,13 +400,36 @@ export function addHoldByID(interactionId, labelStack, name, id, ignoreOnSubmit)
   const interaction = interactions.get(interactionId);
   if (interaction != null) {
     const start = performance.now();
-    interaction.holdActive.set(id, {
-      labelStack,
-      name,
-      start,
-      ignoreOnSubmit
-    });
-    addHoldCriterion(id, labelStack, name, start);
+    if (fg('platform_ufo_enable_ttai_with_3p')) {
+      const is3pHold = labelStack.some(l => 'type' in l && l.type === 'third-party');
+      if (is3pHold) {
+        if (!interaction.hold3pActive) {
+          interaction.hold3pActive = new Map();
+        }
+        interaction.hold3pActive.set(id, {
+          labelStack,
+          name,
+          start,
+          ignoreOnSubmit
+        });
+      } else {
+        interaction.holdActive.set(id, {
+          labelStack,
+          name,
+          start,
+          ignoreOnSubmit
+        });
+        addHoldCriterion(id, labelStack, name, start);
+      }
+    } else {
+      interaction.holdActive.set(id, {
+        labelStack,
+        name,
+        start,
+        ignoreOnSubmit
+      });
+      addHoldCriterion(id, labelStack, name, start);
+    }
   }
   return () => {};
 }
@@ -416,6 +447,21 @@ export function removeHoldByID(interactionId, id) {
       interaction.holdActive.delete(id);
       removeHoldCriterion(id);
     }
+    if (fg('platform_ufo_enable_ttai_with_3p')) {
+      if (interaction.hold3pActive) {
+        const current3pHold = interaction.hold3pActive.get(id);
+        if (currentInteraction != null && current3pHold != null) {
+          if (!currentInteraction.hold3pInfo) {
+            currentInteraction.hold3pInfo = [];
+          }
+          currentInteraction.hold3pInfo.push({
+            ...current3pHold,
+            end
+          });
+          interaction.hold3pActive.delete(id);
+        }
+      }
+    }
   }
 }
 export function getCurrentInteractionType(interactionId) {
@@ -489,23 +535,16 @@ export function addProfilerTimings(interactionId, labelStack, type, actualDurati
   if (isPerformanceTracingEnabled()) {
     try {
       // for Firefox 102 and older
-      if (fg('ufo_chrome_devtools_uplift')) {
-        performance.measure(`🛸 ${labelStackToString(labelStack)} [react-profiler] ${type}`, {
-          start: startTime,
-          duration: actualDuration,
-          detail: {
-            devtools: {
-              track: '🛸 reactUFO detailed timings',
-              color: 'secondary-dark'
-            }
+      performance.measure(`🛸 ${labelStackToString(labelStack)} [react-profiler] ${type}`, {
+        start: startTime,
+        duration: actualDuration,
+        detail: {
+          devtools: {
+            track: '🛸 reactUFO detailed timings',
+            color: 'secondary-dark'
           }
-        });
-      } else {
-        performance.measure(`🛸 ${labelStackToString(labelStack)} [react-profiler] ${type}`, {
-          start: startTime,
-          duration: actualDuration
-        });
-      }
+        }
+      });
     } catch (e) {
       // do nothing
     }
@@ -537,37 +576,29 @@ function callCleanUpCallbacks(interaction) {
   });
 }
 function finishInteraction(id, data, endTime = performance.now()) {
-  var _getConfig4, _getConfig4$vc, _getConfig5, _getConfig5$experimen;
+  var _getConfig4, _getConfig4$vc;
   data.end = endTime;
   try {
     // for Firefox 102 and older
-
-    if (fg('ufo_chrome_devtools_uplift')) {
-      performance.measure(`🛸 [${data.type}] ${data.ufoName} [ttai]`, {
-        start: data.start,
-        end: data.end,
-        detail: {
-          devtools: {
-            track: 'main metrics',
-            trackGroup: '🛸 reactUFO metrics',
-            color: 'tertiary'
-          }
+    performance.measure(`🛸 [${data.type}] ${data.ufoName} [ttai]`, {
+      start: data.start,
+      end: data.end,
+      detail: {
+        devtools: {
+          track: 'main metrics',
+          trackGroup: '🛸 reactUFO metrics',
+          color: 'tertiary'
         }
-      });
-      performance.mark(`TTAI`, {
-        startTime: data.end,
-        detail: {
-          devtools: {
-            dataType: 'marker'
-          }
+      }
+    });
+    performance.mark(`TTAI`, {
+      startTime: data.end,
+      detail: {
+        devtools: {
+          dataType: 'marker'
         }
-      });
-    } else {
-      performance.measure(`🛸 [${data.type}] ${data.ufoName} [ttai]`, {
-        start: data.start,
-        end: data.end
-      });
-    }
+      }
+    });
   } catch (e) {
     // do nothing
   }
@@ -596,13 +627,31 @@ function finishInteraction(id, data, endTime = performance.now()) {
       postInteractionLog.stopVCObserver();
     }
   }
-  if (!((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5$experimen = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5$experimen !== void 0 && _getConfig5$experimen.enabled)) {
-    remove(id);
+  if (fg('platform_ufo_enable_ttai_with_3p')) {
+    if (!data.hold3pActive || data.hold3pActive.size === 0) {
+      var _getConfig5, _getConfig5$experimen;
+      if (!((_getConfig5 = getConfig()) !== null && _getConfig5 !== void 0 && (_getConfig5$experimen = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5$experimen !== void 0 && _getConfig5$experimen.enabled)) {
+        remove(id);
+      }
+      interactionExtraMetrics.stopVCObserver();
+    }
+  } else {
+    var _getConfig6, _getConfig6$experimen;
+    if (!((_getConfig6 = getConfig()) !== null && _getConfig6 !== void 0 && (_getConfig6$experimen = _getConfig6.experimentalInteractionMetrics) !== null && _getConfig6$experimen !== void 0 && _getConfig6$experimen.enabled)) {
+      remove(id);
+    }
   }
   PreviousInteractionLog.name = data.ufoName || 'unknown';
   PreviousInteractionLog.isAborted = data.abortReason != null;
   if (data.ufoName) {
-    handleInteraction(id, data);
+    if (fg('platform_ufo_enable_ttai_with_3p')) {
+      if (interactionExtraMetrics.finishedInteractionId !== id) {
+        // If this same interaction was not already handled, handle it
+        handleInteraction(id, data);
+      }
+    } else {
+      handleInteraction(id, data);
+    }
   }
   if (isPerformanceTracingEnabled()) {
     const profilerTimingMap = new Map();
@@ -625,23 +674,16 @@ function finishInteraction(id, data, endTime = performance.now()) {
         start,
         end
       }] of profilerTimingMap.entries()) {
-        if (fg('ufo_chrome_devtools_uplift')) {
-          performance.measure(`🛸 ${labelStackToString(labelStack)} [segment_ttai]`, {
-            start,
-            end,
-            detail: {
-              devtools: {
-                track: '🛸 reactUFO detailed timings',
-                color: 'secondary-dark'
-              }
+        performance.measure(`🛸 ${labelStackToString(labelStack)} [segment_ttai]`, {
+          start,
+          end,
+          detail: {
+            devtools: {
+              track: '🛸 reactUFO detailed timings',
+              color: 'secondary-dark'
             }
-          });
-        } else {
-          performance.measure(`🛸 ${labelStackToString(labelStack)} [segment_ttai]`, {
-            start,
-            end
-          });
-        }
+          }
+        });
       }
     } catch (e) {
       // do nothing
@@ -677,12 +719,12 @@ export function tryComplete(interactionId, endTime) {
     const noMoreActiveHolds = interaction.holdActive.size === 0;
     const noMoreExpHolds = interaction.holdExpActive.size === 0;
     const postInteraction = async () => {
-      var _getConfig6, _getConfig6$postInter, _getConfig8, _getConfig8$experimen;
-      if ((_getConfig6 = getConfig()) !== null && _getConfig6 !== void 0 && (_getConfig6$postInter = _getConfig6.postInteractionLog) !== null && _getConfig6$postInter !== void 0 && _getConfig6$postInter.enabled) {
-        var _getConfig7, _getConfig7$experimen;
+      var _getConfig7, _getConfig7$postInter;
+      if ((_getConfig7 = getConfig()) !== null && _getConfig7 !== void 0 && (_getConfig7$postInter = _getConfig7.postInteractionLog) !== null && _getConfig7$postInter !== void 0 && _getConfig7$postInter.enabled) {
+        var _getConfig8, _getConfig8$experimen;
         let experimentalVC90;
         let experimentalTTAI;
-        if ((_getConfig7 = getConfig()) !== null && _getConfig7 !== void 0 && (_getConfig7$experimen = _getConfig7.experimentalInteractionMetrics) !== null && _getConfig7$experimen !== void 0 && _getConfig7$experimen.enabled) {
+        if ((_getConfig8 = getConfig()) !== null && _getConfig8 !== void 0 && (_getConfig8$experimen = _getConfig8.experimentalInteractionMetrics) !== null && _getConfig8$experimen !== void 0 && _getConfig8$experimen.enabled) {
           var _await$getExperimenta;
           experimentalVC90 = (_await$getExperimenta = await getExperimentalVCMetrics(interaction)) === null || _await$getExperimenta === void 0 ? void 0 : _await$getExperimenta['metric:experimental:vc90'];
           const {
@@ -697,22 +739,59 @@ export function tryComplete(interactionId, endTime) {
           experimentalVC90
         });
       }
-      if ((_getConfig8 = getConfig()) !== null && _getConfig8 !== void 0 && (_getConfig8$experimen = _getConfig8.experimentalInteractionMetrics) !== null && _getConfig8$experimen !== void 0 && _getConfig8$experimen.enabled) {
-        remove(interactionId);
+      if (fg('platform_ufo_enable_ttai_with_3p')) {
+        if (interactionExtraMetrics.finishedInteractionId !== 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) {
+            remove(interactionId);
+          }
+        }
+      } else {
+        var _getConfig0, _getConfig0$experimen;
+        if ((_getConfig0 = getConfig()) !== null && _getConfig0 !== void 0 && (_getConfig0$experimen = _getConfig0.experimentalInteractionMetrics) !== null && _getConfig0$experimen !== void 0 && _getConfig0$experimen.enabled) {
+          remove(interactionId);
+        }
       }
       activeSubmitted = false;
     };
-    if (noMoreActiveHolds) {
-      if (!activeSubmitted) {
-        finishInteraction(interactionId, interaction, endTime);
-        activeSubmitted = true;
+    if (fg('platform_ufo_enable_ttai_with_3p')) {
+      var _interaction$hold3pAc;
+      const noMoreActive3pHolds = ((_interaction$hold3pAc = interaction.hold3pActive) === null || _interaction$hold3pAc === void 0 ? void 0 : _interaction$hold3pAc.size) === 0 || interaction.hold3pActive === undefined;
+      if (noMoreActiveHolds) {
+        if (!activeSubmitted) {
+          finishInteraction(interactionId, interaction, endTime);
+          interactionExtraMetrics.updateFinishedInteractionId(interactionId);
+          activeSubmitted = true;
+        }
+        if (noMoreExpHolds) {
+          var _getConfig1, _getConfig1$experimen;
+          if ((_getConfig1 = getConfig()) !== null && _getConfig1 !== void 0 && (_getConfig1$experimen = _getConfig1.experimentalInteractionMetrics) !== null && _getConfig1$experimen !== void 0 && _getConfig1$experimen.enabled) {
+            onExperimentalInteractionComplete(interactionId, interaction, endTime);
+          }
+          postInteraction();
+        }
+        if (noMoreActive3pHolds) {
+          const data = {
+            ...interaction,
+            end: endTime
+          };
+          interactionExtraMetrics.onInteractionComplete(interactionId, data);
+        }
       }
-      if (noMoreExpHolds) {
-        var _getConfig9, _getConfig9$experimen;
-        if ((_getConfig9 = getConfig()) !== null && _getConfig9 !== void 0 && (_getConfig9$experimen = _getConfig9.experimentalInteractionMetrics) !== null && _getConfig9$experimen !== void 0 && _getConfig9$experimen.enabled) {
-          onExperimentalInteractionComplete(interactionId, interaction, endTime);
+    } else {
+      if (noMoreActiveHolds) {
+        if (!activeSubmitted) {
+          finishInteraction(interactionId, interaction, endTime);
+          activeSubmitted = true;
+        }
+        if (noMoreExpHolds) {
+          var _getConfig10, _getConfig10$experime;
+          if ((_getConfig10 = getConfig()) !== null && _getConfig10 !== void 0 && (_getConfig10$experime = _getConfig10.experimentalInteractionMetrics) !== null && _getConfig10$experime !== void 0 && _getConfig10$experime.enabled) {
+            onExperimentalInteractionComplete(interactionId, interaction, endTime);
+          }
+          postInteraction();
         }
-        postInteraction();
       }
     }
   }
@@ -740,6 +819,11 @@ export function abort(interactionId, abortReason) {
     finishInteraction(interactionId, interaction);
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
+    if (fg('platform_ufo_enable_ttai_with_3p')) {
+      interactionExtraMetrics.stopVCObserver();
+      interactionExtraMetrics.reset();
+      remove(interactionId);
+    }
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
       remove(interactionId);
@@ -765,6 +849,11 @@ export function abortByNewInteraction(interactionId, interactionName) {
     finishInteraction(interactionId, interaction);
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
+    if (fg('platform_ufo_enable_ttai_with_3p')) {
+      interactionExtraMetrics.stopVCObserver();
+      interactionExtraMetrics.reset();
+      remove(interactionId);
+    }
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
       remove(interactionId);
@@ -794,6 +883,11 @@ export function abortAll(abortReason, abortedByInteractionName) {
     finishInteraction(interactionId, interaction);
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
+    if (fg('platform_ufo_enable_ttai_with_3p')) {
+      interactionExtraMetrics.stopVCObserver();
+      interactionExtraMetrics.reset();
+      remove(interactionId);
+    }
     if (coinflip(getExperimentalInteractionRate(interaction.ufoName, interaction.type))) {
       onExperimentalInteractionComplete(interactionId, interaction);
       remove(interactionId);
@@ -890,7 +984,9 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
     timerID,
     changeTimeout,
     trace,
-    vcObserver
+    vcObserver,
+    hold3pActive: new Map(),
+    hold3pInfo: []
   };
   if (addFeatureFlagsToInteraction) {
     currentFeatureFlagsAccessed.clear();
@@ -929,10 +1025,10 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
       });
     }
     if (fg('platform_ufo_post_interaction_check_name')) {
-      var _getConfig0, _getConfig0$postInter;
+      var _getConfig11, _getConfig11$postInte;
       // Start post interaction observer for all if config is enabled
       // in case ufoName is updated at later time
-      if ((_getConfig0 = getConfig()) !== null && _getConfig0 !== void 0 && (_getConfig0$postInter = _getConfig0.postInteractionLog) !== null && _getConfig0$postInter !== void 0 && _getConfig0$postInter.enabled) {
+      if ((_getConfig11 = getConfig()) !== null && _getConfig11 !== void 0 && (_getConfig11$postInte = _getConfig11.postInteractionLog) !== null && _getConfig11$postInte !== void 0 && _getConfig11$postInte.enabled) {
         postInteractionLog.startVCObserver({
           startTime
         });
@@ -949,6 +1045,11 @@ export function addNewInteraction(interactionId, ufoName, type, startTime, rate,
         startTime
       });
     }
+    if (fg('platform_ufo_enable_ttai_with_3p')) {
+      interactionExtraMetrics.startVCObserver({
+        startTime
+      }, interactionId);
+    }
   }
   if (type === 'press' && fg('platform_ufo_enable_vc_press_interactions')) {
     // Use per-interaction VC observer if available, otherwise fall back to global
@@ -976,35 +1077,27 @@ export function addApdexToAll(apdex) {
   interactions.forEach((interaction, key) => {
     interaction.apdex.push(apdex);
     try {
+      var _apdex$startTime;
       // for Firefox 102 and older
-      if (fg('ufo_chrome_devtools_uplift')) {
-        var _apdex$startTime;
-        performance.measure(`🛸 ${apdex.key} [bm3_tti]`, {
-          start: (_apdex$startTime = apdex.startTime) !== null && _apdex$startTime !== void 0 ? _apdex$startTime : interaction.start,
-          end: apdex.stopTime,
-          detail: {
-            devtools: {
-              track: 'main metrics',
-              trackGroup: '🛸 reactUFO metrics',
-              color: 'primary-dark'
-            }
+      performance.measure(`🛸 ${apdex.key} [bm3_tti]`, {
+        start: (_apdex$startTime = apdex.startTime) !== null && _apdex$startTime !== void 0 ? _apdex$startTime : interaction.start,
+        end: apdex.stopTime,
+        detail: {
+          devtools: {
+            track: 'main metrics',
+            trackGroup: '🛸 reactUFO metrics',
+            color: 'primary-dark'
           }
-        });
-        performance.mark(`[bm3] TTI`, {
-          startTime: apdex.stopTime,
-          detail: {
-            devtools: {
-              dataType: 'marker'
-            }
+        }
+      });
+      performance.mark(`[bm3] TTI`, {
+        startTime: apdex.stopTime,
+        detail: {
+          devtools: {
+            dataType: 'marker'
           }
-        });
-      } else {
-        var _apdex$startTime2;
-        performance.measure(`🛸 ${apdex.key} [bm3_tti]`, {
-          start: (_apdex$startTime2 = apdex.startTime) !== null && _apdex$startTime2 !== void 0 ? _apdex$startTime2 : interaction.start,
-          end: apdex.stopTime
-        });
-      }
+        }
+      });
     } catch (e) {
       // do nothing
     }
@@ -1018,35 +1111,27 @@ export function addApdex(interactionId, apdexInfo) {
   if (interaction != null) {
     interaction.apdex.push(apdexInfo);
     try {
+      var _apdexInfo$startTime;
       // for Firefox 102 and older
-      if (fg('ufo_chrome_devtools_uplift')) {
-        var _apdexInfo$startTime;
-        performance.measure(`🛸 ${apdexInfo.key} [bm3_tti]`, {
-          start: (_apdexInfo$startTime = apdexInfo.startTime) !== null && _apdexInfo$startTime !== void 0 ? _apdexInfo$startTime : interaction.start,
-          end: apdexInfo.stopTime,
-          detail: {
-            devtools: {
-              track: 'main metrics',
-              trackGroup: '🛸 reactUFO metrics',
-              color: 'primary-dark'
-            }
+      performance.measure(`🛸 ${apdexInfo.key} [bm3_tti]`, {
+        start: (_apdexInfo$startTime = apdexInfo.startTime) !== null && _apdexInfo$startTime !== void 0 ? _apdexInfo$startTime : interaction.start,
+        end: apdexInfo.stopTime,
+        detail: {
+          devtools: {
+            track: 'main metrics',
+            trackGroup: '🛸 reactUFO metrics',
+            color: 'primary-dark'
           }
-        });
-        performance.mark(`[bm3] TTI`, {
-          startTime: apdexInfo.stopTime,
-          detail: {
-            devtools: {
-              dataType: 'marker'
-            }
+        }
+      });
+      performance.mark(`[bm3] TTI`, {
+        startTime: apdexInfo.stopTime,
+        detail: {
+          devtools: {
+            dataType: 'marker'
           }
-        });
-      } else {
-        var _apdexInfo$startTime2;
-        performance.measure(`🛸 ${apdexInfo.key} [bm3_tti]`, {
-          start: (_apdexInfo$startTime2 = apdexInfo.startTime) !== null && _apdexInfo$startTime2 !== void 0 ? _apdexInfo$startTime2 : interaction.start,
-          end: apdexInfo.stopTime
-        });
-      }
+        }
+      });
     } catch (e) {
       // do nothing
     }
@@ -1114,26 +1199,18 @@ export function addRedirect(interactionId, fromUfoName, nextUfoName, nextRouteNa
     if (isPerformanceTracingEnabled()) {
       const prevRedirect = interaction.redirects.at(-2);
       try {
+        var _prevRedirect$time;
         // for Firefox 102 and older
-        if (fg('ufo_chrome_devtools_uplift')) {
-          var _prevRedirect$time;
-          performance.measure(`🛸 ${nextUfoName} [redirect]`, {
-            start: (_prevRedirect$time = prevRedirect === null || prevRedirect === void 0 ? void 0 : prevRedirect.time) !== null && _prevRedirect$time !== void 0 ? _prevRedirect$time : interaction.start,
-            end: time,
-            detail: {
-              devtools: {
-                track: '🛸 reactUFO detailed timings',
-                color: 'tertiary'
-              }
+        performance.measure(`🛸 ${nextUfoName} [redirect]`, {
+          start: (_prevRedirect$time = prevRedirect === null || prevRedirect === void 0 ? void 0 : prevRedirect.time) !== null && _prevRedirect$time !== void 0 ? _prevRedirect$time : interaction.start,
+          end: time,
+          detail: {
+            devtools: {
+              track: '🛸 reactUFO detailed timings',
+              color: 'tertiary'
             }
-          });
-        } else {
-          var _prevRedirect$time2;
-          performance.measure(`🛸 ${nextUfoName} [redirect]`, {
-            start: (_prevRedirect$time2 = prevRedirect === null || prevRedirect === void 0 ? void 0 : prevRedirect.time) !== null && _prevRedirect$time2 !== void 0 ? _prevRedirect$time2 : interaction.start,
-            end: time
-          });
-        }
+          }
+        });
       } catch (e) {
         // do nothing
       }