@atlaskit/react-ufo 4.16.6 → 4.16.7

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.16.7
+
+### Patch Changes
+
+- [`b59c796cf683e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b59c796cf683e) -
+  Aborting post-interaction logs also when original event is already finished
+
 ## 4.16.6
 
 ### Patch Changes

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

@@ -61,6 +61,7 @@ var _utils = require("../create-payload/common/utils");
 var _experienceTraceIdContext = require("../experience-trace-id-context");
 var _featureFlagsAccessed = require("../feature-flags-accessed");
 var _interactionIdContext = require("../interaction-id-context");
+var _ssrRenderProfiler = require("../segment/ssr-render-profiler");
 var _vc = require("../vc");
 var _constants = require("./common/constants");
 var _interactionExtraMetrics = _interopRequireDefault(require("./interaction-extra-metrics"));
@@ -717,6 +718,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) {
     // Use per-interaction VC observer if available, otherwise fall back to global
     var observer = data.vcObserver;
@@ -1084,6 +1086,12 @@ function abortByNewInteraction(interactionId, interactionName) {
       (0, _createExperimentalInteractionMetricsPayload.onExperimentalInteractionComplete)(interactionId, interaction);
       remove(interactionId);
     }
+  } else {
+    if ((0, _platformFeatureFlags.fg)('platform_reset_post_interaction_on_new_interaction')) {
+      // post-interaction log is active after interaction is aborted by new one
+      postInteractionLog.reset();
+      postInteractionLog.stopVCObserver();
+    }
   }
 }
 function abortAll(abortReason, abortedByInteractionName) {

package/dist/cjs/segment/index.js

@@ -11,6 +11,13 @@ Object.defineProperty(exports, "UFOThirdPartySegment", {
   }
 });
 exports.default = void 0;
+Object.defineProperty(exports, "flushSsrRenderProfilerTraces", {
+  enumerable: true,
+  get: function get() {
+    return _ssrRenderProfiler.flushSsrRenderProfilerTraces;
+  }
+});
 var _segment = _interopRequireDefault(require("./segment"));
 var _thirdPartySegment = require("./third-party-segment");
+var _ssrRenderProfiler = require("./ssr-render-profiler");
 var _default = exports.default = _segment.default;

package/dist/cjs/segment/ssr-render-profiler.js

@@ -4,14 +4,20 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.SsrRenderProfilerInner = void 0;
+exports.flushSsrRenderProfilerTraces = exports.default = exports.clearState = exports.SsrRenderProfilerInner = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _config = require("../config");
 var _interactionMetrics = require("../interaction-metrics");
 var _process;
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 // These are stored outside react context to be resilient to concurrent mode
 // restarting the start marker from a suspense and losing the initial render
 var startTimes = new Map();
+var spanStates = new Map();
+var clearState = exports.clearState = function clearState() {
+  startTimes.clear();
+  spanStates.clear();
+};
 // Keep track of the last interaction id and reset the start timers if it ever changes.
 // This is to allow multi-step ssr to track the render timers from different "interaction"s seperately
 var lastActiveInteraction;
@@ -19,26 +25,55 @@ function checkActiveInteractionAndResetStartMarksIfSet() {
   var _getActiveInteraction;
   var activeInteractionId = (_getActiveInteraction = (0, _interactionMetrics.getActiveInteraction)()) === null || _getActiveInteraction === void 0 ? void 0 : _getActiveInteraction.id;
   if (!!lastActiveInteraction && lastActiveInteraction !== activeInteractionId) {
-    startTimes.clear();
+    clearState();
   }
   lastActiveInteraction = activeInteractionId;
 }
-var onStartRender = function onStartRender(id) {
-  var _startTimes$get;
+var getIsNativeTracingEnabled = function getIsNativeTracingEnabled() {
+  var _getConfig$ssr$enable, _getConfig;
+  return (_getConfig$ssr$enable = (_getConfig = (0, _config.getConfig)()) === null || _getConfig === void 0 || (_getConfig = _getConfig.ssr) === null || _getConfig === void 0 ? void 0 : _getConfig.enableNativeTracing) !== null && _getConfig$ssr$enable !== void 0 ? _getConfig$ssr$enable : false;
+};
+var onStartRender = function onStartRender(id, currentSegmentName, parentContext) {
+  var _startTimes$get, _vm_internals__, _spanStates$get;
   if (!startTimes.has(id)) {
     startTimes.set(id, []);
   }
   (_startTimes$get = startTimes.get(id)) === null || _startTimes$get === void 0 || _startTimes$get.push(performance.now());
+  if (!getIsNativeTracingEnabled()) {
+    return null;
+  }
+  var startSpan = (_vm_internals__ = globalThis.__vm_internals__) === null || _vm_internals__ === void 0 || (_vm_internals__ = _vm_internals__.telemetry) === null || _vm_internals__ === void 0 ? void 0 : _vm_internals__.startSpan;
+  var spanState = (_spanStates$get = spanStates.get(id)) !== null && _spanStates$get !== void 0 ? _spanStates$get : null;
+  if (!spanState && startSpan) {
+    var span = startSpan(currentSegmentName, {
+      parentSpanId: parentContext === null || parentContext === void 0 ? void 0 : parentContext.spanId
+    });
+    spanState = {
+      span: span
+    };
+    spanStates.set(id, spanState);
+  }
+  return spanState;
 };
-var isInSSR = Boolean(globalThis === null || globalThis === void 0 ? void 0 : globalThis.__SERVER__) || typeof process !== 'undefined' && Boolean(((_process = process) === null || _process === void 0 || (_process = _process.env) === null || _process === void 0 ? void 0 : _process.REACT_SSR) || false);
+var isInSSR = typeof __SERVER__ !== 'undefined' && __SERVER__ || typeof process !== 'undefined' && Boolean(((_process = process) === null || _process === void 0 || (_process = _process.env) === null || _process === void 0 ? void 0 : _process.REACT_SSR) || false);
 var ProfilerMarker = function ProfilerMarker(_ref) {
   var onRender = _ref.onRender;
-  if (isInSSR) {
-    onRender === null || onRender === void 0 || onRender();
-  }
+  onRender === null || onRender === void 0 || onRender();
   return null;
 };
+var ParentSpanContext = /*#__PURE__*/(0, _react.createContext)(null);
+
+// For profiler spans in SSR, we 'end' any with their latest end times set, we need to do this at UFO-interaction-end since until then the component could rerender/remount again and spans fundamentally don't use the last 'end' but the first
+var flushSsrRenderProfilerTraces = exports.flushSsrRenderProfilerTraces = function flushSsrRenderProfilerTraces() {
+  spanStates.forEach(function (spanState) {
+    if (spanState.latestEndTime != null) {
+      spanState.span.end(spanState.latestEndTime);
+    }
+  });
+  spanStates.clear();
+};
 var SsrRenderProfilerInner = exports.SsrRenderProfilerInner = function SsrRenderProfilerInner(_ref2) {
+  var _currentSpanState$spa;
   var children = _ref2.children,
     labelStack = _ref2.labelStack,
     _onRender = _ref2.onRender;
@@ -48,25 +83,29 @@ var SsrRenderProfilerInner = exports.SsrRenderProfilerInner = function SsrRender
     }).join('/');
   }, [labelStack]);
   checkActiveInteractionAndResetStartMarksIfSet();
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(ProfilerMarker, {
-    onRender: function onRender() {
-      return onStartRender(reactProfilerId);
-    }
-  }), children, /*#__PURE__*/_react.default.createElement(ProfilerMarker, {
+  var parentSpan = (0, _react.useContext)(ParentSpanContext);
+  var currentSpanState = onStartRender(reactProfilerId, labelStack[labelStack.length - 1].name, parentSpan);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(ParentSpanContext.Provider, {
+    value: (_currentSpanState$spa = currentSpanState === null || currentSpanState === void 0 ? void 0 : currentSpanState.span.getSpanContext()) !== null && _currentSpanState$spa !== void 0 ? _currentSpanState$spa : null
+  }, children, /*#__PURE__*/_react.default.createElement(ProfilerMarker, {
     onRender: function onRender() {
       var startTimesForId = startTimes.get(reactProfilerId);
       if (startTimesForId !== null && startTimesForId !== void 0 && startTimesForId.length) {
-        var endTime = performance.now();
+        var _endTime = performance.now();
         var firstStartTime = startTimesForId[0];
         var lastStartTime = startTimesForId[startTimesForId.length - 1];
-        var baseDuration = endTime - lastStartTime;
-        var actualDuration = endTime - firstStartTime;
+        var baseDuration = _endTime - lastStartTime;
+        var actualDuration = _endTime - firstStartTime;
         _onRender('mount',
         // this is incorrect, but on the server there is no mount phase
-        actualDuration, baseDuration, firstStartTime, endTime);
+        actualDuration, baseDuration, firstStartTime, _endTime);
+      }
+      var spanState = spanStates.get(reactProfilerId);
+      if (spanState) {
+        spanState.latestEndTime = performance.now();
       }
     }
-  }));
+  })));
 };
 var SsrRenderProfiler = function SsrRenderProfiler(props) {
   if (isInSSR) {

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

@@ -9,6 +9,7 @@ import { sanitizeUfoName, stringifyLabelStackFully } from '../create-payload/com
 import { clearActiveTrace } from '../experience-trace-id-context';
 import { allFeatureFlagsAccessed, currentFeatureFlagsAccessed } from '../feature-flags-accessed';
 import { getInteractionId } from '../interaction-id-context';
+import { flushSsrRenderProfilerTraces } from '../segment/ssr-render-profiler';
 import { newVCObserver } from '../vc';
 import { interactions } from './common/constants';
 import InteractionExtraMetrics from './interaction-extra-metrics';
@@ -633,6 +634,7 @@ function finishInteraction(id, data, endTime = performance.now()) {
   }
   clearActiveTrace();
   callCleanUpCallbacks(data);
+  flushSsrRenderProfilerTraces();
   if ((_getConfig4 = getConfig()) !== null && _getConfig4 !== void 0 && (_getConfig4$vc = _getConfig4.vc) !== null && _getConfig4$vc !== void 0 && _getConfig4$vc.stopVCAtInteractionFinish) {
     // Use per-interaction VC observer if available, otherwise fall back to global
     const observer = data.vcObserver;
@@ -963,6 +965,12 @@ export function abortByNewInteraction(interactionId, interactionName) {
       onExperimentalInteractionComplete(interactionId, interaction);
       remove(interactionId);
     }
+  } else {
+    if (fg('platform_reset_post_interaction_on_new_interaction')) {
+      // post-interaction log is active after interaction is aborted by new one
+      postInteractionLog.reset();
+      postInteractionLog.stopVCObserver();
+    }
   }
 }
 export function abortAll(abortReason, abortedByInteractionName) {

package/dist/es2019/segment/index.js

@@ -1,3 +1,4 @@
 import UFOSegment from './segment';
 export default UFOSegment;
-export { UFOThirdPartySegment } from './third-party-segment';
+export { UFOThirdPartySegment } from './third-party-segment';
+export { flushSsrRenderProfilerTraces } from './ssr-render-profiler';

package/dist/es2019/segment/ssr-render-profiler.js

@@ -1,10 +1,15 @@
 var _process, _process$env;
-import React, { useMemo } from 'react';
+import React, { createContext, useContext, useMemo } from 'react';
+import { getConfig } from '../config';
 import { getActiveInteraction } from '../interaction-metrics';
-
 // These are stored outside react context to be resilient to concurrent mode
 // restarting the start marker from a suspense and losing the initial render
 const startTimes = new Map();
+const spanStates = new Map();
+export const clearState = () => {
+  startTimes.clear();
+  spanStates.clear();
+};
 // Keep track of the last interaction id and reset the start timers if it ever changes.
 // This is to allow multi-step ssr to track the render timers from different "interaction"s seperately
 let lastActiveInteraction;
@@ -12,36 +17,67 @@ function checkActiveInteractionAndResetStartMarksIfSet() {
   var _getActiveInteraction;
   const activeInteractionId = (_getActiveInteraction = getActiveInteraction()) === null || _getActiveInteraction === void 0 ? void 0 : _getActiveInteraction.id;
   if (!!lastActiveInteraction && lastActiveInteraction !== activeInteractionId) {
-    startTimes.clear();
+    clearState();
   }
   lastActiveInteraction = activeInteractionId;
 }
-const onStartRender = id => {
-  var _startTimes$get;
+const getIsNativeTracingEnabled = () => {
+  var _getConfig$ssr$enable, _getConfig, _getConfig$ssr;
+  return (_getConfig$ssr$enable = (_getConfig = getConfig()) === null || _getConfig === void 0 ? void 0 : (_getConfig$ssr = _getConfig.ssr) === null || _getConfig$ssr === void 0 ? void 0 : _getConfig$ssr.enableNativeTracing) !== null && _getConfig$ssr$enable !== void 0 ? _getConfig$ssr$enable : false;
+};
+const onStartRender = (id, currentSegmentName, parentContext) => {
+  var _startTimes$get, _vm_internals__, _vm_internals__$telem, _spanStates$get;
   if (!startTimes.has(id)) {
     startTimes.set(id, []);
   }
   (_startTimes$get = startTimes.get(id)) === null || _startTimes$get === void 0 ? void 0 : _startTimes$get.push(performance.now());
+  if (!getIsNativeTracingEnabled()) {
+    return null;
+  }
+  const startSpan = (_vm_internals__ = globalThis.__vm_internals__) === null || _vm_internals__ === void 0 ? void 0 : (_vm_internals__$telem = _vm_internals__.telemetry) === null || _vm_internals__$telem === void 0 ? void 0 : _vm_internals__$telem.startSpan;
+  let spanState = (_spanStates$get = spanStates.get(id)) !== null && _spanStates$get !== void 0 ? _spanStates$get : null;
+  if (!spanState && startSpan) {
+    const span = startSpan(currentSegmentName, {
+      parentSpanId: parentContext === null || parentContext === void 0 ? void 0 : parentContext.spanId
+    });
+    spanState = {
+      span
+    };
+    spanStates.set(id, spanState);
+  }
+  return spanState;
 };
-const isInSSR = Boolean(globalThis === null || globalThis === void 0 ? void 0 : globalThis.__SERVER__) || typeof process !== 'undefined' && Boolean(((_process = process) === null || _process === void 0 ? void 0 : (_process$env = _process.env) === null || _process$env === void 0 ? void 0 : _process$env.REACT_SSR) || false);
+const isInSSR = typeof __SERVER__ !== 'undefined' && __SERVER__ || typeof process !== 'undefined' && Boolean(((_process = process) === null || _process === void 0 ? void 0 : (_process$env = _process.env) === null || _process$env === void 0 ? void 0 : _process$env.REACT_SSR) || false);
 const ProfilerMarker = ({
   onRender
 }) => {
-  if (isInSSR) {
-    onRender === null || onRender === void 0 ? void 0 : onRender();
-  }
+  onRender === null || onRender === void 0 ? void 0 : onRender();
   return null;
 };
+const ParentSpanContext = /*#__PURE__*/createContext(null);
+
+// For profiler spans in SSR, we 'end' any with their latest end times set, we need to do this at UFO-interaction-end since until then the component could rerender/remount again and spans fundamentally don't use the last 'end' but the first
+export const flushSsrRenderProfilerTraces = () => {
+  spanStates.forEach(spanState => {
+    if (spanState.latestEndTime != null) {
+      spanState.span.end(spanState.latestEndTime);
+    }
+  });
+  spanStates.clear();
+};
 export const SsrRenderProfilerInner = ({
   children,
   labelStack,
   onRender
 }) => {
+  var _currentSpanState$spa;
   const reactProfilerId = useMemo(() => labelStack.map(l => l.name).join('/'), [labelStack]);
   checkActiveInteractionAndResetStartMarksIfSet();
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProfilerMarker, {
-    onRender: () => onStartRender(reactProfilerId)
-  }), children, /*#__PURE__*/React.createElement(ProfilerMarker, {
+  const parentSpan = useContext(ParentSpanContext);
+  const currentSpanState = onStartRender(reactProfilerId, labelStack[labelStack.length - 1].name, parentSpan);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ParentSpanContext.Provider, {
+    value: (_currentSpanState$spa = currentSpanState === null || currentSpanState === void 0 ? void 0 : currentSpanState.span.getSpanContext()) !== null && _currentSpanState$spa !== void 0 ? _currentSpanState$spa : null
+  }, children, /*#__PURE__*/React.createElement(ProfilerMarker, {
     onRender: () => {
       const startTimesForId = startTimes.get(reactProfilerId);
       if (startTimesForId !== null && startTimesForId !== void 0 && startTimesForId.length) {
@@ -54,8 +90,12 @@ export const SsrRenderProfilerInner = ({
         // this is incorrect, but on the server there is no mount phase
         actualDuration, baseDuration, firstStartTime, endTime);
       }
+      const spanState = spanStates.get(reactProfilerId);
+      if (spanState) {
+        spanState.latestEndTime = performance.now();
+      }
     }
-  }));
+  })));
 };
 const SsrRenderProfiler = props => {
   if (isInSSR) {

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

@@ -19,6 +19,7 @@ import { sanitizeUfoName, stringifyLabelStackFully } from '../create-payload/com
 import { clearActiveTrace } from '../experience-trace-id-context';
 import { allFeatureFlagsAccessed, currentFeatureFlagsAccessed } from '../feature-flags-accessed';
 import { getInteractionId } from '../interaction-id-context';
+import { flushSsrRenderProfilerTraces } from '../segment/ssr-render-profiler';
 import { newVCObserver } from '../vc';
 import { interactions } from './common/constants';
 import InteractionExtraMetrics from './interaction-extra-metrics';
@@ -670,6 +671,7 @@ function finishInteraction(id, data) {
   }
   clearActiveTrace();
   callCleanUpCallbacks(data);
+  flushSsrRenderProfilerTraces();
   if ((_getConfig4 = getConfig()) !== null && _getConfig4 !== void 0 && (_getConfig4 = _getConfig4.vc) !== null && _getConfig4 !== void 0 && _getConfig4.stopVCAtInteractionFinish) {
     // Use per-interaction VC observer if available, otherwise fall back to global
     var observer = data.vcObserver;
@@ -1037,6 +1039,12 @@ export function abortByNewInteraction(interactionId, interactionName) {
       onExperimentalInteractionComplete(interactionId, interaction);
       remove(interactionId);
     }
+  } else {
+    if (fg('platform_reset_post_interaction_on_new_interaction')) {
+      // post-interaction log is active after interaction is aborted by new one
+      postInteractionLog.reset();
+      postInteractionLog.stopVCObserver();
+    }
   }
 }
 export function abortAll(abortReason, abortedByInteractionName) {

package/dist/esm/segment/index.js

@@ -1,3 +1,4 @@
 import UFOSegment from './segment';
 export default UFOSegment;
-export { UFOThirdPartySegment } from './third-party-segment';
+export { UFOThirdPartySegment } from './third-party-segment';
+export { flushSsrRenderProfilerTraces } from './ssr-render-profiler';

package/dist/esm/segment/ssr-render-profiler.js

@@ -1,10 +1,15 @@
 var _process;
-import React, { useMemo } from 'react';
+import React, { createContext, useContext, useMemo } from 'react';
+import { getConfig } from '../config';
 import { getActiveInteraction } from '../interaction-metrics';
-
 // These are stored outside react context to be resilient to concurrent mode
 // restarting the start marker from a suspense and losing the initial render
 var startTimes = new Map();
+var spanStates = new Map();
+export var clearState = function clearState() {
+  startTimes.clear();
+  spanStates.clear();
+};
 // Keep track of the last interaction id and reset the start timers if it ever changes.
 // This is to allow multi-step ssr to track the render timers from different "interaction"s seperately
 var lastActiveInteraction;
@@ -12,26 +17,55 @@ function checkActiveInteractionAndResetStartMarksIfSet() {
   var _getActiveInteraction;
   var activeInteractionId = (_getActiveInteraction = getActiveInteraction()) === null || _getActiveInteraction === void 0 ? void 0 : _getActiveInteraction.id;
   if (!!lastActiveInteraction && lastActiveInteraction !== activeInteractionId) {
-    startTimes.clear();
+    clearState();
   }
   lastActiveInteraction = activeInteractionId;
 }
-var onStartRender = function onStartRender(id) {
-  var _startTimes$get;
+var getIsNativeTracingEnabled = function getIsNativeTracingEnabled() {
+  var _getConfig$ssr$enable, _getConfig;
+  return (_getConfig$ssr$enable = (_getConfig = getConfig()) === null || _getConfig === void 0 || (_getConfig = _getConfig.ssr) === null || _getConfig === void 0 ? void 0 : _getConfig.enableNativeTracing) !== null && _getConfig$ssr$enable !== void 0 ? _getConfig$ssr$enable : false;
+};
+var onStartRender = function onStartRender(id, currentSegmentName, parentContext) {
+  var _startTimes$get, _vm_internals__, _spanStates$get;
   if (!startTimes.has(id)) {
     startTimes.set(id, []);
   }
   (_startTimes$get = startTimes.get(id)) === null || _startTimes$get === void 0 || _startTimes$get.push(performance.now());
+  if (!getIsNativeTracingEnabled()) {
+    return null;
+  }
+  var startSpan = (_vm_internals__ = globalThis.__vm_internals__) === null || _vm_internals__ === void 0 || (_vm_internals__ = _vm_internals__.telemetry) === null || _vm_internals__ === void 0 ? void 0 : _vm_internals__.startSpan;
+  var spanState = (_spanStates$get = spanStates.get(id)) !== null && _spanStates$get !== void 0 ? _spanStates$get : null;
+  if (!spanState && startSpan) {
+    var span = startSpan(currentSegmentName, {
+      parentSpanId: parentContext === null || parentContext === void 0 ? void 0 : parentContext.spanId
+    });
+    spanState = {
+      span: span
+    };
+    spanStates.set(id, spanState);
+  }
+  return spanState;
 };
-var isInSSR = Boolean(globalThis === null || globalThis === void 0 ? void 0 : globalThis.__SERVER__) || typeof process !== 'undefined' && Boolean(((_process = process) === null || _process === void 0 || (_process = _process.env) === null || _process === void 0 ? void 0 : _process.REACT_SSR) || false);
+var isInSSR = typeof __SERVER__ !== 'undefined' && __SERVER__ || typeof process !== 'undefined' && Boolean(((_process = process) === null || _process === void 0 || (_process = _process.env) === null || _process === void 0 ? void 0 : _process.REACT_SSR) || false);
 var ProfilerMarker = function ProfilerMarker(_ref) {
   var onRender = _ref.onRender;
-  if (isInSSR) {
-    onRender === null || onRender === void 0 || onRender();
-  }
+  onRender === null || onRender === void 0 || onRender();
   return null;
 };
+var ParentSpanContext = /*#__PURE__*/createContext(null);
+
+// For profiler spans in SSR, we 'end' any with their latest end times set, we need to do this at UFO-interaction-end since until then the component could rerender/remount again and spans fundamentally don't use the last 'end' but the first
+export var flushSsrRenderProfilerTraces = function flushSsrRenderProfilerTraces() {
+  spanStates.forEach(function (spanState) {
+    if (spanState.latestEndTime != null) {
+      spanState.span.end(spanState.latestEndTime);
+    }
+  });
+  spanStates.clear();
+};
 export var SsrRenderProfilerInner = function SsrRenderProfilerInner(_ref2) {
+  var _currentSpanState$spa;
   var children = _ref2.children,
     labelStack = _ref2.labelStack,
     _onRender = _ref2.onRender;
@@ -41,25 +75,29 @@ export var SsrRenderProfilerInner = function SsrRenderProfilerInner(_ref2) {
     }).join('/');
   }, [labelStack]);
   checkActiveInteractionAndResetStartMarksIfSet();
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProfilerMarker, {
-    onRender: function onRender() {
-      return onStartRender(reactProfilerId);
-    }
-  }), children, /*#__PURE__*/React.createElement(ProfilerMarker, {
+  var parentSpan = useContext(ParentSpanContext);
+  var currentSpanState = onStartRender(reactProfilerId, labelStack[labelStack.length - 1].name, parentSpan);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ParentSpanContext.Provider, {
+    value: (_currentSpanState$spa = currentSpanState === null || currentSpanState === void 0 ? void 0 : currentSpanState.span.getSpanContext()) !== null && _currentSpanState$spa !== void 0 ? _currentSpanState$spa : null
+  }, children, /*#__PURE__*/React.createElement(ProfilerMarker, {
     onRender: function onRender() {
       var startTimesForId = startTimes.get(reactProfilerId);
       if (startTimesForId !== null && startTimesForId !== void 0 && startTimesForId.length) {
-        var endTime = performance.now();
+        var _endTime = performance.now();
         var firstStartTime = startTimesForId[0];
         var lastStartTime = startTimesForId[startTimesForId.length - 1];
-        var baseDuration = endTime - lastStartTime;
-        var actualDuration = endTime - firstStartTime;
+        var baseDuration = _endTime - lastStartTime;
+        var actualDuration = _endTime - firstStartTime;
         _onRender('mount',
         // this is incorrect, but on the server there is no mount phase
-        actualDuration, baseDuration, firstStartTime, endTime);
+        actualDuration, baseDuration, firstStartTime, _endTime);
+      }
+      var spanState = spanStates.get(reactProfilerId);
+      if (spanState) {
+        spanState.latestEndTime = performance.now();
       }
     }
-  }));
+  })));
 };
 var SsrRenderProfiler = function SsrRenderProfiler(props) {
   if (isInSSR) {

package/dist/types/config/index.d.ts

@@ -107,6 +107,7 @@ export type Config = {
     readonly ssr?: {
         readonly getSSRTimings?: () => SSRTiming[];
         readonly getSSRDoneTime?: () => number | undefined;
+        readonly enableNativeTracing?: boolean;
     };
     readonly assetsConfig?: AssetsConfig;
     readonly enableBetterPageVisibilityApi?: boolean;

package/dist/types/segment/index.d.ts

@@ -1,3 +1,4 @@
 import UFOSegment from './segment';
 export default UFOSegment;
 export { UFOThirdPartySegment } from './third-party-segment';
+export { flushSsrRenderProfilerTraces } from './ssr-render-profiler';

package/dist/types/segment/ssr-render-profiler.d.ts

@@ -1,5 +1,7 @@
 import React, { type ReactNode } from 'react';
 import type { EnhancedUFOInteractionContextType, ReactProfilerTiming } from '../common';
+export declare const clearState: () => void;
+export declare const flushSsrRenderProfilerTraces: () => void;
 export declare const SsrRenderProfilerInner: ({ children, labelStack, onRender, }: {
     children?: ReactNode | undefined;
     labelStack: ReactProfilerTiming["labelStack"];
@@ -7,3 +9,53 @@ export declare const SsrRenderProfilerInner: ({ children, labelStack, onRender,
 }) => React.JSX.Element;
 declare const SsrRenderProfiler: (props: Parameters<typeof SsrRenderProfilerInner>[0]) => React.JSX.Element;
 export default SsrRenderProfiler;
+interface SpanContext {
+    /** 16-character hex string representing the span ID */
+    readonly spanId: string;
+    /** 32-character hex string representing the trace ID */
+    readonly traceId: string;
+    /** Whether this span context is sampled */
+    readonly isSampled: boolean;
+    /** Whether this span context is from a remote service */
+    readonly isRemote: boolean;
+}
+interface SpanOptions {
+    /**
+     * Optional parent span ID for explicit parent specification.
+     * If not provided, the span will use the root span as its parent.
+     **/
+    parentSpanId?: string;
+    /** Optional start time - MUST BE a performance.now() timsestamp */
+    startTime?: number;
+    /** Optional attributes to set on the span at creation time */
+    attributes?: Record<string, string | number | boolean>;
+    /** Override the parent's sampled parameter. Generally should only be used to silence noisy spans and their children.
+     * Be VERY careful not to cause performance issues if setting to true */
+    sampledOverride?: boolean;
+}
+export interface Span {
+    /** End the span, optionally with a custom end time in milliseconds since epoch */
+    end(endTime?: number): void;
+    /** Set an attribute on the span */
+    setAttribute(key: string, value: string | number | boolean): void;
+    /** Add an event to the span */
+    addEvent(name: string): void;
+    /** Get the span context containing span ID, trace ID, and flags */
+    getSpanContext(): SpanContext | null;
+}
+export type TesseractTelemetryAPI = {
+    /**
+     * Start a new span with OpenTelemetry-like API
+     * Unlike typical openTelemetry, the parent span is not automatically inferred from context.
+     * You must explicitly provide a parentSpanId in options if desired.
+     * Otherwise, the span will use the root as its parent.
+     **/
+    startSpan(name: string, options?: SpanOptions): Span;
+    forceFlush(): void;
+};
+export type SnapVmInternals = {
+    telemetry?: TesseractTelemetryAPI;
+};
+export type GlobalThis = {
+    __vm_internals__?: SnapVmInternals;
+};

package/dist/types-ts4.5/config/index.d.ts

@@ -107,6 +107,7 @@ export type Config = {
     readonly ssr?: {
         readonly getSSRTimings?: () => SSRTiming[];
         readonly getSSRDoneTime?: () => number | undefined;
+        readonly enableNativeTracing?: boolean;
     };
     readonly assetsConfig?: AssetsConfig;
     readonly enableBetterPageVisibilityApi?: boolean;

package/dist/types-ts4.5/segment/index.d.ts

@@ -1,3 +1,4 @@
 import UFOSegment from './segment';
 export default UFOSegment;
 export { UFOThirdPartySegment } from './third-party-segment';
+export { flushSsrRenderProfilerTraces } from './ssr-render-profiler';

package/dist/types-ts4.5/segment/ssr-render-profiler.d.ts

@@ -1,5 +1,7 @@
 import React, { type ReactNode } from 'react';
 import type { EnhancedUFOInteractionContextType, ReactProfilerTiming } from '../common';
+export declare const clearState: () => void;
+export declare const flushSsrRenderProfilerTraces: () => void;
 export declare const SsrRenderProfilerInner: ({ children, labelStack, onRender, }: {
     children?: ReactNode | undefined;
     labelStack: ReactProfilerTiming["labelStack"];
@@ -7,3 +9,53 @@ export declare const SsrRenderProfilerInner: ({ children, labelStack, onRender,
 }) => React.JSX.Element;
 declare const SsrRenderProfiler: (props: Parameters<typeof SsrRenderProfilerInner>[0]) => React.JSX.Element;
 export default SsrRenderProfiler;
+interface SpanContext {
+    /** 16-character hex string representing the span ID */
+    readonly spanId: string;
+    /** 32-character hex string representing the trace ID */
+    readonly traceId: string;
+    /** Whether this span context is sampled */
+    readonly isSampled: boolean;
+    /** Whether this span context is from a remote service */
+    readonly isRemote: boolean;
+}
+interface SpanOptions {
+    /**
+     * Optional parent span ID for explicit parent specification.
+     * If not provided, the span will use the root span as its parent.
+     **/
+    parentSpanId?: string;
+    /** Optional start time - MUST BE a performance.now() timsestamp */
+    startTime?: number;
+    /** Optional attributes to set on the span at creation time */
+    attributes?: Record<string, string | number | boolean>;
+    /** Override the parent's sampled parameter. Generally should only be used to silence noisy spans and their children.
+     * Be VERY careful not to cause performance issues if setting to true */
+    sampledOverride?: boolean;
+}
+export interface Span {
+    /** End the span, optionally with a custom end time in milliseconds since epoch */
+    end(endTime?: number): void;
+    /** Set an attribute on the span */
+    setAttribute(key: string, value: string | number | boolean): void;
+    /** Add an event to the span */
+    addEvent(name: string): void;
+    /** Get the span context containing span ID, trace ID, and flags */
+    getSpanContext(): SpanContext | null;
+}
+export type TesseractTelemetryAPI = {
+    /**
+     * Start a new span with OpenTelemetry-like API
+     * Unlike typical openTelemetry, the parent span is not automatically inferred from context.
+     * You must explicitly provide a parentSpanId in options if desired.
+     * Otherwise, the span will use the root as its parent.
+     **/
+    startSpan(name: string, options?: SpanOptions): Span;
+    forceFlush(): void;
+};
+export type SnapVmInternals = {
+    telemetry?: TesseractTelemetryAPI;
+};
+export type GlobalThis = {
+    __vm_internals__?: SnapVmInternals;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.16.6",
+	"version": "4.16.7",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -207,6 +207,9 @@
 		"platform_ufo_raw_data_thirdparty": {
 			"type": "boolean"
 		},
+		"platform_reset_post_interaction_on_new_interaction": {
+			"type": "boolean"
+		},
 		"platform_enable_better_page_visibility": {
 			"type": "boolean"
 		}