@atlaskit/react-ufo 5.5.0 → 5.5.2

package/AGENTS.md

@@ -257,12 +257,10 @@ The package uses platform feature flags for gradual rollouts. Key flags are defi
 
 | Flag                                                | Purpose                          |
 | --------------------------------------------------- | -------------------------------- |
-| `platform_ufo_enable_ttai_with_3p`                  | Third-party segment timing       |
 | `platform_ufo_enable_vc_raw_data`                   | Raw VC data inclusion            |
 | `platform_ufo_segment_critical_metrics`             | Segment-level metrics            |
 | `platform_ufo_enable_terminal_errors`               | Terminal error tracking          |
 | `platform_ufo_raw_data_thirdparty`                  | Third-party raw data behavior    |
-| `platform_ufo_enable_finish_interaction_transition` | Finish interaction on transition |
 
 ## Testing
 

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 5.5.2
+
+### Patch Changes
+
+- [`74b7d44630b84`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/74b7d44630b84) -
+  Clean up feature gate platform_ufo_enable_finish_interaction_transition - gate always evaluates to
+  true
+
+## 5.5.1
+
+### Patch Changes
+
+- [`d52302fe9ea1b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d52302fe9ea1b) -
+  Clean up platform_ufo_exclude_3p_attribute_changes feature gate, assuming always true
+- [`ac3d03af6d443`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ac3d03af6d443) -
+  Clean up feature gate platform_ufo_exclude_3p_elements_from_ttai - gate always evaluates to true
+
 ## 5.5.0
 
 ### Minor Changes

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

@@ -404,7 +404,7 @@ function removeHoldCriterion(id) {
   }
   window.__CRITERION__.removeUFOHold(id);
 }
-function addHold(interactionId, labelStack, name, experimental) {
+function addHold(interactionId, labelStack, name, _experimental) {
   var interaction = _constants.interactions.get(interactionId);
   // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
   var id = (0, _uuid.v4)();
@@ -419,35 +419,20 @@ function addHold(interactionId, labelStack, name, experimental) {
       name: name,
       start: start
     };
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      var is3pHold = labelStack.some(function (l) {
-        return 'type' in l && l.type === 'third-party';
-      });
-      if (is3pHold) {
-        if (!interaction.hold3pActive) {
-          interaction.hold3pActive = new Map();
-        }
-        interaction.hold3pActive.set(id, _objectSpread(_objectSpread({}, holdActive), {}, {
-          start: start
-        }));
-      } else {
-        interaction.holdActive.set(id, _objectSpread(_objectSpread({}, holdActive), {}, {
-          start: start
-        }));
-        addHoldCriterion(id, labelStack, name, start);
+    var is3pHold = labelStack.some(function (l) {
+      return 'type' in l && l.type === 'third-party';
+    });
+    if (is3pHold) {
+      if (!interaction.hold3pActive) {
+        interaction.hold3pActive = new Map();
       }
+      interaction.hold3pActive.set(id, _objectSpread(_objectSpread({}, holdActive), {}, {
+        start: start
+      }));
     } else {
-      var _getConfig2;
-      if ((_getConfig2 = (0, _config.getConfig)()) !== null && _getConfig2 !== void 0 && (_getConfig2 = _getConfig2.experimentalInteractionMetrics) !== null && _getConfig2 !== void 0 && _getConfig2.enabled && experimental) {
-        interaction.holdExpActive.set(id, _objectSpread(_objectSpread({}, holdActive), {}, {
-          start: start
-        }));
-      }
-      if (!experimental) {
-        interaction.holdActive.set(id, _objectSpread(_objectSpread({}, holdActive), {}, {
-          start: start
-        }));
-      }
+      interaction.holdActive.set(id, _objectSpread(_objectSpread({}, holdActive), {}, {
+        start: start
+      }));
       addHoldCriterion(id, labelStack, name, start);
     }
     return function () {
@@ -486,18 +471,16 @@ function addHold(interactionId, labelStack, name, experimental) {
           }));
           interaction.holdExpActive.delete(id);
         }
-        if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-          if (interaction.hold3pActive) {
-            var current3pHold = interaction.hold3pActive.get(id);
-            if (current3pHold != null) {
-              if (!currentInteraction.hold3pInfo) {
-                currentInteraction.hold3pInfo = [];
-              }
-              currentInteraction.hold3pInfo.push(_objectSpread(_objectSpread({}, current3pHold), {}, {
-                end: end
-              }));
-              interaction.hold3pActive.delete(id);
+        if (interaction.hold3pActive) {
+          var current3pHold = interaction.hold3pActive.get(id);
+          if (current3pHold != null) {
+            if (!currentInteraction.hold3pInfo) {
+              currentInteraction.hold3pInfo = [];
             }
+            currentInteraction.hold3pInfo.push(_objectSpread(_objectSpread({}, current3pHold), {}, {
+              end: end
+            }));
+            interaction.hold3pActive.delete(id);
           }
         }
       }
@@ -509,29 +492,19 @@ function addHoldByID(interactionId, labelStack, name, id, ignoreOnSubmit) {
   var interaction = _constants.interactions.get(interactionId);
   if (interaction != null) {
     var start = performance.now();
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      var is3pHold = labelStack.some(function (l) {
-        return 'type' in l && l.type === 'third-party';
-      });
-      if (is3pHold) {
-        if (!interaction.hold3pActive) {
-          interaction.hold3pActive = new Map();
-        }
-        interaction.hold3pActive.set(id, {
-          labelStack: labelStack,
-          name: name,
-          start: start,
-          ignoreOnSubmit: ignoreOnSubmit
-        });
-      } else {
-        interaction.holdActive.set(id, {
-          labelStack: labelStack,
-          name: name,
-          start: start,
-          ignoreOnSubmit: ignoreOnSubmit
-        });
-        addHoldCriterion(id, labelStack, name, start);
+    var is3pHold = labelStack.some(function (l) {
+      return 'type' in l && l.type === 'third-party';
+    });
+    if (is3pHold) {
+      if (!interaction.hold3pActive) {
+        interaction.hold3pActive = new Map();
       }
+      interaction.hold3pActive.set(id, {
+        labelStack: labelStack,
+        name: name,
+        start: start,
+        ignoreOnSubmit: ignoreOnSubmit
+      });
     } else {
       interaction.holdActive.set(id, {
         labelStack: labelStack,
@@ -557,18 +530,16 @@ function removeHoldByID(interactionId, id) {
       interaction.holdActive.delete(id);
       removeHoldCriterion(id);
     }
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      if (interaction.hold3pActive) {
-        var current3pHold = interaction.hold3pActive.get(id);
-        if (currentInteraction != null && current3pHold != null) {
-          if (!currentInteraction.hold3pInfo) {
-            currentInteraction.hold3pInfo = [];
-          }
-          currentInteraction.hold3pInfo.push(_objectSpread(_objectSpread({}, current3pHold), {}, {
-            end: end
-          }));
-          interaction.hold3pActive.delete(id);
+    if (interaction.hold3pActive) {
+      var current3pHold = interaction.hold3pActive.get(id);
+      if (currentInteraction != null && current3pHold != null) {
+        if (!currentInteraction.hold3pInfo) {
+          currentInteraction.hold3pInfo = [];
         }
+        currentInteraction.hold3pInfo.push(_objectSpread(_objectSpread({}, current3pHold), {}, {
+          end: end
+        }));
+        interaction.hold3pActive.delete(id);
       }
     }
   }
@@ -644,7 +615,7 @@ function addErrorToAll(name, labelStack, errorType, errorMessage, errorStack, er
   });
 }
 function addProfilerTimings(interactionId, labelStack, type, actualDuration, baseDuration, startTime, commitTime) {
-  var _getConfig3;
+  var _getConfig2;
   if (isPerformanceTracingEnabled()) {
     try {
       // for Firefox 102 and older
@@ -672,7 +643,7 @@ function addProfilerTimings(interactionId, labelStack, type, actualDuration, bas
       startTime: startTime,
       commitTime: commitTime
     });
-  } else if ((_getConfig3 = (0, _config.getConfig)()) !== null && _getConfig3 !== void 0 && (_getConfig3 = _getConfig3.postInteractionLog) !== null && _getConfig3 !== void 0 && _getConfig3.enabled) {
+  } else if ((_getConfig2 = (0, _config.getConfig)()) !== null && _getConfig2 !== void 0 && (_getConfig2 = _getConfig2.postInteractionLog) !== null && _getConfig2 !== void 0 && _getConfig2.enabled) {
     postInteractionLog.addProfilerTimings(labelStack, type, actualDuration, baseDuration, startTime, commitTime);
   }
 }
@@ -689,7 +660,7 @@ function callCleanUpCallbacks(interaction) {
   });
 }
 function finishInteraction(id, data) {
-  var _getConfig4;
+  var _getConfig3;
   var endTime = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : performance.now();
   data.end = endTime;
   try {
@@ -722,7 +693,7 @@ function finishInteraction(id, data) {
   (0, _experienceTraceIdContext.clearActiveTrace)();
   callCleanUpCallbacks(data);
   (0, _ssrRenderProfiler.flushSsrRenderProfilerTraces)();
-  if ((_getConfig4 = (0, _config.getConfig)()) !== null && _getConfig4 !== void 0 && (_getConfig4 = _getConfig4.vc) !== null && _getConfig4 !== void 0 && _getConfig4.stopVCAtInteractionFinish) {
+  if ((_getConfig3 = (0, _config.getConfig)()) !== null && _getConfig3 !== void 0 && (_getConfig3 = _getConfig3.vc) !== null && _getConfig3 !== void 0 && _getConfig3.stopVCAtInteractionFinish) {
     // Use per-interaction VC observer if available, otherwise fall back to global
     var observer = data.vcObserver;
     if (observer) {
@@ -738,19 +709,11 @@ function finishInteraction(id, data) {
   if (!(0, _coinflip.default)((0, _config.getPostInteractionRate)(sanitisedUfoName, data.type))) {
     postInteractionLog.stopVCObserver();
   }
-  if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-    var _sanitisedUfoName = (0, _utils.sanitizeUfoName)(data.ufoName);
-    if (!(0, _coinflip.default)((0, _config.getExtraInteractionRate)(_sanitisedUfoName, data.type))) {
-      interactionExtraMetrics.stopAll(id);
-    } else if (!data.hold3pActive || data.hold3pActive.size === 0) {
-      var _getConfig5;
-      if (!((_getConfig5 = (0, _config.getConfig)()) !== null && _getConfig5 !== void 0 && (_getConfig5 = _getConfig5.experimentalInteractionMetrics) !== null && _getConfig5 !== void 0 && _getConfig5.enabled)) {
-        remove(id);
-      }
-    }
-  } else {
-    var _getConfig6;
-    if (!((_getConfig6 = (0, _config.getConfig)()) !== null && _getConfig6 !== void 0 && (_getConfig6 = _getConfig6.experimentalInteractionMetrics) !== null && _getConfig6 !== void 0 && _getConfig6.enabled)) {
+  if (!(0, _coinflip.default)((0, _config.getExtraInteractionRate)(sanitisedUfoName, data.type))) {
+    interactionExtraMetrics.stopAll(id);
+  } else if (!data.hold3pActive || data.hold3pActive.size === 0) {
+    var _getConfig4;
+    if (!((_getConfig4 = (0, _config.getConfig)()) !== null && _getConfig4 !== void 0 && (_getConfig4 = _getConfig4.experimentalInteractionMetrics) !== null && _getConfig4 !== void 0 && _getConfig4.enabled)) {
       remove(id);
     }
   }
@@ -762,13 +725,9 @@ function finishInteraction(id, data) {
   PreviousInteractionLog.name = data.ufoName || 'unknown';
   PreviousInteractionLog.isAborted = data.abortReason != null;
   if (data.ufoName) {
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      var _interactionExtraMetr;
-      if (((_interactionExtraMetr = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr === void 0 ? void 0 : _interactionExtraMetr.id) !== id) {
-        // If this same interaction was not already handled, handle it
-        handleInteraction(id, data);
-      }
-    } else {
+    var _interactionExtraMetr;
+    if (((_interactionExtraMetr = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr === void 0 ? void 0 : _interactionExtraMetr.id) !== id) {
+      // If this same interaction was not already handled, handle it
       handleInteraction(id, data);
     }
   }
@@ -844,21 +803,22 @@ var activeSubmitted = false;
 function tryComplete(interactionId, endTime) {
   var interaction = _constants.interactions.get(interactionId);
   if (interaction != null) {
+    var _interaction$hold3pAc;
     var noMoreActiveHolds = interaction.holdActive.size === 0;
     var noMoreExpHolds = interaction.holdExpActive.size === 0;
     var shouldUseRawDataThirdParty = (0, _config.shouldUseRawDataThirdPartyBehavior)(interaction.ufoName, interaction.type);
     var postInteraction = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _getConfig7;
-        var _getConfig8, experimentalVC90, experimentalTTAI, _yield$getExperimenta, start, end, _interactionExtraMetr2, _getConfig9, _getConfig0;
+        var _getConfig5, _interactionExtraMetr2;
+        var _getConfig6, experimentalVC90, experimentalTTAI, _yield$getExperimenta, start, end, _getConfig7;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!((_getConfig7 = (0, _config.getConfig)()) !== null && _getConfig7 !== void 0 && (_getConfig7 = _getConfig7.postInteractionLog) !== null && _getConfig7 !== void 0 && _getConfig7.enabled)) {
+              if (!((_getConfig5 = (0, _config.getConfig)()) !== null && _getConfig5 !== void 0 && (_getConfig5 = _getConfig5.postInteractionLog) !== null && _getConfig5 !== void 0 && _getConfig5.enabled)) {
                 _context.next = 17;
                 break;
               }
-              if (!((_getConfig8 = (0, _config.getConfig)()) !== null && _getConfig8 !== void 0 && (_getConfig8 = _getConfig8.experimentalInteractionMetrics) !== null && _getConfig8 !== void 0 && _getConfig8.enabled)) {
+              if (!((_getConfig6 = (0, _config.getConfig)()) !== null && _getConfig6 !== void 0 && (_getConfig6 = _getConfig6.experimentalInteractionMetrics) !== null && _getConfig6 !== void 0 && _getConfig6.enabled)) {
                 _context.next = 16;
                 break;
               }
@@ -892,15 +852,9 @@ function tryComplete(interactionId, endTime) {
                 experimentalVC90: experimentalVC90
               }));
             case 17:
-              if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-                if (((_interactionExtraMetr2 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr2 === void 0 ? void 0 : _interactionExtraMetr2.id) !== interactionId) {
-                  // If interactionExtraMetrics is not waiting for measuring this interaction
-                  if ((_getConfig9 = (0, _config.getConfig)()) !== null && _getConfig9 !== void 0 && (_getConfig9 = _getConfig9.experimentalInteractionMetrics) !== null && _getConfig9 !== void 0 && _getConfig9.enabled) {
-                    remove(interactionId);
-                  }
-                }
-              } else {
-                if ((_getConfig0 = (0, _config.getConfig)()) !== null && _getConfig0 !== void 0 && (_getConfig0 = _getConfig0.experimentalInteractionMetrics) !== null && _getConfig0 !== void 0 && _getConfig0.enabled) {
+              if (((_interactionExtraMetr2 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr2 === void 0 ? void 0 : _interactionExtraMetr2.id) !== interactionId) {
+                // If interactionExtraMetrics is not waiting for measuring this interaction
+                if ((_getConfig7 = (0, _config.getConfig)()) !== null && _getConfig7 !== void 0 && (_getConfig7 = _getConfig7.experimentalInteractionMetrics) !== null && _getConfig7 !== void 0 && _getConfig7.enabled) {
                   remove(interactionId);
                 }
               }
@@ -915,103 +869,82 @@ function tryComplete(interactionId, endTime) {
         return _ref.apply(this, arguments);
       };
     }();
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      var _interaction$hold3pAc;
-      var noMoreActive3pHolds = ((_interaction$hold3pAc = interaction.hold3pActive) === null || _interaction$hold3pAc === void 0 ? void 0 : _interaction$hold3pAc.size) === 0 || interaction.hold3pActive === undefined;
+    var noMoreActive3pHolds = ((_interaction$hold3pAc = interaction.hold3pActive) === null || _interaction$hold3pAc === void 0 ? void 0 : _interaction$hold3pAc.size) === 0 || interaction.hold3pActive === undefined;
 
-      // If using raw data third party behavior, wait for 3p holds to clear
-      if (shouldUseRawDataThirdParty) {
-        // If there are no non-3p holds active, mark the interaction as successful
-        // but don't finish until 3p holds are cleared
-        if (noMoreActiveHolds && !noMoreActive3pHolds) {
-          // Mark interaction as successful by setting endTime, but don't finish yet
-          if (endTime !== undefined && interaction.end === 0) {
-            interaction.end = endTime;
-          }
-          // Wait for 3p holds to clear before finishing
-          return;
+    // If using raw data third party behavior, wait for 3p holds to clear
+    if (shouldUseRawDataThirdParty) {
+      // If there are no non-3p holds active, mark the interaction as successful
+      // but don't finish until 3p holds are cleared
+      if (noMoreActiveHolds && !noMoreActive3pHolds) {
+        // Mark interaction as successful by setting endTime, but don't finish yet
+        if (endTime !== undefined && interaction.end === 0) {
+          interaction.end = endTime;
         }
+        // Wait for 3p holds to clear before finishing
+        return;
+      }
 
-        // If all holds (including 3p) are cleared, finish the interaction
-        if (noMoreActiveHolds && noMoreActive3pHolds) {
-          if (!activeSubmitted) {
-            var _getConfig1, _getConfig10, _getConfig11;
-            // Set end3p to current time when 3p holds cleared, but ensure it's at least interaction.end
-            var currentTime = endTime !== null && endTime !== void 0 ? endTime : performance.now();
-            interaction.end3p = interaction.end !== 0 && currentTime < interaction.end ? interaction.end : currentTime;
-            finishInteraction(interactionId, interaction, interaction.end !== 0 ? interaction.end : endTime);
-            if ((_getConfig1 = (0, _config.getConfig)()) !== null && _getConfig1 !== void 0 && (_getConfig1 = _getConfig1.extraInteractionMetrics) !== null && _getConfig1 !== void 0 && _getConfig1.enabled) {
-              interactionExtraMetrics.updateFinishedInteraction(interaction);
-            }
-            if ((_getConfig10 = (0, _config.getConfig)()) !== null && _getConfig10 !== void 0 && (_getConfig10 = _getConfig10.extraSearchPageInteraction) !== null && _getConfig10 !== void 0 && _getConfig10.enabled && interaction.ufoName === ((_getConfig11 = (0, _config.getConfig)()) === null || _getConfig11 === void 0 || (_getConfig11 = _getConfig11.extraSearchPageInteraction) === null || _getConfig11 === void 0 ? void 0 : _getConfig11.searchPageMetricName)) {
-              (0, _createExtraSearchPageInteractionPayload.onSearchPageInteractionComplete)(interactionId, interaction);
-            }
-            activeSubmitted = true;
+      // If all holds (including 3p) are cleared, finish the interaction
+      if (noMoreActiveHolds && noMoreActive3pHolds) {
+        if (!activeSubmitted) {
+          var _getConfig8, _getConfig9, _getConfig0;
+          // Set end3p to current time when 3p holds cleared, but ensure it's at least interaction.end
+          var currentTime = endTime !== null && endTime !== void 0 ? endTime : performance.now();
+          interaction.end3p = interaction.end !== 0 && currentTime < interaction.end ? interaction.end : currentTime;
+          finishInteraction(interactionId, interaction, interaction.end !== 0 ? interaction.end : endTime);
+          if ((_getConfig8 = (0, _config.getConfig)()) !== null && _getConfig8 !== void 0 && (_getConfig8 = _getConfig8.extraInteractionMetrics) !== null && _getConfig8 !== void 0 && _getConfig8.enabled) {
+            interactionExtraMetrics.updateFinishedInteraction(interaction);
           }
-          if (noMoreExpHolds) {
-            var _getConfig12;
-            if ((_getConfig12 = (0, _config.getConfig)()) !== null && _getConfig12 !== void 0 && (_getConfig12 = _getConfig12.experimentalInteractionMetrics) !== null && _getConfig12 !== void 0 && _getConfig12.enabled) {
-              (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction, endTime || interaction.end);
-            }
-            postInteraction();
+          if ((_getConfig9 = (0, _config.getConfig)()) !== null && _getConfig9 !== void 0 && (_getConfig9 = _getConfig9.extraSearchPageInteraction) !== null && _getConfig9 !== void 0 && _getConfig9.enabled && interaction.ufoName === ((_getConfig0 = (0, _config.getConfig)()) === null || _getConfig0 === void 0 || (_getConfig0 = _getConfig0.extraSearchPageInteraction) === null || _getConfig0 === void 0 ? void 0 : _getConfig0.searchPageMetricName)) {
+            (0, _createExtraSearchPageInteractionPayload.onSearchPageInteractionComplete)(interactionId, interaction);
           }
+          activeSubmitted = true;
         }
-        // Send separated third-party event even when feature flag is active
-        if (noMoreActiveHolds && noMoreActive3pHolds) {
-          var data = _objectSpread(_objectSpread({}, interaction), {}, {
-            end: endTime || interaction.end
-          });
-          interactionExtraMetrics.onInteractionComplete(interactionId, data);
-        }
-      } else {
-        var _interactionExtraMetr3;
-        // Original behavior when feature flag is not active
-        if (noMoreActiveHolds && ((_interactionExtraMetr3 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr3 === void 0 ? void 0 : _interactionExtraMetr3.id) !== interactionId) {
-          // If it's not waiting for extra metrics to complete, finish the interaction as normal
-          if (!activeSubmitted) {
-            var _getConfig13, _getConfig14, _getConfig15;
-            finishInteraction(interactionId, interaction, endTime);
-            if ((_getConfig13 = (0, _config.getConfig)()) !== null && _getConfig13 !== void 0 && (_getConfig13 = _getConfig13.extraInteractionMetrics) !== null && _getConfig13 !== void 0 && _getConfig13.enabled) {
-              interactionExtraMetrics.updateFinishedInteraction(interaction);
-            }
-            if ((_getConfig14 = (0, _config.getConfig)()) !== null && _getConfig14 !== void 0 && (_getConfig14 = _getConfig14.extraSearchPageInteraction) !== null && _getConfig14 !== void 0 && _getConfig14.enabled && interaction.ufoName === ((_getConfig15 = (0, _config.getConfig)()) === null || _getConfig15 === void 0 || (_getConfig15 = _getConfig15.extraSearchPageInteraction) === null || _getConfig15 === void 0 ? void 0 : _getConfig15.searchPageMetricName)) {
-              (0, _createExtraSearchPageInteractionPayload.onSearchPageInteractionComplete)(interactionId, interaction);
-            }
-            activeSubmitted = true;
-          }
-          if (noMoreExpHolds) {
-            var _getConfig16;
-            if ((_getConfig16 = (0, _config.getConfig)()) !== null && _getConfig16 !== void 0 && (_getConfig16 = _getConfig16.experimentalInteractionMetrics) !== null && _getConfig16 !== void 0 && _getConfig16.enabled) {
-              (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction, endTime);
-            }
-            postInteraction();
+        if (noMoreExpHolds) {
+          var _getConfig1;
+          if ((_getConfig1 = (0, _config.getConfig)()) !== null && _getConfig1 !== void 0 && (_getConfig1 = _getConfig1.experimentalInteractionMetrics) !== null && _getConfig1 !== void 0 && _getConfig1.enabled) {
+            (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction, endTime || interaction.end);
           }
+          postInteraction();
         }
-        if (noMoreActiveHolds && noMoreActive3pHolds) {
-          var _data2 = _objectSpread(_objectSpread({}, interaction), {}, {
-            end: endTime
-          });
-          interactionExtraMetrics.onInteractionComplete(interactionId, _data2);
-        }
+      }
+      // Send separated third-party event even when feature flag is active
+      if (noMoreActiveHolds && noMoreActive3pHolds) {
+        var data = _objectSpread(_objectSpread({}, interaction), {}, {
+          end: endTime || interaction.end
+        });
+        interactionExtraMetrics.onInteractionComplete(interactionId, data);
       }
     } else {
-      if (noMoreActiveHolds) {
+      var _interactionExtraMetr3;
+      // Original behavior when feature flag is not active
+      if (noMoreActiveHolds && ((_interactionExtraMetr3 = interactionExtraMetrics.finishedInteraction) === null || _interactionExtraMetr3 === void 0 ? void 0 : _interactionExtraMetr3.id) !== interactionId) {
+        // If it's not waiting for extra metrics to complete, finish the interaction as normal
         if (!activeSubmitted) {
-          var _getConfig17, _getConfig18;
+          var _getConfig10, _getConfig11, _getConfig12;
           finishInteraction(interactionId, interaction, endTime);
-          if ((_getConfig17 = (0, _config.getConfig)()) !== null && _getConfig17 !== void 0 && (_getConfig17 = _getConfig17.extraSearchPageInteraction) !== null && _getConfig17 !== void 0 && _getConfig17.enabled && interaction.ufoName === ((_getConfig18 = (0, _config.getConfig)()) === null || _getConfig18 === void 0 || (_getConfig18 = _getConfig18.extraSearchPageInteraction) === null || _getConfig18 === void 0 ? void 0 : _getConfig18.searchPageMetricName)) {
+          if ((_getConfig10 = (0, _config.getConfig)()) !== null && _getConfig10 !== void 0 && (_getConfig10 = _getConfig10.extraInteractionMetrics) !== null && _getConfig10 !== void 0 && _getConfig10.enabled) {
+            interactionExtraMetrics.updateFinishedInteraction(interaction);
+          }
+          if ((_getConfig11 = (0, _config.getConfig)()) !== null && _getConfig11 !== void 0 && (_getConfig11 = _getConfig11.extraSearchPageInteraction) !== null && _getConfig11 !== void 0 && _getConfig11.enabled && interaction.ufoName === ((_getConfig12 = (0, _config.getConfig)()) === null || _getConfig12 === void 0 || (_getConfig12 = _getConfig12.extraSearchPageInteraction) === null || _getConfig12 === void 0 ? void 0 : _getConfig12.searchPageMetricName)) {
             (0, _createExtraSearchPageInteractionPayload.onSearchPageInteractionComplete)(interactionId, interaction);
           }
           activeSubmitted = true;
         }
         if (noMoreExpHolds) {
-          var _getConfig19;
-          if ((_getConfig19 = (0, _config.getConfig)()) !== null && _getConfig19 !== void 0 && (_getConfig19 = _getConfig19.experimentalInteractionMetrics) !== null && _getConfig19 !== void 0 && _getConfig19.enabled) {
+          var _getConfig13;
+          if ((_getConfig13 = (0, _config.getConfig)()) !== null && _getConfig13 !== void 0 && (_getConfig13 = _getConfig13.experimentalInteractionMetrics) !== null && _getConfig13 !== void 0 && _getConfig13.enabled) {
             (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction, endTime);
           }
           postInteraction();
         }
       }
+      if (noMoreActiveHolds && noMoreActive3pHolds) {
+        var _data2 = _objectSpread(_objectSpread({}, interaction), {}, {
+          end: endTime
+        });
+        interactionExtraMetrics.onInteractionComplete(interactionId, _data2);
+      }
     }
   }
 }
@@ -1034,9 +967,7 @@ function abort(interactionId, abortReason) {
       finishInteraction(interactionId, interaction, endTime);
       postInteractionLog.reset();
       postInteractionLog.stopVCObserver();
-      if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-        interactionExtraMetrics.stopAll(interactionId);
-      }
+      interactionExtraMetrics.stopAll(interactionId);
       if ((0, _coinflip.default)((0, _config.getExperimentalInteractionRate)(interaction.ufoName, interaction.type))) {
         (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction, endTime);
         remove(interactionId);
@@ -1048,9 +979,7 @@ function abort(interactionId, abortReason) {
     finishInteraction(interactionId, interaction);
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopAll(interactionId);
-    }
+    interactionExtraMetrics.stopAll(interactionId);
     if ((0, _coinflip.default)((0, _config.getExperimentalInteractionRate)(interaction.ufoName, interaction.type))) {
       (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction);
       remove(interactionId);
@@ -1072,9 +1001,7 @@ function abortByNewInteraction(interactionId, interactionName) {
       finishInteraction(interactionId, interaction, endTime);
       postInteractionLog.reset();
       postInteractionLog.stopVCObserver();
-      if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-        interactionExtraMetrics.stopAll(interactionId);
-      }
+      interactionExtraMetrics.stopAll(interactionId);
       if ((0, _coinflip.default)((0, _config.getExperimentalInteractionRate)(interaction.ufoName, interaction.type))) {
         (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction, endTime);
         remove(interactionId);
@@ -1087,9 +1014,7 @@ function abortByNewInteraction(interactionId, interactionName) {
     finishInteraction(interactionId, interaction);
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopAll(interactionId);
-    }
+    interactionExtraMetrics.stopAll(interactionId);
     if ((0, _coinflip.default)((0, _config.getExperimentalInteractionRate)(interaction.ufoName, interaction.type))) {
       (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction);
       remove(interactionId);
@@ -1108,7 +1033,7 @@ function abortAll(abortReason, abortedByInteractionName) {
   _constants.interactions.forEach(function (interaction, interactionId) {
     var isActiveInteraction = activeInteraction === interaction;
     var hasFinished = interaction.holdActive.size === 0;
-    if (isActiveInteraction && abortReason === 'transition' && interaction.type === 'press' && finishInteractions !== null && finishInteractions !== void 0 && finishInteractions.includes(interaction.ufoName) && (0, _platformFeatureFlags.fg)('platform_ufo_enable_finish_interaction_transition')) {
+    if (isActiveInteraction && abortReason === 'transition' && interaction.type === 'press' && finishInteractions !== null && finishInteractions !== void 0 && finishInteractions.includes(interaction.ufoName)) {
       hasFinished = true;
     }
     var shouldUseRawDataThirdParty = (0, _config.shouldUseRawDataThirdPartyBehavior)(interaction.ufoName, interaction.type);
@@ -1122,9 +1047,7 @@ function abortAll(abortReason, abortedByInteractionName) {
       finishInteraction(interactionId, interaction, endTime);
       postInteractionLog.reset();
       postInteractionLog.stopVCObserver();
-      if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-        interactionExtraMetrics.stopAll(interactionId);
-      }
+      interactionExtraMetrics.stopAll(interactionId);
       if ((0, _coinflip.default)((0, _config.getExperimentalInteractionRate)(interaction.ufoName, interaction.type))) {
         (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction, endTime);
         remove(interactionId);
@@ -1141,9 +1064,7 @@ function abortAll(abortReason, abortedByInteractionName) {
     finishInteraction(interactionId, interaction);
     postInteractionLog.reset();
     postInteractionLog.stopVCObserver();
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
-      interactionExtraMetrics.stopAll(interactionId);
-    }
+    interactionExtraMetrics.stopAll(interactionId);
     if ((0, _coinflip.default)((0, _config.getExperimentalInteractionRate)(interaction.ufoName, interaction.type))) {
       (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction);
       remove(interactionId);
@@ -1274,7 +1195,7 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
     addHoldByID(interactionId, [], ufoName, ufoName, true);
   }
   if (type === 'transition' || type === 'page_load') {
-    var _getConfig20, _config$extraInteract;
+    var _getConfig14, _config$extraInteract;
     // Use per-interaction VC observer if available, otherwise fall back to global
     var observer = vcObserver;
     if (observer) {
@@ -1285,7 +1206,7 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
     }
     // Start post interaction observer for all if config is enabled
     // in case ufoName is updated at later time
-    if ((_getConfig20 = (0, _config.getConfig)()) !== null && _getConfig20 !== void 0 && (_getConfig20 = _getConfig20.postInteractionLog) !== null && _getConfig20 !== void 0 && _getConfig20.enabled) {
+    if ((_getConfig14 = (0, _config.getConfig)()) !== null && _getConfig14 !== void 0 && (_getConfig14 = _getConfig14.postInteractionLog) !== null && _getConfig14 !== void 0 && _getConfig14.enabled) {
       postInteractionLog.startVCObserver({
         startTime: startTime
       });
@@ -1295,7 +1216,7 @@ function addNewInteraction(interactionId, ufoName, type, startTime, rate, labelS
         startTime: startTime
       });
     }
-    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) {
       interactionExtraMetrics.startVCObserver({
         startTime: startTime
       }, interactionId);

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

@@ -208,7 +208,7 @@ function init(analyticsWebClientAsync, config) {
         if ((_config$postInteracti = config.postInteractionLog) !== null && _config$postInteracti !== void 0 && _config$postInteracti.enabled) {
           sinkPostInteractionLog(instance, createPostInteractionLogPayloadPackage.default);
         }
-        if (config !== null && config !== void 0 && (_config$extraInteract2 = config.extraInteractionMetrics) !== null && _config$extraInteract2 !== void 0 && _config$extraInteract2.enabled && (0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
+        if (config !== null && config !== void 0 && (_config$extraInteract2 = config.extraInteractionMetrics) !== null && _config$extraInteract2 !== void 0 && _config$extraInteract2.enabled) {
           sinkInteractionExtraMetrics(instance, createInteractionExtraMetricsPayloadPackage.default);
         }
         if (config !== null && config !== void 0 && (_config$extraSearchPa = config.extraSearchPageInteraction) !== null && _config$extraSearchPa !== void 0 && _config$extraSearchPa.enabled) {
@@ -227,7 +227,7 @@ function init(analyticsWebClientAsync, config) {
       if ((_config$postInteracti2 = config.postInteractionLog) !== null && _config$postInteracti2 !== void 0 && _config$postInteracti2.enabled) {
         sinkPostInteractionLog(awc, createPostInteractionLogPayloadPackage.default);
       }
-      if (config !== null && config !== void 0 && (_config$extraInteract3 = config.extraInteractionMetrics) !== null && _config$extraInteract3 !== void 0 && _config$extraInteract3.enabled && (0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p')) {
+      if (config !== null && config !== void 0 && (_config$extraInteract3 = config.extraInteractionMetrics) !== null && _config$extraInteract3 !== void 0 && _config$extraInteract3.enabled) {
         sinkInteractionExtraMetrics(awc, createInteractionExtraMetricsPayloadPackage.default);
       }
       if (config !== null && config !== void 0 && (_config$extraSearchPa2 = config.extraSearchPageInteraction) !== null && _config$extraSearchPa2 !== void 0 && _config$extraSearchPa2.enabled) {

package/dist/cjs/segment/third-party-segment.js

@@ -8,20 +8,13 @@ exports.UFOThirdPartySegment = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _ignoreHolds = _interopRequireDefault(require("../ignore-holds"));
 var _segment = _interopRequireDefault(require("./segment"));
 var _excluded = ["children"];
 var UFOThirdPartySegment = exports.UFOThirdPartySegment = function UFOThirdPartySegment(props) {
   var children = props.children,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  return (0, _platformFeatureFlags.fg)('platform_ufo_enable_ttai_with_3p') ? /*#__PURE__*/_react.default.createElement(_segment.default, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_segment.default, (0, _extends2.default)({
     type: "third-party"
-  }, otherProps), children) : /*#__PURE__*/_react.default.createElement(_segment.default, (0, _extends2.default)({
-    type: "third-party"
-  }, otherProps), /*#__PURE__*/_react.default.createElement(_ignoreHolds.default, {
-    ignore: (0, _platformFeatureFlags.fg)('platform_ufo_exclude_3p_elements_from_ttai'),
-    reason: "third-party-element"
-  }, children));
+  }, otherProps), children);
 };
 UFOThirdPartySegment.displayName = 'UFOThirdPartySegment';