Clear NetworkReporter timing data for failed requests

Author: ivory-code

packages/react-native/ReactCommon/jsinspector-modern/tests/NetworkReporterTest.cpp

@@ -13,6 +13,7 @@
 #include <oscompat/OSCompat.h>
 #include <react/featureflags/ReactNativeFeatureFlags.h>
 #include <react/networking/NetworkReporter.h>
+#include <react/performance/timeline/PerformanceEntryReporter.h>
 
 using namespace ::testing;
 
@@ -282,6 +283,38 @@ TEST_P(NetworkReporterTest, testLoadingFailedError) {
                                 })");
 }
 
+TEST_P(NetworkReporterTest, testFailedRequestDiscardsResourceTimingData) {
+  auto& networkReporter = NetworkReporter::getInstance();
+  auto performanceEntryReporter = PerformanceEntryReporter::getInstance();
+  const std::string requestId = "failed-request-resource-timing";
+  const std::string retryUrl = "https://example.com/retry";
+
+  performanceEntryReporter->clearEntries(PerformanceEntryType::RESOURCE);
+
+  networkReporter.reportRequestStart(
+      requestId,
+      {.url = "https://example.com/failed", .httpMethod = "GET"},
+      0,
+      std::nullopt);
+  networkReporter.reportRequestFailed(requestId, false);
+
+  // Reusing the ID makes retained timing data observable without exposing
+  // NetworkReporter internals.
+  networkReporter.reportRequestStart(
+      requestId, {.url = retryUrl, .httpMethod = "GET"}, 0, std::nullopt);
+  networkReporter.reportResponseStart(
+      requestId, {.url = retryUrl, .statusCode = 200}, 0);
+  networkReporter.reportResponseEnd(requestId, 0);
+
+  const auto entries =
+      performanceEntryReporter->getEntries(PerformanceEntryType::RESOURCE);
+  ASSERT_EQ(1, entries.size());
+  EXPECT_EQ(
+      retryUrl, std::get<PerformanceResourceTiming>(entries.front()).name);
+
+  performanceEntryReporter->clearEntries(PerformanceEntryType::RESOURCE);
+}
+
 TEST_P(NetworkReporterTest, testCompleteNetworkFlow) {
   InSequence s;
   this->expectMessageFromPage(JsonEq(R"({

packages/react-native/ReactCommon/react/networking/NetworkReporter.cpp

@@ -234,6 +234,12 @@ void NetworkReporter::reportResponseEnd(
 void NetworkReporter::reportRequestFailed(
     const std::string& requestId,
     bool cancelled) const {
+  // All builds: Discard incomplete PerformanceResourceTiming metadata
+  {
+    std::lock_guard<std::mutex> lock(perfTimingsMutex_);
+    perfTimingsBuffer_.erase(requestId);
+  }
+
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
   // Debugger enabled: CDP event handling
   jsinspector_modern::NetworkHandler::getInstance().onLoadingFailed(

packages/react-native/ReactCommon/react/networking/NetworkReporter.h

@@ -200,8 +200,8 @@ class NetworkReporter {
   NetworkReporter &operator=(const NetworkReporter &) = delete;
   ~NetworkReporter() = default;
 
-  std::unordered_map<std::string, ResourceTimingData> perfTimingsBuffer_{};
-  std::mutex perfTimingsMutex_;
+  mutable std::unordered_map<std::string, ResourceTimingData> perfTimingsBuffer_{};
+  mutable std::mutex perfTimingsMutex_;
 };
 
 } // namespace facebook::react