react-native 0.84.0-nightly-20251107-f8198f662 → 0.84.0-nightly-20251109-b7012ba92

package/ReactCommon/jsinspector-modern/tests/TracingTest.cpp

@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+#include "TracingTest.h"
+#include "engines/JsiIntegrationTestHermesEngineAdapter.h"
+
+#include <folly/executors/QueuedImmediateExecutor.h>
+#include <jsinspector-modern/InspectorFlags.h>
+#include <react/featureflags/ReactNativeFeatureFlags.h>
+#include <react/networking/NetworkReporter.h>
+
+using namespace ::testing;
+
+namespace facebook::react::jsinspector_modern {
+
+class TracingTest : public TracingTestBase<
+                        JsiIntegrationTestHermesEngineAdapter,
+                        folly::QueuedImmediateExecutor> {
+ protected:
+  TracingTest() : TracingTestBase() {}
+
+  void SetUp() override {
+    JsiIntegrationPortableTestBase::SetUp();
+    connect();
+    EXPECT_CALL(
+        fromPage(),
+        onMessage(
+            JsonParsed(AllOf(AtJsonPtr("/method", "Debugger.scriptParsed")))))
+        .Times(AnyNumber());
+  }
+};
+
+TEST_F(TracingTest, EnablesSamplingProfilerOnlyCategoryIsSpecified) {
+  InSequence s;
+
+  startTracing({});
+  auto allTraceEvents = endTracingAndCollectEvents();
+
+  EXPECT_THAT(
+      allTraceEvents,
+      Not(Contains(AllOf(
+          AtJsonPtr("/name", "Profile"),
+          AtJsonPtr("/cat", "disabled-by-default-v8.cpu_profiler")))));
+
+  startTracing({tracing::Category::JavaScriptSampling});
+  allTraceEvents = endTracingAndCollectEvents();
+
+  EXPECT_THAT(
+      allTraceEvents,
+      Contains(AllOf(
+          AtJsonPtr("/name", "Profile"),
+          AtJsonPtr("/cat", "disabled-by-default-v8.cpu_profiler"))));
+}
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/tests/TracingTest.h

@@ -7,14 +7,16 @@
 
 #pragma once
 
+#include "FollyDynamicMatchers.h"
 #include "JsiIntegrationTest.h"
 
+#include <fmt/format.h>
 #include <folly/dynamic.h>
 #include <folly/json.h>
 #include <gmock/gmock.h>
-#include <vector>
 
-#include "FollyDynamicMatchers.h"
+#include <set>
+#include <vector>
 
 namespace facebook::react::jsinspector_modern {
 
@@ -29,17 +31,28 @@ class TracingTestBase : public JsiIntegrationPortableTestBase<EngineAdapter, Exe
   /**
    * Helper method to start tracing via Tracing.start CDP command.
    */
-  void startTracing()
+  void startTracing(
+      const std::set<tracing::Category> &enabledCategories = {
+          tracing::Category::HiddenTimeline,
+          tracing::Category::JavaScriptSampling,
+          tracing::Category::RuntimeExecution,
+          tracing::Category::Timeline,
+          tracing::Category::UserTiming,
+      })
   {
     this->expectMessageFromPage(JsonEq(R"({
                                           "id": 1,
                                           "result": {}
                                         })"));
 
-    this->toPage_->sendMessage(R"({
-                                  "id": 1,
-                                  "method": "Tracing.start"
-                                })");
+    this->toPage_->sendMessage(
+        fmt::format(
+            R"({{
+              "id": 1,
+              "method": "Tracing.start",
+              "params": {{ "categories": "{0}" }}
+            }})",
+            tracing::serializeTracingCategories(enabledCategories)));
   }
 
   /**

package/ReactCommon/jsinspector-modern/tracing/PerformanceTracer.cpp

@@ -8,6 +8,7 @@
 #include "PerformanceTracer.h"
 #include "Timing.h"
 #include "TraceEventSerializer.h"
+#include "TracingCategory.h"
 
 #include <jsinspector-modern/network/CdpNetwork.h>
 #include <jsinspector-modern/network/HttpUtils.h>
@@ -138,7 +139,7 @@ std::optional<std::vector<TraceEvent>> PerformanceTracer::stopTracing() {
   events.emplace_back(
       TraceEvent{
           .name = "TracingStartedInPage",
-          .cat = "disabled-by-default-devtools.timeline",
+          .cat = {Category::HiddenTimeline},
           .ph = 'I',
           .ts = currentTraceStartTime,
           .pid = processId_,
@@ -149,7 +150,7 @@ std::optional<std::vector<TraceEvent>> PerformanceTracer::stopTracing() {
   events.emplace_back(
       TraceEvent{
           .name = "ReactNative-TracingStopped",
-          .cat = "disabled-by-default-devtools.timeline",
+          .cat = {Category::HiddenTimeline},
           .ph = 'I',
           .ts = currentTraceEndTime,
           .pid = processId_,
@@ -409,7 +410,7 @@ void PerformanceTracer::reportFrameTiming(
   return TraceEvent{
       .id = profileId,
       .name = "Profile",
-      .cat = "disabled-by-default-v8.cpu_profiler",
+      .cat = {Category::JavaScriptSampling},
       .ph = 'P',
       .ts = profileTimestamp,
       .pid = processId,
@@ -432,7 +433,7 @@ PerformanceTracer::constructRuntimeProfileChunkTraceEvent(
   return TraceEvent{
       .id = profileId,
       .name = "ProfileChunk",
-      .cat = "disabled-by-default-v8.cpu_profiler",
+      .cat = {Category::JavaScriptSampling},
       .ph = 'P',
       .ts = chunkTimestamp,
       .pid = processId,
@@ -564,7 +565,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "RunTask",
-                    .cat = "disabled-by-default-devtools.timeline",
+                    .cat = {Category::HiddenTimeline},
                     .ph = 'X',
                     .ts = event.start,
                     .pid = processId_,
@@ -576,7 +577,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "RunMicrotasks",
-                    .cat = "v8.execute",
+                    .cat = {Category::RuntimeExecution},
                     .ph = 'X',
                     .ts = event.start,
                     .pid = processId_,
@@ -596,7 +597,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = std::move(event.name),
-                    .cat = "blink.user_timing",
+                    .cat = {Category::UserTiming},
                     .ph = 'I',
                     .ts = event.start,
                     .pid = processId_,
@@ -621,7 +622,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
                 TraceEvent{
                     .id = eventId,
                     .name = event.name,
-                    .cat = "blink.user_timing",
+                    .cat = {Category::UserTiming},
                     .ph = 'b',
                     .ts = event.start,
                     .pid = processId_,
@@ -632,7 +633,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
                 TraceEvent{
                     .id = eventId,
                     .name = std::move(event.name),
-                    .cat = "blink.user_timing",
+                    .cat = {Category::UserTiming},
                     .ph = 'e',
                     .ts = event.start + event.duration,
                     .pid = processId_,
@@ -672,7 +673,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
                 events.emplace_back(
                     TraceEvent{
                         .name = "TimeStamp",
-                        .cat = "devtools.timeline",
+                        .cat = {Category::Timeline},
                         .ph = 'I',
                         .ts = event.createdAt,
                         .pid = processId_,
@@ -710,7 +711,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "TimeStamp",
-                    .cat = "devtools.timeline",
+                    .cat = {Category::Timeline},
                     .ph = 'I',
                     .ts = event.createdAt,
                     .pid = processId_,
@@ -730,7 +731,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "ResourceSendRequest",
-                    .cat = "devtools.timeline",
+                    .cat = {Category::Timeline},
                     .ph = 'I',
                     .ts = event.start,
                     .pid = processId_,
@@ -756,7 +757,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "ResourceReceiveResponse",
-                    .cat = "devtools.timeline",
+                    .cat = {Category::Timeline},
                     .ph = 'I',
                     .ts = event.start,
                     .pid = processId_,
@@ -774,7 +775,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "ResourceFinish",
-                    .cat = "devtools.timeline",
+                    .cat = {Category::Timeline},
                     .ph = 'I',
                     .ts = event.start,
                     .pid = processId_,
@@ -790,7 +791,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "SetLayerTreeId",
-                    .cat = "devtools.timeline",
+                    .cat = {Category::Timeline},
                     .ph = 'I',
                     .ts = event.start,
                     .pid = processId_,
@@ -806,7 +807,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "BeginFrame",
-                    .cat = "devtools.timeline",
+                    .cat = {Category::Timeline},
                     .ph = 'I',
                     .ts = event.start,
                     .pid = processId_,
@@ -822,7 +823,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "Commit",
-                    .cat = "devtools.timeline",
+                    .cat = {Category::Timeline},
                     .ph = 'I',
                     .ts = event.start,
                     .pid = processId_,
@@ -838,7 +839,7 @@ void PerformanceTracer::enqueueTraceEventsFromPerformanceTracerEvent(
             events.emplace_back(
                 TraceEvent{
                     .name = "DrawFrame",
-                    .cat = "devtools.timeline",
+                    .cat = {Category::Timeline},
                     .ph = 'I',
                     .ts = event.start,
                     .pid = processId_,

package/ReactCommon/jsinspector-modern/tracing/TraceEvent.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <jsinspector-modern/tracing/TracingCategory.h>
 #include <react/timing/primitives.h>
 
 #include <folly/dynamic.h>
@@ -40,7 +41,7 @@ struct TraceEvent {
    * A comma separated list of categories for the event, configuring how
    * events are shown in the Trace Viewer UI.
    */
