From 0937f13cc32a87e7db52dbcd1d5d35a53e51e8c2 Mon Sep 17 00:00:00 2001
From: Paige Sun <paigesun@fb.com>
Date: Mon, 16 Nov 2020 12:36:14 -0800
Subject: [PATCH] Do not log image if it fails lifecycle assert in
 getWillRequestUrlTime

Reviewed By: sammy-SC

Differential Revision: D24990452

fbshipit-source-id: ce4d5ec9e3cf237c6edbd17368f2dcf3aecbec2b
---
 .../renderer/imagemanager/ImageTelemetry.cpp      |  6 ------
 .../react/renderer/imagemanager/ImageTelemetry.h  | 15 +++++----------
 .../imagemanager/platform/ios/RCTImageManager.mm  |  1 -
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp
index 43a6134495e..40524e5b0ff 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp
+++ b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.cpp
@@ -10,17 +10,11 @@
 namespace facebook {
 namespace react {
 
-void ImageTelemetry::willRequestUrl() {
-  assert(willRequestUrlTime_ == kTelemetryUndefinedTimePoint);
-  willRequestUrlTime_ = telemetryTimePointNow();
-}
-
 SurfaceId ImageTelemetry::getSurfaceId() const {
   return surfaceId_;
 }
 
 TelemetryTimePoint ImageTelemetry::getWillRequestUrlTime() const {
-  assert(willRequestUrlTime_ != kTelemetryUndefinedTimePoint);
   return willRequestUrlTime_;
 }
 
diff --git a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
index 3f053dbcf3e..1ffaffd0a4a 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
+++ b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
@@ -15,25 +15,20 @@ namespace react {
 
 /*
  * Represents telemetry data associated with a image request
+ * where the willRequestUrlTime is the time at ImageTelemetry's creation.
  */
 class ImageTelemetry final {
  public:
-  ImageTelemetry(SurfaceId const surfaceId) : surfaceId_(surfaceId) {}
+  ImageTelemetry(SurfaceId const surfaceId) : surfaceId_(surfaceId) {
+    willRequestUrlTime_ = telemetryTimePointNow();
+  }
 
-  /*
-   * Signaling
-   */
-  void willRequestUrl();
-
-  /*
-   * Reading
-   */
   TelemetryTimePoint getWillRequestUrlTime() const;
 
   SurfaceId getSurfaceId() const;
 
  private:
-  TelemetryTimePoint willRequestUrlTime_{kTelemetryUndefinedTimePoint};
+  TelemetryTimePoint willRequestUrlTime_;
 
   const SurfaceId surfaceId_;
 };
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
index 3fa8c36b291..4922b96ef03 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
@@ -44,7 +44,6 @@ using namespace facebook::react;
   std::shared_ptr<ImageTelemetry> telemetry;
   if ([self->_imageLoader shouldEnablePerfLoggingForRequestUrl:request.URL]) {
     telemetry = std::make_shared<ImageTelemetry>(surfaceId);
-    telemetry->willRequestUrl();
   } else {
     telemetry = nullptr;
   }