react-native-tvos 0.81.4-0 → 0.82.0-0

package/ReactCommon/react/performance/timeline/PerformanceEntryReporter.h

@@ -9,9 +9,10 @@
 
 #include "PerformanceEntryCircularBuffer.h"
 #include "PerformanceEntryKeyedBuffer.h"
+#include "PerformanceEntryReporterListeners.h"
 #include "PerformanceObserverRegistry.h"
 
-#include <jsinspector-modern/tracing/CdpTracing.h>
+#include <folly/dynamic.h>
 #include <react/timing/primitives.h>
 
 #include <memory>
@@ -67,11 +68,10 @@ class PerformanceEntryReporter {
       PerformanceEntryType entryType,
       const std::string& entryName);
 
-  HighResTimeStamp getCurrentTimeStamp() const;
-
-  void setTimeStampProvider(std::function<HighResTimeStamp()> provider) {
-    timeStampProvider_ = std::move(provider);
-  }
+  void addEventTimingListener(
+      PerformanceEntryReporterEventTimingListener* listener);
+  void removeEventTimingListener(
+      PerformanceEntryReporterEventTimingListener* listener);
 
   static std::vector<PerformanceEntryType> getSupportedEntryTypes();
 
@@ -81,31 +81,36 @@ class PerformanceEntryReporter {
     return eventCounts_;
   }
 
+  void clearEventCounts();
+
   std::optional<HighResTimeStamp> getMarkTime(
       const std::string& markName) const;
 
-  PerformanceMark reportMark(
+  using UserTimingDetailProvider = std::function<folly::dynamic()>;
+
+  void reportMark(
       const std::string& name,
-      const std::optional<HighResTimeStamp>& startTime = std::nullopt);
+      HighResTimeStamp startTime,
+      UserTimingDetailProvider&& detailProvider = nullptr);
 
-  PerformanceMeasure reportMeasure(
+  void reportMeasure(
       const std::string& name,
       HighResTimeStamp startTime,
-      HighResTimeStamp endTime,
-      const std::optional<jsinspector_modern::DevToolsTrackEntryPayload>&
-          trackMetadata = std::nullopt);
+      HighResDuration duration,
+      UserTimingDetailProvider&& detailProvider = nullptr);
 
   void reportEvent(
-      std::string name,
+      const std::string& name,
       HighResTimeStamp startTime,
       HighResDuration duration,
       HighResTimeStamp processingStart,
       HighResTimeStamp processingEnd,
+      HighResTimeStamp taskEndTime,
       uint32_t interactionId);
 
   void reportLongTask(HighResTimeStamp startTime, HighResDuration duration);
 