-  std::string cat;
+  Categories cat;
 
   /**
    * The event type. This is a single character which changes depending on the

package/ReactCommon/jsinspector-modern/tracing/TraceEventSerializer.cpp

@@ -7,6 +7,7 @@
 
 #include "TraceEventSerializer.h"
 #include "Timing.h"
+#include "TracingCategory.h"
 
 #include <react/timing/primitives.h>
 
@@ -22,7 +23,7 @@ namespace facebook::react::jsinspector_modern::tracing {
     result["id"] = buffer.data();
   }
   result["name"] = std::move(event.name);
-  result["cat"] = std::move(event.cat);
+  result["cat"] = serializeTracingCategories(event.cat);
   result["ph"] = std::string(1, event.ph);
   result["ts"] = highResTimeStampToTracingClockTimeStamp(event.ts);
   result["pid"] = event.pid;

package/ReactCommon/jsinspector-modern/tracing/TraceRecordingState.h

@@ -34,6 +34,9 @@ struct TraceRecordingState {
 
   // All captures Instance Tracing Profiles during this Trace Recording.
   std::vector<InstanceTracingProfile> instanceTracingProfiles{};
+
+  // The list of categories that are enabled for this recording.
+  std::set<tracing::Category> enabledCategories;
 };
 
 } // namespace facebook::react::jsinspector_modern::tracing

package/ReactCommon/jsinspector-modern/tracing/TracingCategory.h

@@ -0,0 +1,126 @@
+/*
+ * 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 <folly/container/small_vector.h>
+
+#include <optional>
+#include <set>
+#include <string>
+
+namespace facebook::react::jsinspector_modern::tracing {
+
+enum class Category {
+  HiddenTimeline, /*     disabled-by-default-devtools.timeline */
+  JavaScriptSampling, /* disabled-by-default-v8.cpu_profiler   */
+  RuntimeExecution, /*   v8.execute                            */
+  Timeline, /*           devtools.timeline                     */
+  UserTiming, /*         blink.user_timing                     */
+};
+
+inline std::string tracingCategoryToString(const Category &category)
+{
+  switch (category) {
+    case Category::Timeline:
+      return "devtools.timeline";
+    case Category::HiddenTimeline:
+      return "disabled-by-default-devtools.timeline";
+    case Category::UserTiming:
+      return "blink.user_timing";
+    case Category::JavaScriptSampling:
+      return "disabled-by-default-v8.cpu_profiler";
+    case Category::RuntimeExecution:
+      return "v8.execute";
+  }
+}
+
+inline std::optional<Category> getTracingCategoryFromString(const std::string &str)
+{
+  if (str == "blink.user_timing") {
+    return Category::UserTiming;
+  } else if (str == "devtools.timeline") {
+    return Category::Timeline;
+  } else if (str == "disabled-by-default-devtools.timeline") {
+    return Category::HiddenTimeline;
+  } else if (str == "disabled-by-default-v8.cpu_profiler") {
+    return Category::JavaScriptSampling;
+  } else if (str == "v8.execute") {
+    return Category::RuntimeExecution;
+  } else {
+    return std::nullopt;
+  }
+}
+
+/**
+ * The Trace Event could have multiple categories, but this is extremely rare case.
+ */
+using Categories = folly::small_vector<Category, 1>;
+
+// { Timeline, UserTiming } => "devtools.timeline,blink.user_timing"
+inline std::string serializeTracingCategories(const Categories &categories)
+{
+  if (categories.size() == 1) {
+    return tracingCategoryToString(categories.front());
+  }
+
+  std::string serializedValue;
+  for (size_t i = 0; i < categories.size(); ++i) {
+    serializedValue += tracingCategoryToString(categories[i]);
+    if (i < categories.size() - 1) {
+      serializedValue += ",";
+    }
+  }
+  return serializedValue;
+}
+
+// { Timeline, UserTiming } => "devtools.timeline,blink.user_timing"
+inline std::string serializeTracingCategories(const std::set<Category> &categories)
+{
+  std::string serializedValue;
+
+  auto current = categories.begin();
+  while (current != categories.end()) {
+    serializedValue += tracingCategoryToString(*current);
+
+    ++current;
+    if (current != categories.end()) {
+      serializedValue += ",";
+    }
+  }
+
+  return serializedValue;
+}
+
+// "devtools.timeline,blink.user_timing" => { Timeline, UserTiming }
+inline std::set<Category> parseSerializedTracingCategories(const std::string &serializedCategories)
+{
+  std::set<Category> categories;
+  if (serializedCategories.empty()) {
+    return categories;
+  }
+
+  size_t start = 0;
+  size_t end = serializedCategories.find(',');
+  while (end != std::string::npos) {
+    std::string token = serializedCategories.substr(start, end - start);
+    if (auto category = getTracingCategoryFromString(token)) {
+      categories.insert(*category);
+    }
+    start = end + 1;
+    end = serializedCategories.find(',', start);
+  }
+
+  std::string lastToken = serializedCategories.substr(start);
+  if (auto category = getTracingCategoryFromString(lastToken)) {
+    categories.insert(*category);
+  }
+
+  return categories;
+}
+
+} // namespace facebook::react::jsinspector_modern::tracing

