react-native-tvos 0.83.2-0 → 0.84.0-0

package/ReactCommon/jsinspector-modern/ConsoleTaskContext.h

@@ -0,0 +1,102 @@
+/*
+ * 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 "StackTrace.h"
+
+#include <folly/dynamic.h>
+#include <jsi/jsi.h>
+
+#include <cassert>
+#include <functional>
+#include <memory>
+#include <string>
+
+namespace facebook::react::jsinspector_modern {
+
+class ConsoleTaskOrchestrator;
+class RuntimeTargetDelegate;
+
+class ConsoleTaskId {
+ public:
+  ConsoleTaskId() = default;
+  ~ConsoleTaskId() = default;
+
+  ConsoleTaskId(const ConsoleTaskId &) = default;
+  ConsoleTaskId &operator=(const ConsoleTaskId &) = default;
+
+  ConsoleTaskId(ConsoleTaskId &&) = default;
+  ConsoleTaskId &operator=(ConsoleTaskId &&) = default;
+
+  bool operator==(const ConsoleTaskId &) const = default;
+  inline operator bool() const
+  {
+    return (bool)id_;
+  }
+
+  explicit inline operator void *() const
+  {
+    return id_;
+  }
+
+ private:
+  explicit inline ConsoleTaskId(void *id) : id_(id)
+  {
+    assert(id_ != nullptr);
+  }
+
+  void *id_{nullptr};
+
+  friend class ConsoleTaskContext;
+};
+
+class ConsoleTaskContext : public std::enable_shared_from_this<ConsoleTaskContext> {
+ public:
+  ConsoleTaskContext(jsi::Runtime &runtime, RuntimeTargetDelegate &runtimeTargetDelegate, std::string name);
+  ~ConsoleTaskContext();
+
+  // Can't be moved or copied: the address of `ConsoleTaskContext` is used to
+  // identify this task and all corresponding invocations.
+  ConsoleTaskContext(const ConsoleTaskContext &) = delete;
+  ConsoleTaskContext &operator=(const ConsoleTaskContext &) = delete;
+
+  ConsoleTaskContext(ConsoleTaskContext &&) = delete;
+  ConsoleTaskContext &operator=(ConsoleTaskContext &&) = delete;
+
+  /**
+   * Unique identifier that is calculated based on the address of
+   * ConsoleTaskContext.
+   */
+  ConsoleTaskId id() const;
+
+  /**
+   * Returns the serialized stack trace that was captured during the allocation
+   * of ConsoleTaskContext.
+   */
+  std::optional<folly::dynamic> getSerializedStackTrace() const;
+
+  void schedule();
+
+ private:
+  RuntimeTargetDelegate &runtimeTargetDelegate_;
+  std::string name_;
+  ConsoleTaskOrchestrator &orchestrator_;
+  std::unique_ptr<StackTrace> stackTrace_;
+};
+
+} // namespace facebook::react::jsinspector_modern
+
+namespace std {
+template <>
+struct hash<facebook::react::jsinspector_modern::ConsoleTaskId> {
+  size_t operator()(const facebook::react::jsinspector_modern::ConsoleTaskId &id) const
+  {
+    return std::hash<void *>{}(static_cast<void *>(id));
+  }
+};
+} // namespace std

package/ReactCommon/jsinspector-modern/ConsoleTaskOrchestrator.cpp

@@ -0,0 +1,55 @@
+/*
+ * 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 "ConsoleTaskOrchestrator.h"
+
+namespace facebook::react::jsinspector_modern {
+
+/* static */ ConsoleTaskOrchestrator& ConsoleTaskOrchestrator::getInstance() {
+  static ConsoleTaskOrchestrator instance;
+  return instance;
+}
+
+void ConsoleTaskOrchestrator::scheduleTask(
+    ConsoleTaskId taskId,
+    std::weak_ptr<ConsoleTaskContext> taskContext) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  tasks_.emplace(taskId, taskContext);
+}
+
+void ConsoleTaskOrchestrator::cancelTask(ConsoleTaskId id) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  tasks_.erase(id);
+}
+
+void ConsoleTaskOrchestrator::startTask(ConsoleTaskId id) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  stack_.push(id);
+}
+
+void ConsoleTaskOrchestrator::finishTask(ConsoleTaskId id) {
+  std::lock_guard<std::mutex> lock(mutex_);
+  assert(stack_.top() == id);
+
+  stack_.pop();
+}
+
+std::shared_ptr<ConsoleTaskContext> ConsoleTaskOrchestrator::top() const {
+  std::lock_guard<std::mutex> lock(mutex_);
+  if (stack_.empty()) {
+    return nullptr;
+  }
+
+  auto it = tasks_.find(stack_.top());
+  if (it == tasks_.end()) {
+    return nullptr;
+  }
+
+  return it->second.lock();
+}
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/ConsoleTaskOrchestrator.h