-  PerformanceResourceTiming reportResourceTiming(
+  void reportResourceTiming(
       const std::string& url,
       HighResTimeStamp fetchStart,
       HighResTimeStamp requestStart,
@@ -128,7 +133,9 @@ class PerformanceEntryReporter {
 
   std::unordered_map<std::string, uint32_t> eventCounts_;
 
-  std::function<HighResTimeStamp()> timeStampProvider_ = nullptr;
+  mutable std::shared_mutex listenersMutex_;
+  std::vector<PerformanceEntryReporterEventTimingListener*>
+      eventTimingListeners_{};
 
   const inline PerformanceEntryBuffer& getBuffer(
       PerformanceEntryType entryType) const {
@@ -145,8 +152,9 @@ class PerformanceEntryReporter {
         return resourceTimingBuffer_;
       case PerformanceEntryType::_NEXT:
         throw std::logic_error("Cannot get buffer for _NEXT entry type");
+      default:
+        throw std::logic_error("Unhandled PerformanceEntryType");
     }
-    throw std::logic_error("Unhandled PerformanceEntryType");
   }
 
   inline PerformanceEntryBuffer& getBufferRef(PerformanceEntryType entryType) {
@@ -163,12 +171,17 @@ class PerformanceEntryReporter {
         return resourceTimingBuffer_;
       case PerformanceEntryType::_NEXT:
         throw std::logic_error("Cannot get buffer for _NEXT entry type");
+      default:
+        throw std::logic_error("Unhandled PerformanceEntryType");
     }
-    throw std::logic_error("Unhandled PerformanceEntryType");
   }
 
-  void traceMark(const PerformanceMark& entry) const;
-  void traceMeasure(const PerformanceMeasure& entry) const;
+  void traceMark(
+      const PerformanceMark& entry,
+      UserTimingDetailProvider&& detailProvider) const;
+  void traceMeasure(
+      const PerformanceMeasure& entry,
+      UserTimingDetailProvider&& detailProvider) const;
 };
 
 } // namespace facebook::react

package/ReactCommon/react/performance/timeline/PerformanceEntryReporterListeners.h

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include "PerformanceEntry.h"
+
+#include <folly/dynamic.h>
+#include <react/timing/primitives.h>
+
+namespace facebook::react {
+
+class PerformanceEntryReporterEventTimingListener {
+ public:
+  virtual ~PerformanceEntryReporterEventTimingListener() = default;
+
+  virtual void onEventTimingEntry(const PerformanceEventTiming& /*entry*/) {}
+
+  virtual void onLongTaskEntry(const PerformanceLongTaskTiming& /*entry*/) {}
+};
+
+} // namespace facebook::react

package/ReactCommon/react/performance/timeline/tests/PerformanceEntryReporterTest.cpp

@@ -11,6 +11,7 @@
 
 #include "../PerformanceEntryReporter.h"
 
+#include <array>
 #include <variant>
 
 using namespace facebook::react;
@@ -46,13 +47,13 @@ namespace facebook::react {
 [[maybe_unused]] static std::ostream& operator<<(
     std::ostream& os,
     const PerformanceEntry& entry) {
-  static constexpr const char* entryTypeNames[] = {
+  static constexpr auto entryTypeNames = std::to_array<const char*>({
       "PerformanceEntryType::UNDEFINED",
       "PerformanceEntryType::MARK",
       "PerformanceEntryType::MEASURE",
       "PerformanceEntryType::EVENT",
       "PerformanceEntryType::RESOURCE",
-  };
+  });
 
   return std::visit(
       [&](const auto& entryDetails) -> std::ostream& {
@@ -129,20 +130,16 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMeasures) {
       "mark2", timeOrigin + HighResDuration::fromMilliseconds(2));
 
   reporter->reportMeasure(
-      "measure0",
-      timeOrigin,
-      timeOrigin + HighResDuration::fromMilliseconds(2));
+      "measure0", timeOrigin, HighResDuration::fromMilliseconds(2));
   reporter->reportMeasure(
-      "measure1",
-      timeOrigin,
-      timeOrigin + HighResDuration::fromMilliseconds(3));
+      "measure1", timeOrigin, HighResDuration::fromMilliseconds(3));
 
   reporter->reportMark(
       "mark3", timeOrigin + HighResDuration::fromNanoseconds(2.5 * 1e6));
   reporter->reportMeasure(
       "measure2",
       timeOrigin + HighResDuration::fromMilliseconds(2),
-      timeOrigin + HighResDuration::fromMilliseconds(2));
+      HighResDuration::fromMilliseconds(2));
   reporter->reportMark(
       "mark4", timeOrigin + HighResDuration::fromMilliseconds(3));
 
@@ -172,7 +169,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMeasures) {
       PerformanceMeasure{
           {.name = "measure2",
            .startTime = timeOrigin + HighResDuration::fromMilliseconds(2),
-           .duration = HighResDuration::zero()}},
+           .duration = HighResDuration::fromMilliseconds(2)}},
       PerformanceMark{
           {.name = "mark3",
            .startTime =
@@ -203,21 +200,17 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestGetEntries) {
       "mark2", timeOrigin + HighResDuration::fromMilliseconds(2));
 
   reporter->reportMeasure(
-      "common_name",
-      timeOrigin,
-      timeOrigin + HighResDuration::fromMilliseconds(2));
+      "common_name", timeOrigin, HighResDuration::fromMilliseconds(2));
   reporter->reportMeasure(
-      "measure1",
-      timeOrigin,
-      timeOrigin + HighResDuration::fromMilliseconds(3));
+      "measure1", timeOrigin, HighResDuration::fromMilliseconds(3));
   reporter->reportMeasure(
       "measure2",
       timeOrigin + HighResDuration::fromMilliseconds(1),
-      timeOrigin + HighResDuration::fromMilliseconds(6));
+      HighResDuration::fromMilliseconds(6));
   reporter->reportMeasure(
       "measure3",
       timeOrigin + HighResDuration::fromNanoseconds(1.5 * 1e6),
-      timeOrigin + HighResDuration::fromMilliseconds(2));
+      HighResDuration::fromMilliseconds(2));
 
   {
     const auto allEntries = toSorted(reporter->getEntries());
@@ -241,12 +234,12 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestGetEntries) {
         PerformanceMeasure{
             {.name = "measure2",
              .startTime = timeOrigin + HighResDuration::fromMilliseconds(1),
-             .duration = HighResDuration::fromMilliseconds(5)}},
+             .duration = HighResDuration::fromMilliseconds(6)}},
         PerformanceMeasure{
             {.name = "measure3",
              .startTime =
                  timeOrigin + HighResDuration::fromNanoseconds(1.5 * 1e6),
-             .duration = HighResDuration::fromNanoseconds(0.5 * 1e6)}},
+             .duration = HighResDuration::fromMilliseconds(2)}},
         PerformanceMark{
             {.name = "mark2",
              .startTime = timeOrigin + HighResDuration::fromMilliseconds(2),
@@ -288,12 +281,12 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestGetEntries) {
         PerformanceMeasure{
             {.name = "measure2",
              .startTime = timeOrigin + HighResDuration::fromMilliseconds(1),
-             .duration = HighResDuration::fromMilliseconds(5)}},
+             .duration = HighResDuration::fromMilliseconds(6)}},
         PerformanceMeasure{
             {.name = "measure3",
              .startTime =
                  timeOrigin + HighResDuration::fromNanoseconds(1.5 * 1e6),
-             .duration = HighResDuration::fromNanoseconds(0.5 * 1e6)}}};
+             .duration = HighResDuration::fromMilliseconds(2)}}};
     ASSERT_EQ(expected, measures);
   }
 