package/ReactCommon/react/featureflags/ReactNativeFeatureFlags.cpp

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<a2224b72c2e27abf6a158aa1b4fe9ed0>>
+ * @generated SignedSource<<1a4d03b0d58e389dc9e9af0adf7afa9f>>
  */
 
 /**
@@ -50,6 +50,10 @@ bool ReactNativeFeatureFlags::disableFabricCommitInCXXAnimated() {
   return getAccessor().disableFabricCommitInCXXAnimated();
 }
 
+bool ReactNativeFeatureFlags::disableImageViewPreallocationAndroid() {
+  return getAccessor().disableImageViewPreallocationAndroid();
+}
+
 bool ReactNativeFeatureFlags::disableMountItemReorderingAndroid() {
   return getAccessor().disableMountItemReorderingAndroid();
 }
@@ -66,6 +70,10 @@ bool ReactNativeFeatureFlags::disableTextLayoutManagerCacheAndroid() {
   return getAccessor().disableTextLayoutManagerCacheAndroid();
 }
 
+bool ReactNativeFeatureFlags::disableViewPreallocationAndroid() {
+  return getAccessor().disableViewPreallocationAndroid();
+}
+
 bool ReactNativeFeatureFlags::enableAccessibilityOrder() {
   return getAccessor().enableAccessibilityOrder();
 }

package/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<467f48f2231ceb6772a9a9da9e3badb9>>
+ * @generated SignedSource<<62480a82004544f8365f4f0957eb7319>>
  */
 
 /**
@@ -69,6 +69,11 @@ class ReactNativeFeatureFlags {
    */
   RN_EXPORT static bool disableFabricCommitInCXXAnimated();
 
+  /**
+   * Force disable view preallocation for images triggered from createNode off the main thread on Android
+   */
+  RN_EXPORT static bool disableImageViewPreallocationAndroid();
+
   /**
    * Prevent FabricMountingManager from reordering mountItems, which may lead to invalid state on the UI thread
    */
@@ -89,6 +94,11 @@ class ReactNativeFeatureFlags {
    */
   RN_EXPORT static bool disableTextLayoutManagerCacheAndroid();
 
+  /**
+   * Force disable view preallocation triggered from createNode off the main thread on Android
+   */
+  RN_EXPORT static bool disableViewPreallocationAndroid();
+
   /**
    * When enabled, the accessibilityOrder prop will propagate to native platforms and define the accessibility order.
    */