@@ -0,0 +1,48 @@
+/*
+ * 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 <memory>
+#include <mutex>
+#include <stack>
+
+#include "ConsoleTaskContext.h"
+
+namespace facebook::react::jsinspector_modern {
+
+class ConsoleTaskOrchestrator {
+ public:
+  static ConsoleTaskOrchestrator &getInstance();
+
+  ~ConsoleTaskOrchestrator() = default;
+
+  ConsoleTaskOrchestrator(const ConsoleTaskOrchestrator &) = delete;
+  ConsoleTaskOrchestrator &operator=(const ConsoleTaskOrchestrator &) = delete;
+
+  ConsoleTaskOrchestrator(ConsoleTaskOrchestrator &&) = delete;
+  ConsoleTaskOrchestrator &operator=(ConsoleTaskOrchestrator &&) = delete;
+
+  void scheduleTask(ConsoleTaskId taskId, std::weak_ptr<ConsoleTaskContext> taskContext);
+  void cancelTask(ConsoleTaskId taskId);
+
+  void startTask(ConsoleTaskId taskId);
+  void finishTask(ConsoleTaskId taskId);
+  std::shared_ptr<ConsoleTaskContext> top() const;
+
+ private:
+  ConsoleTaskOrchestrator() = default;
+
+  std::stack<ConsoleTaskId> stack_;
+  std::unordered_map<ConsoleTaskId, std::weak_ptr<ConsoleTaskContext>> tasks_;
+  /**
+   * Protects the stack_ and tasks_ members.
+   */
+  mutable std::mutex mutex_;
+};
+
+} // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/HostAgent.cpp