@@ -330,21 +323,17 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestClearMarks) {
       "mark2", timeOrigin + HighResDuration::fromMilliseconds(2));
 
   reporter->reportMeasure(
-      "common_name",
-      timeOrigin,
-      timeOrigin + HighResDuration::fromMilliseconds(2));
+      "common_name", timeOrigin, HighResDuration::fromMilliseconds(2));
   reporter->reportMeasure(
-      "measure1",
-      timeOrigin,
-      timeOrigin + HighResDuration::fromMilliseconds(3));
+      "measure1", timeOrigin, HighResDuration::fromMilliseconds(3));
   reporter->reportMeasure(
       "measure2",
       timeOrigin + HighResDuration::fromMilliseconds(1),
-      timeOrigin + HighResDuration::fromMilliseconds(6));
+      HighResDuration::fromMilliseconds(6));
   reporter->reportMeasure(
       "measure3",
       timeOrigin + HighResDuration::fromNanoseconds(1.5 * 1e6),
-      timeOrigin + HighResDuration::fromMilliseconds(2));
+      HighResDuration::fromMilliseconds(2));
 
   reporter->clearEntries(PerformanceEntryType::MARK, "common_name");
 

package/ReactCommon/react/performance/timeline/tests/PerformanceObserverTest.cpp

