@atlaskit/react-ufo 3.12.2 → 3.12.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 3.12.4
+
+### Patch Changes
+
+- [#156458](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/156458)
+  [`98659a9117f77`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/98659a9117f77) -
+  FG cleanup - platform_ufo_post_interaction_use_vc_rev
+
+## 3.12.3
+
+### Patch Changes
+
+- [#155959](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/155959)
+  [`eeaa8485061ce`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eeaa8485061ce) -
+  Add further error handling to CPU monitoring logic
+
 ## 3.12.2
 
 ### Patch Changes

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

@@ -136,13 +136,12 @@ function createPostInteractionLogPayload(_ref2) {
 
   // Align post-interaction-logs closer to UFO event behaviour,
   // e.g. also check for aborted or failed events
-  if ((0, _platformFeatureFlags.fg)('platform_ufo_vc_align_revisions_on_watchdog_event')) {
-    if (lastInteractionFinish.abortReason) {
-      return null;
-    }
-    if (lastInteractionFinish.errors.length > 0) {
-      return null;
-    }
+
+  if (lastInteractionFinish.abortReason) {
+    return null;
+  }
+  if (lastInteractionFinish.errors.length > 0) {
+    return null;
   }
   var maxEndTimeFromProfiler = reactProfilerTimings ? Math.max.apply(Math, (0, _toConsumableArray2.default)(reactProfilerTimings.map(function (t) {
     return t.commitTime;

package/dist/cjs/interaction-metrics/post-interaction-log.js

@@ -10,10 +10,8 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _config = require("../config");
 var _vc = require("../vc");
-var _vcObserver = require("../vc/vc-observer");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var POST_INTERACTION_LOG_SEND_DEFAULT_TIMEOUT = 3000;
@@ -45,15 +43,9 @@ var PostInteractionLog = exports.default = /*#__PURE__*/function () {
   return (0, _createClass2.default)(PostInteractionLog, [{
     key: "initializeVCObserver",
     value: function initializeVCObserver(options) {
-      if ((0, _platformFeatureFlags.fg)('platform_ufo_vc_align_revisions_on_watchdog_event')) {
-        this.vcObserver = new _vc.VCObserverWrapper(_objectSpread(_objectSpread({}, options), {}, {
-          isPostInteraction: true
-        }));
-      } else if (this.vcObserver === null) {
-        this.vcObserver = new _vcObserver.VCObserver(_objectSpread(_objectSpread({}, options), {}, {
-          isPostInteraction: true
-        }));
-      }
+      this.vcObserver = new _vc.VCObserverWrapper(_objectSpread(_objectSpread({}, options), {}, {
+        isPostInteraction: true
+      }));
     }
   }, {
     key: "startVCObserver",

package/dist/cjs/machine-utilisation/index.js

@@ -23,49 +23,54 @@ function removeOldBufferRecords(filter) {
   });
 }
 function createPressureStateReport(start, end) {
-  // To differentiate between the API not available, vs no PressureRecords added
-  if (!('PressureObserver' in globalThis)) {
+  try {
+    // To differentiate between the API not available, vs no PressureRecords added
+    if (!('PressureObserver' in globalThis)) {
+      return null;
+    }
+    var pressureStateCount = pressureRecordBuffer.reduce(function (pressureReport, _ref2) {
+      var time = _ref2.time,
+        state = _ref2.state;
+      if (time >= start && time <= end) {
+        pressureReport[state] += 1;
+      }
+      return pressureReport;
+    }, {
+      nominal: 0,
+      fair: 0,
+      serious: 0,
+      critical: 0
+    });
+    var pressureStateTotal = Object.values(pressureStateCount).reduce(function (total, count) {
+      return total + count;
+    }) || 1;
+    removeOldBufferRecords(end);
+    return {
+      count: pressureStateCount,
+      percentage: {
+        nominal: Math.round(pressureStateCount.nominal / pressureStateTotal * 100),
+        fair: Math.round(pressureStateCount.fair / pressureStateTotal * 100),
+        serious: Math.round(pressureStateCount.serious / pressureStateTotal * 100),
+        critical: Math.round(pressureStateCount.critical / pressureStateTotal * 100)
+      }
+    };
+  } catch (_unused) {
     return null;
   }
-  var pressureStateCount = pressureRecordBuffer.reduce(function (pressureReport, _ref2) {
-    var time = _ref2.time,
-      state = _ref2.state;
-    if (time >= start && time <= end) {
-      pressureReport[state] += 1;
-    }
-    return pressureReport;
-  }, {
-    nominal: 0,
-    fair: 0,
-    serious: 0,
-    critical: 0
-  });
-  var pressureStateTotal = Object.values(pressureStateCount).reduce(function (total, count) {
-    return total + count;
-  }) || 1;
-  removeOldBufferRecords(end);
-  return {
-    count: pressureStateCount,
-    percentage: {
-      nominal: Math.round(pressureStateCount.nominal / pressureStateTotal * 100),
-      fair: Math.round(pressureStateCount.fair / pressureStateTotal * 100),
-      serious: Math.round(pressureStateCount.serious / pressureStateTotal * 100),
-      critical: Math.round(pressureStateCount.critical / pressureStateTotal * 100)
-    }
-  };
 }
 function initialisePressureObserver() {
   try {
     if ('PressureObserver' in globalThis) {
+      var _pressureObserver$obs;
       pressureObserver = new PressureObserver(function (records) {
         if (pressureRecordBuffer.length + records.length <= BUFFER_MAX_LENGTH) {
           var _pressureRecordBuffer;
           (_pressureRecordBuffer = pressureRecordBuffer).push.apply(_pressureRecordBuffer, (0, _toConsumableArray2.default)(records));
         }
       });
-      pressureObserver.observe('cpu', {
+      (_pressureObserver$obs = pressureObserver.observe('cpu', {
         sampleInterval: 100
-      });
+      })) === null || _pressureObserver$obs === void 0 || _pressureObserver$obs.catch();
     }
   } catch (err) {
     /* do nothing, this is a best efforts metric */

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

@@ -123,13 +123,12 @@ function createPostInteractionLogPayload({
 
   // Align post-interaction-logs closer to UFO event behaviour,
   // e.g. also check for aborted or failed events
-  if (fg('platform_ufo_vc_align_revisions_on_watchdog_event')) {
-    if (lastInteractionFinish.abortReason) {
-      return null;
-    }
-    if (lastInteractionFinish.errors.length > 0) {
-      return null;
-    }
+
+  if (lastInteractionFinish.abortReason) {
+    return null;
+  }
+  if (lastInteractionFinish.errors.length > 0) {
+    return null;
   }
   const maxEndTimeFromProfiler = reactProfilerTimings ? Math.max(...reactProfilerTimings.map(t => t.commitTime)) : lastInteractionFinish.end;
   const revisedEndTime = Math.round(maxEndTimeFromProfiler);

package/dist/es2019/interaction-metrics/post-interaction-log.js

@@ -1,8 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import { fg } from '@atlaskit/platform-feature-flags';
 import { getConfig } from '../config';
 import { VCObserverWrapper } from '../vc';
-import { VCObserver } from '../vc/vc-observer';
 const POST_INTERACTION_LOG_SEND_DEFAULT_TIMEOUT = 3000;
 export default class PostInteractionLog {
   constructor() {
@@ -29,17 +27,10 @@ export default class PostInteractionLog {
     _defineProperty(this, "sinkHandlerFn", () => {});
   }
   initializeVCObserver(options) {
-    if (fg('platform_ufo_vc_align_revisions_on_watchdog_event')) {
-      this.vcObserver = new VCObserverWrapper({
-        ...options,
-        isPostInteraction: true
-      });
-    } else if (this.vcObserver === null) {
-      this.vcObserver = new VCObserver({
-        ...options,
-        isPostInteraction: true
-      });
-    }
+    this.vcObserver = new VCObserverWrapper({
+      ...options,
+      isPostInteraction: true
+    });
   }
   startVCObserver({
     startTime

package/dist/es2019/machine-utilisation/index.js

@@ -10,47 +10,52 @@ export function removeOldBufferRecords(filter) {
   }) => time > filter);
 }
 export function createPressureStateReport(start, end) {
-  // To differentiate between the API not available, vs no PressureRecords added
-  if (!('PressureObserver' in globalThis)) {
+  try {
+    // To differentiate between the API not available, vs no PressureRecords added
+    if (!('PressureObserver' in globalThis)) {
+      return null;
+    }
+    const pressureStateCount = pressureRecordBuffer.reduce((pressureReport, {
+      time,
+      state
+    }) => {
+      if (time >= start && time <= end) {
+        pressureReport[state] += 1;
+      }
+      return pressureReport;
+    }, {
+      nominal: 0,
+      fair: 0,
+      serious: 0,
+      critical: 0
+    });
+    const pressureStateTotal = Object.values(pressureStateCount).reduce((total, count) => total + count) || 1;
+    removeOldBufferRecords(end);
+    return {
+      count: pressureStateCount,
+      percentage: {
+        nominal: Math.round(pressureStateCount.nominal / pressureStateTotal * 100),
+        fair: Math.round(pressureStateCount.fair / pressureStateTotal * 100),
+        serious: Math.round(pressureStateCount.serious / pressureStateTotal * 100),
+        critical: Math.round(pressureStateCount.critical / pressureStateTotal * 100)
+      }
+    };
+  } catch {
     return null;
   }
-  const pressureStateCount = pressureRecordBuffer.reduce((pressureReport, {
-    time,
-    state
-  }) => {
-    if (time >= start && time <= end) {
-      pressureReport[state] += 1;
-    }
-    return pressureReport;
-  }, {
-    nominal: 0,
-    fair: 0,
-    serious: 0,
-    critical: 0
-  });
-  const pressureStateTotal = Object.values(pressureStateCount).reduce((total, count) => total + count) || 1;
-  removeOldBufferRecords(end);
-  return {
-    count: pressureStateCount,
-    percentage: {
-      nominal: Math.round(pressureStateCount.nominal / pressureStateTotal * 100),
-      fair: Math.round(pressureStateCount.fair / pressureStateTotal * 100),
-      serious: Math.round(pressureStateCount.serious / pressureStateTotal * 100),
-      critical: Math.round(pressureStateCount.critical / pressureStateTotal * 100)
-    }
-  };
 }
 export function initialisePressureObserver() {
   try {
     if ('PressureObserver' in globalThis) {
+      var _pressureObserver$obs;
       pressureObserver = new PressureObserver(records => {
         if (pressureRecordBuffer.length + records.length <= BUFFER_MAX_LENGTH) {
           pressureRecordBuffer.push(...records);
         }
       });
-      pressureObserver.observe('cpu', {
+      (_pressureObserver$obs = pressureObserver.observe('cpu', {
         sampleInterval: 100
-      });
+      })) === null || _pressureObserver$obs === void 0 ? void 0 : _pressureObserver$obs.catch();
     }
   } catch (err) {
     /* do nothing, this is a best efforts metric */

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

@@ -129,13 +129,12 @@ function createPostInteractionLogPayload(_ref2) {
 
   // Align post-interaction-logs closer to UFO event behaviour,
   // e.g. also check for aborted or failed events
-  if (fg('platform_ufo_vc_align_revisions_on_watchdog_event')) {
-    if (lastInteractionFinish.abortReason) {
-      return null;
-    }
-    if (lastInteractionFinish.errors.length > 0) {
-      return null;
-    }
+
+  if (lastInteractionFinish.abortReason) {
+    return null;
+  }
+  if (lastInteractionFinish.errors.length > 0) {
+    return null;
   }
   var maxEndTimeFromProfiler = reactProfilerTimings ? Math.max.apply(Math, _toConsumableArray(reactProfilerTimings.map(function (t) {
     return t.commitTime;

package/dist/esm/interaction-metrics/post-interaction-log.js

@@ -5,10 +5,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { fg } from '@atlaskit/platform-feature-flags';
 import { getConfig } from '../config';
 import { VCObserverWrapper } from '../vc';
-import { VCObserver } from '../vc/vc-observer';
 var POST_INTERACTION_LOG_SEND_DEFAULT_TIMEOUT = 3000;
 var PostInteractionLog = /*#__PURE__*/function () {
   function PostInteractionLog() {
@@ -38,15 +36,9 @@ var PostInteractionLog = /*#__PURE__*/function () {
   return _createClass(PostInteractionLog, [{
     key: "initializeVCObserver",
     value: function initializeVCObserver(options) {
-      if (fg('platform_ufo_vc_align_revisions_on_watchdog_event')) {
-        this.vcObserver = new VCObserverWrapper(_objectSpread(_objectSpread({}, options), {}, {
-          isPostInteraction: true
-        }));
-      } else if (this.vcObserver === null) {
-        this.vcObserver = new VCObserver(_objectSpread(_objectSpread({}, options), {}, {
-          isPostInteraction: true
-        }));
-      }
+      this.vcObserver = new VCObserverWrapper(_objectSpread(_objectSpread({}, options), {}, {
+        isPostInteraction: true
+      }));
     }
   }, {
     key: "startVCObserver",

package/dist/esm/machine-utilisation/index.js

@@ -12,49 +12,54 @@ export function removeOldBufferRecords(filter) {
   });
 }
 export function createPressureStateReport(start, end) {
-  // To differentiate between the API not available, vs no PressureRecords added
-  if (!('PressureObserver' in globalThis)) {
+  try {
+    // To differentiate between the API not available, vs no PressureRecords added
+    if (!('PressureObserver' in globalThis)) {
+      return null;
+    }
+    var pressureStateCount = pressureRecordBuffer.reduce(function (pressureReport, _ref2) {
+      var time = _ref2.time,
+        state = _ref2.state;
+      if (time >= start && time <= end) {
+        pressureReport[state] += 1;
+      }
+      return pressureReport;
+    }, {
+      nominal: 0,
+      fair: 0,
+      serious: 0,
+      critical: 0
+    });
+    var pressureStateTotal = Object.values(pressureStateCount).reduce(function (total, count) {
+      return total + count;
+    }) || 1;
+    removeOldBufferRecords(end);
+    return {
+      count: pressureStateCount,
+      percentage: {
+        nominal: Math.round(pressureStateCount.nominal / pressureStateTotal * 100),
+        fair: Math.round(pressureStateCount.fair / pressureStateTotal * 100),
+        serious: Math.round(pressureStateCount.serious / pressureStateTotal * 100),
+        critical: Math.round(pressureStateCount.critical / pressureStateTotal * 100)
+      }
+    };
+  } catch (_unused) {
     return null;
   }
-  var pressureStateCount = pressureRecordBuffer.reduce(function (pressureReport, _ref2) {
-    var time = _ref2.time,
-      state = _ref2.state;
-    if (time >= start && time <= end) {
-      pressureReport[state] += 1;
-    }
-    return pressureReport;
-  }, {
-    nominal: 0,
-    fair: 0,
-    serious: 0,
-    critical: 0
-  });
-  var pressureStateTotal = Object.values(pressureStateCount).reduce(function (total, count) {
-    return total + count;
-  }) || 1;
-  removeOldBufferRecords(end);
-  return {
-    count: pressureStateCount,
-    percentage: {
-      nominal: Math.round(pressureStateCount.nominal / pressureStateTotal * 100),
-      fair: Math.round(pressureStateCount.fair / pressureStateTotal * 100),
-      serious: Math.round(pressureStateCount.serious / pressureStateTotal * 100),
-      critical: Math.round(pressureStateCount.critical / pressureStateTotal * 100)
-    }
-  };
 }
 export function initialisePressureObserver() {
   try {
     if ('PressureObserver' in globalThis) {
+      var _pressureObserver$obs;
       pressureObserver = new PressureObserver(function (records) {
         if (pressureRecordBuffer.length + records.length <= BUFFER_MAX_LENGTH) {
           var _pressureRecordBuffer;
           (_pressureRecordBuffer = pressureRecordBuffer).push.apply(_pressureRecordBuffer, _toConsumableArray(records));
         }
       });
-      pressureObserver.observe('cpu', {
+      (_pressureObserver$obs = pressureObserver.observe('cpu', {
         sampleInterval: 100
-      });
+      })) === null || _pressureObserver$obs === void 0 || _pressureObserver$obs.catch();
     }
   } catch (err) {
     /* do nothing, this is a best efforts metric */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "3.12.2",
+	"version": "3.12.4",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -130,9 +130,6 @@
 		"platform_ufo_use_offscreen_canvas": {
 			"type": "boolean"
 		},
-		"platform_ufo_vc_align_revisions_on_watchdog_event": {
-			"type": "boolean"
-		},
 		"platform_ufo_canvas_heatmap_full_precision": {
 			"type": "boolean"
 		},