@@ -238,9 +238,9 @@ class HostAgent::Impl final {
 
       auto stashedTraceRecording =
           targetController_.getDelegate()
-              .unstable_getTraceRecordingThatWillBeEmittedOnInitialization();
+              .unstable_getHostTracingProfileThatWillBeEmittedOnInitialization();
       if (stashedTraceRecording.has_value()) {
-        tracingAgent_.emitExternalTraceRecording(
+        tracingAgent_.emitExternalHostTracingProfile(
             std::move(stashedTraceRecording.value()));
       }
 
@@ -385,12 +385,12 @@ class HostAgent::Impl final {
     return fuseboxClientType_ == FuseboxClientType::Fusebox;
   }
 
-  void emitExternalTraceRecording(
-      tracing::TraceRecordingState traceRecording) const {
+  void emitExternalTracingProfile(
+      tracing::HostTracingProfile tracingProfile) const {
     assert(
         hasFuseboxClientConnected() &&
         "Attempted to emit a trace recording to a non-Fusebox client");
-    tracingAgent_.emitExternalTraceRecording(std::move(traceRecording));
+    tracingAgent_.emitExternalHostTracingProfile(std::move(tracingProfile));
   }
 
   void emitSystemStateChanged(bool isSingleHost) {
@@ -506,8 +506,7 @@ class HostAgent::Impl final {
   bool hasFuseboxClientConnected() const {
     return false;
   }
-  void emitExternalTraceRecording(tracing::TraceRecordingState traceRecording) {
-  }
+  void emitExternalTracingProfile(tracing::HostTracingProfile tracingProfile) {}
   void emitSystemStateChanged(bool isSingleHost) {}
 };
 
@@ -543,9 +542,9 @@ bool HostAgent::hasFuseboxClientConnected() const {
   return impl_->hasFuseboxClientConnected();
 }
 
-void HostAgent::emitExternalTraceRecording(
-    tracing::TraceRecordingState traceRecording) const {
-  impl_->emitExternalTraceRecording(std::move(traceRecording));
+void HostAgent::emitExternalTracingProfile(
+    tracing::HostTracingProfile tracingProfile) const {
+  impl_->emitExternalTracingProfile(std::move(tracingProfile));
 }
 
 void HostAgent::emitSystemStateChanged(bool isSingleHost) const {

package/ReactCommon/jsinspector-modern/HostAgent.h

@@ -74,10 +74,10 @@ class HostAgent final {
   bool hasFuseboxClientConnected() const;
 
   /**
-   * Emits the trace recording that was captured externally, not via the
+   * Emits the HostTracingProfile that was captured externally, not via the
    * CDP-initiated request.
    */
-  void emitExternalTraceRecording(tracing::TraceRecordingState traceRecording) const;
+  void emitExternalTracingProfile(tracing::HostTracingProfile tracingProfile) const;
 
   /**
    * Emits a system state changed event when the number of ReactHost instances

package/ReactCommon/jsinspector-modern/HostTarget.cpp

@@ -111,8 +111,9 @@ class HostTargetSession {
     return hostAgent_.hasFuseboxClientConnected();
   }
 
-  void emitTraceRecording(tracing::TraceRecordingState traceRecording) const {
-    hostAgent_.emitExternalTraceRecording(std::move(traceRecording));
+  void emitHostTracingProfile(
+      tracing::HostTracingProfile tracingProfile) const {
+    hostAgent_.emitExternalTracingProfile(std::move(tracingProfile));
   }
 
  private:
@@ -382,13 +383,13 @@ bool HostTarget::hasActiveSessionWithFuseboxClient() const {
   return hasActiveFuseboxSession;
 }
 
-void HostTarget::emitTraceRecordingForFirstFuseboxClient(
-    tracing::TraceRecordingState traceRecording) const {
+void HostTarget::emitTracingProfileForFirstFuseboxClient(
+    tracing::HostTracingProfile tracingProfile) const {
   bool emitted = false;
   sessions_.forEach([&](HostTargetSession& session) {
     if (emitted) {
       /**
-       * TraceRecordingState object is not copiable for performance reasons,
+       * HostTracingProfile object is not copiable for performance reasons,
        * because it could contain large Runtime sampling profile object.
        *
        * This approach would not work with multi-client debugger setup.
@@ -396,7 +397,7 @@ void HostTarget::emitTraceRecordingForFirstFuseboxClient(
       return;
     }
     if (session.hasFuseboxClient()) {
-      session.emitTraceRecording(std::move(traceRecording));
+      session.emitHostTracingProfile(std::move(tracingProfile));
       emitted = true;
     }
   });

package/ReactCommon/jsinspector-modern/HostTarget.h

@@ -17,10 +17,14 @@
 #include "WeakList.h"
 
 #include <optional>
+#include <set>
 #include <string>
 
+#include <jsinspector-modern/tracing/FrameTimingSequence.h>
+#include <jsinspector-modern/tracing/HostTracingProfile.h>
+#include <jsinspector-modern/tracing/TraceRecordingState.h>
+#include <jsinspector-modern/tracing/TracingCategory.h>
 #include <jsinspector-modern/tracing/TracingMode.h>
-#include <jsinspector-modern/tracing/TracingState.h>
 
 #ifndef JSINSPECTOR_EXPORT
 #ifdef _MSC_VER
@@ -53,6 +57,36 @@ struct HostTargetMetadata {
   std::optional<std::string> reactNativeVersion{};
 };
 
+/**
+ * Receives any performance-related events from a HostTarget: could be Tracing, Performance Monitor, etc.
+ */
+class HostTargetTracingDelegate {
+ public:
+  HostTargetTracingDelegate() = default;
+  virtual ~HostTargetTracingDelegate() = default;
+
+  /**
+   * Fired when the corresponding HostTarget started recording a tracing session.
+   * The tracing state is expected to be initialized at this point and the delegate should be able to record events
+   * through HostTarget.
+   */
+  virtual void onTracingStarted(tracing::Mode /* tracingMode */, bool /* screenshotsCategoryEnabled */) {}
+
+  /**
+   * Fired when the corresponding HostTarget is about to end recording a tracing session.
+   * The tracing state is expected to be still initialized during the call and the delegate should be able to record
+   * events through HostTarget.
+   *
+   * Any attempts to record events after this callback is finished will fail.
+   */
+  virtual void onTracingStopped() {}
+
+  HostTargetTracingDelegate(const HostTargetTracingDelegate &) = delete;
+  HostTargetTracingDelegate(HostTargetTracingDelegate &&) = delete;
+  HostTargetTracingDelegate &operator=(const HostTargetTracingDelegate &) = delete;
+  HostTargetTracingDelegate &operator=(HostTargetTracingDelegate &&) = delete;
+};
+
 /**
  * Receives events from a HostTarget. This is a shared interface that each
  * React Native platform needs to implement in order to integrate with the
@@ -152,13 +186,21 @@ class HostTargetDelegate : public LoadNetworkResourceDelegate {
    * trace recording that may have been stashed by the Host from the previous
    * background session.
    *
-   * \return the trace recording state if there is one that needs to be
+   * \return the HostTracingProfile if there is one that needs to be
    * displayed, otherwise std::nullopt.
    */
-  virtual std::optional<tracing::TraceRecordingState> unstable_getTraceRecordingThatWillBeEmittedOnInitialization()
+  virtual std::optional<tracing::HostTracingProfile> unstable_getHostTracingProfileThatWillBeEmittedOnInitialization()
   {
     return std::nullopt;
   }
+
+  /**
+   * An optional delegate that will be used by HostTarget to notify about tracing-related events.
+   */
+  virtual HostTargetTracingDelegate *getTracingDelegate()
+  {
+    return nullptr;
+  }
 };
 
 /**
@@ -203,14 +245,16 @@ class HostTargetController final {
    * Starts trace recording for this HostTarget.
    *
    * \param mode In which mode to start the trace recording.
+   * \param enabledCategories The set of categories to enable.
+   *
    * \return false if already tracing, true otherwise.
    */
-  bool startTracing(tracing::Mode mode);
+  bool startTracing(tracing::Mode mode, std::set<tracing::Category> enabledCategories);
 
   /**
    * Stops previously started trace recording.
    */
-  tracing::TraceRecordingState stopTracing();
+  tracing::HostTracingProfile stopTracing();
 
  private:
   HostTarget &target_;
@@ -226,12 +270,15 @@ class JSINSPECTOR_EXPORT HostTarget : public EnableExecutorFromThis<HostTarget>
  public:
   /**
    * Constructs a new HostTarget.
+   *
    * \param delegate The HostTargetDelegate that will
    * receive events from this HostTarget. The caller is responsible for ensuring
    * that the HostTargetDelegate outlives this object.
+   *
    * \param executor An executor that may be used to call methods on this
    * HostTarget while it exists. \c create additionally guarantees that the
    * executor will not be called after the HostTarget is destroyed.
+   *
    * \note Copies of the provided executor may be destroyed on arbitrary
    * threads, including after the HostTarget is destroyed. Callers must ensure
    * that such destructor calls are safe - e.g. if using a lambda as the
@@ -279,6 +326,7 @@ class JSINSPECTOR_EXPORT HostTarget : public EnableExecutorFromThis<HostTarget>
    */
   void sendCommand(HostCommand command);
 
+#pragma region Tracing
   /**
    * Creates a new HostTracingAgent.
    * This Agent is not owned by the HostTarget. The Agent will be destroyed at
@@ -292,19 +340,16 @@ class JSINSPECTOR_EXPORT HostTarget : public EnableExecutorFromThis<HostTarget>
    * Starts trace recording for this HostTarget.
    *
    * \param mode In which mode to start the trace recording.
+   * \param enabledCategories The set of categories to enable.
+   *
    * \return false if already tracing, true otherwise.
    */
-  bool startTracing(tracing::Mode mode);
+  bool startTracing(tracing::Mode mode, std::set<tracing::Category> enabledCategories);
 
   /**
    * Stops previously started trace recording.
    */
-  tracing::TraceRecordingState stopTracing();
-
-  /**
-   * Returns the state of the background trace, running, stopped, or disabled
-   */
-  tracing::TracingState tracingState() const;
+  tracing::HostTracingProfile stopTracing();
 
   /**
    * Returns whether there is an active session with the Fusebox client, i.e.
@@ -313,22 +358,25 @@ class JSINSPECTOR_EXPORT HostTarget : public EnableExecutorFromThis<HostTarget>
   bool hasActiveSessionWithFuseboxClient() const;
 
   /**
-   * Emits the trace recording for the first active session with the Fusebox
+   * Emits the HostTracingProfile for the first active session with the Fusebox
    * client.
    *
    * @see \c hasActiveFrontendSession
    */
-  void emitTraceRecordingForFirstFuseboxClient(tracing::TraceRecordingState traceRecording) const;
+  void emitTracingProfileForFirstFuseboxClient(tracing::HostTracingProfile tracingProfile) const;
 
   /**
-   * Emits a system state changed event to all active sessions.
+   * An endpoint for the Host to report frame timings that will be recorded if and only if there is currently an active
+   * tracing session.
    */
-  void emitSystemStateChanged(bool isSingleHost) const;
+  void recordFrameTimings(tracing::FrameTimingSequence frameTimingSequence);
+#pragma endregion
 
  private:
   /**
    * Constructs a new HostTarget.
    * The caller must call setExecutor immediately afterwards.
+   *
    * \param delegate The HostTargetDelegate that will
    * receive events from this HostTarget. The caller is responsible for ensuring
    * that the HostTargetDelegate outlives this object.
@@ -347,6 +395,7 @@ class JSINSPECTOR_EXPORT HostTarget : public EnableExecutorFromThis<HostTarget>
   std::unique_ptr<PerfMonitorUpdateHandler> perfMonitorUpdateHandler_;
   std::unique_ptr<HostRuntimeBinding> perfMetricsBinding_;
 
+#pragma region Tracing
   /**
    * Current pending trace recording, which encapsulates the configuration of
    * the tracing session and the state.
@@ -354,6 +403,14 @@ class JSINSPECTOR_EXPORT HostTarget : public EnableExecutorFromThis<HostTarget>
    * Should only be allocated when there is an active tracing session.
    */
   std::unique_ptr<HostTargetTraceRecording> traceRecording_{nullptr};
+  /**
+   * Protects the state inside traceRecording_.
+   *
+   * Calls to tracing subsystem could happen from different threads, depending on the mode (Background or CDP) and
+   * the method: the Host could report frame timings from any arbitrary thread.
+   */
+  std::mutex tracingMutex_;
+#pragma endregion
 
   inline HostTargetDelegate &getDelegate()
   {

package/ReactCommon/jsinspector-modern/HostTargetTraceRecording.cpp

@@ -8,12 +8,27 @@
 #include "HostTargetTraceRecording.h"
 #include "HostTarget.h"
 
+#include <oscompat/OSCompat.h>
+
 namespace facebook::react::jsinspector_modern {
 
 HostTargetTraceRecording::HostTargetTraceRecording(
+    HostTarget& hostTarget,
     tracing::Mode tracingMode,
-    HostTarget& hostTarget)
-    : tracingMode_(tracingMode), hostTarget_(hostTarget) {}
+    std::set<tracing::Category> enabledCategories,
+    std::optional<HighResDuration> windowSize)
+    : hostTarget_(hostTarget),
+      tracingMode_(tracingMode),
+      enabledCategories_(std::move(enabledCategories)),
+      windowSize_(windowSize) {
+  if (windowSize) {
+    frameTimings_ = tracing::TimeWindowedBuffer<tracing::FrameTimingSequence>(
+        [](auto& sequence) { return sequence.beginDrawingTimestamp; },
+        *windowSize);
+  } else {
+    frameTimings_ = tracing::TimeWindowedBuffer<tracing::FrameTimingSequence>();
+  };
+}
 
 void HostTargetTraceRecording::setTracedInstance(
     InstanceTarget* instanceTarget) {
@@ -29,14 +44,13 @@ void HostTargetTraceRecording::start() {
       hostTracingAgent_ == nullptr &&
       "Tracing Agent for the HostTarget was already initialized.");
 
-  state_ = tracing::TraceRecordingState{
-      .mode = tracingMode_,
-      .startTime = HighResTimeStamp::now(),
-  };
+  startTime_ = HighResTimeStamp::now();
+  state_ = tracing::TraceRecordingState(
+      tracingMode_, enabledCategories_, windowSize_);
   hostTracingAgent_ = hostTarget_.createTracingAgent(*state_);
 }
 
-tracing::TraceRecordingState HostTargetTraceRecording::stop() {
+tracing::HostTracingProfile HostTargetTraceRecording::stop() {
   assert(
       hostTracingAgent_ != nullptr &&
       "TracingAgent for the HostTarget has not been initialized.");
@@ -48,7 +62,25 @@ tracing::TraceRecordingState HostTargetTraceRecording::stop() {
   auto state = std::move(*state_);
   state_.reset();
 
-  return state;
+  auto startTime = *startTime_;
+  startTime_.reset();
+
+  return tracing::HostTracingProfile{
+      .processId = oscompat::getCurrentProcessId(),
+      .startTime = startTime,
+      .frameTimings = frameTimings_.pruneExpiredAndExtract(),
+      .instanceTracingProfiles = std::move(state.instanceTracingProfiles),
+      .runtimeSamplingProfiles = std::move(state.runtimeSamplingProfiles),
+  };
+}
+
+void HostTargetTraceRecording::recordFrameTimings(
+    tracing::FrameTimingSequence frameTimingSequence) {
+  assert(
+      state_.has_value() &&
+      "The state for this tracing session has not been initialized.");
+
+  frameTimings_.push(frameTimingSequence);
 }
 
 } // namespace facebook::react::jsinspector_modern

package/ReactCommon/jsinspector-modern/HostTargetTraceRecording.h

@@ -11,9 +11,15 @@
 #include "HostTarget.h"
 #include "InstanceTarget.h"
 
+#include <jsinspector-modern/tracing/FrameTimingSequence.h>
+#include <jsinspector-modern/tracing/HostTracingProfile.h>
+#include <jsinspector-modern/tracing/TimeWindowedBuffer.h>
 #include <jsinspector-modern/tracing/TraceRecordingState.h>
+#include <jsinspector-modern/tracing/TracingCategory.h>
+#include <react/timing/primitives.h>
 
 #include <optional>
+#include <set>
 
 namespace facebook::react::jsinspector_modern {
 
@@ -28,7 +34,11 @@ namespace facebook::react::jsinspector_modern {
  */
 class HostTargetTraceRecording {
  public:
-  explicit HostTargetTraceRecording(tracing::Mode tracingMode, HostTarget &hostTarget);
+  HostTargetTraceRecording(
+      HostTarget &hostTarget,
+      tracing::Mode tracingMode,
+      std::set<tracing::Category> enabledCategories,
+      std::optional<HighResDuration> windowSize = std::nullopt);
 
   inline bool isBackgroundInitiated() const
   {
@@ -53,22 +63,34 @@ class HostTargetTraceRecording {
   void start();
 
   /**
-   * Stops the recording and drops the recording state.
+   * Stops the recording and returns the recorded HostTracingProfile.
    *
    * Will deallocate all Tracing Agents.
    */
-  tracing::TraceRecordingState stop();
+  tracing::HostTracingProfile stop();
+
+  /**
+   * Adds the frame timing sequence to the current state of this trace recording.
+   *
+   * The caller guarantees the protection from data races. This is protected by the tracing mutex in HostTarget.
+   */
+  void recordFrameTimings(tracing::FrameTimingSequence frameTimingSequence);
 
  private:
+  /**
+   * The Host for which this Trace Recording is going to happen.
+   */
+  HostTarget &hostTarget_;
+
   /**
    * The mode in which this trace recording was initialized.
    */
   tracing::Mode tracingMode_;
 
   /**
-   * The Host for which this Trace Recording is going to happen.
+   * The timestamp at which this Trace Recording started.
    */
-  HostTarget &hostTarget_;
+  std::optional<HighResTimeStamp> startTime_;
 
   /**
    * The state of the current Trace Recording.
@@ -81,6 +103,21 @@ class HostTargetTraceRecording {
    * Only allocated if the recording is enabled.
    */
   std::shared_ptr<HostTracingAgent> hostTracingAgent_;
+
+  /**
+   * The list of categories that are enabled for this recording.
+   */
+  std::set<tracing::Category> enabledCategories_;
+
+  /**
+   * The size of the time window for this recording.
+   */
+  std::optional<HighResDuration> windowSize_;
+
+  /**
+   * Frame timings captured on the Host side.
+   */
+  tracing::TimeWindowedBuffer<tracing::FrameTimingSequence> frameTimings_;
 };
 
 } // namespace facebook::react::jsinspector_modern