@@ -96,6 +96,7 @@ TEST(PerformanceObserver, PerformanceObserverTestFilterMulti) {
       HighResDuration::fromMilliseconds(10),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "test2",
@@ -103,6 +104,7 @@ TEST(PerformanceObserver, PerformanceObserverTestFilterMulti) {
       HighResDuration::fromMilliseconds(10),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "test3",
@@ -110,6 +112,7 @@ TEST(PerformanceObserver, PerformanceObserverTestFilterMulti) {
       HighResDuration::fromMilliseconds(10),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
 
   ASSERT_EQ(observer->takeRecords().size(), 0);
@@ -155,6 +158,7 @@ TEST(PerformanceObserver, PerformanceObserverTestFilterMultiCallbackNotCalled) {
       HighResDuration::fromMilliseconds(10),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "test2",
@@ -162,6 +166,7 @@ TEST(PerformanceObserver, PerformanceObserverTestFilterMultiCallbackNotCalled) {
       HighResDuration::fromMilliseconds(10),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "off3",
@@ -169,6 +174,7 @@ TEST(PerformanceObserver, PerformanceObserverTestFilterMultiCallbackNotCalled) {
       HighResDuration::fromMilliseconds(10),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
 
   ASSERT_FALSE(callbackCalled);
@@ -190,7 +196,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveTakeRecords) {
   reporter->reportMeasure(
       "off",
       timeOrigin + HighResDuration::fromMilliseconds(10),
-      timeOrigin + HighResDuration::fromMilliseconds(20));
+      HighResDuration::fromMilliseconds(20));
   reporter->reportMark(
       "test2", timeOrigin + HighResDuration::fromMilliseconds(20));
   reporter->reportMark(
@@ -230,6 +236,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveDurationThreshold) {
       HighResDuration::fromMilliseconds(50),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "test2",
@@ -237,6 +244,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveDurationThreshold) {
       HighResDuration::fromMilliseconds(100),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "off1",
@@ -244,6 +252,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveDurationThreshold) {
       HighResDuration::fromMilliseconds(40),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportMark(
       "off2", timeOrigin + HighResDuration::fromMilliseconds(100));
@@ -253,6 +262,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveDurationThreshold) {
       HighResDuration::fromMilliseconds(60),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
 
   const std::vector<PerformanceEntry> expected = {
@@ -262,6 +272,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveDurationThreshold) {
            .duration = HighResDuration::fromMilliseconds(50)},
           timeOrigin,
           timeOrigin,
+          timeOrigin,
           0},
       PerformanceEventTiming{
           {.name = "test2",
@@ -269,6 +280,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveDurationThreshold) {
            .duration = HighResDuration::fromMilliseconds(100)},
           timeOrigin,
           timeOrigin,
+          timeOrigin,
           0},
       PerformanceEventTiming{
           {.name = "test3",
@@ -276,6 +288,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveDurationThreshold) {
            .duration = HighResDuration::fromMilliseconds(60)},
           timeOrigin,
           timeOrigin,
+          timeOrigin,
           0},
   };
 
@@ -295,6 +308,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveBuffered) {
       HighResDuration::fromMilliseconds(50),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "test2",
@@ -302,6 +316,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveBuffered) {
       HighResDuration::fromMilliseconds(100),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "test3",
@@ -309,6 +324,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveBuffered) {
       HighResDuration::fromMilliseconds(40),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "test4",
@@ -316,6 +332,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveBuffered) {
       HighResDuration::fromMilliseconds(100),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
 
   auto observer =
@@ -332,6 +349,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveBuffered) {
            .duration = HighResDuration::fromMilliseconds(50)},
           timeOrigin,
           timeOrigin,
+          timeOrigin,
           0},
       PerformanceEventTiming{
           {.name = "test2",
@@ -339,6 +357,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveBuffered) {
            .duration = HighResDuration::fromMilliseconds(100)},
           timeOrigin,
           timeOrigin,
+          timeOrigin,
           0},
       PerformanceEventTiming{
           {.name = "test4",
@@ -346,6 +365,7 @@ TEST(PerformanceObserver, PerformanceObserverTestObserveBuffered) {
            .duration = HighResDuration::fromMilliseconds(100)},
           timeOrigin,
           timeOrigin,
+          timeOrigin,
           0},
   };
 
@@ -371,15 +391,14 @@ TEST(PerformanceObserver, PerformanceObserverTestMultiple) {
       {.durationThreshold = HighResDuration::fromMilliseconds(80)});
 
   reporter->reportMeasure(
-      "measure",
-      timeOrigin,
-      timeOrigin + HighResDuration::fromMilliseconds(50));
+      "measure", timeOrigin, HighResDuration::fromMilliseconds(50));
   reporter->reportEvent(
       "event1",
       timeOrigin,
       HighResDuration::fromMilliseconds(100),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportEvent(
       "event2",
@@ -387,6 +406,7 @@ TEST(PerformanceObserver, PerformanceObserverTestMultiple) {
       HighResDuration::fromMilliseconds(40),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
   reporter->reportMark(
       "mark1", timeOrigin + HighResDuration::fromMilliseconds(100));
@@ -396,6 +416,7 @@ TEST(PerformanceObserver, PerformanceObserverTestMultiple) {
       HighResDuration::fromMilliseconds(60),
       timeOrigin,
       timeOrigin,
+      timeOrigin,
       0);
 
   const std::vector<PerformanceEntry> expected1 = {
@@ -405,6 +426,7 @@ TEST(PerformanceObserver, PerformanceObserverTestMultiple) {
            .duration = HighResDuration::fromMilliseconds(100)},
           timeOrigin,
           timeOrigin,
+          timeOrigin,
           0},
       PerformanceEventTiming{
           {.name = "event3",
@@ -412,6 +434,7 @@ TEST(PerformanceObserver, PerformanceObserverTestMultiple) {
            .duration = HighResDuration::fromMilliseconds(60)},
           timeOrigin,
           timeOrigin,
+          timeOrigin,
           0},
   };
 
@@ -422,6 +445,7 @@ TEST(PerformanceObserver, PerformanceObserverTestMultiple) {
            .duration = HighResDuration::fromMilliseconds(100)},
           timeOrigin,
           timeOrigin,
+          timeOrigin,
           0},
   };