From 15ceed4069269a8a5b17010308f224f9308cee63 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Fri, 10 Feb 2017 12:40:36 -0800
Subject: [PATCH] annotate "CREATE_MODULE" QP log with the name of the module
 being created

Reviewed By: achen1

Differential Revision: D4513001

fbshipit-source-id: b98024796c0b0cd2489a67bf0695c86d994689d6
---
 .../java/com/facebook/react/bridge/ReactMarker.java   | 11 ++++++++---
 .../com/facebook/react/cxxbridge/ModuleHolder.java    |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
index 5d393a991..49e479fe7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
@@ -13,10 +13,10 @@ import com.facebook.proguard.annotations.DoNotStrip;
 public class ReactMarker {
 
   public interface MarkerListener {
-    void logMarker(String name);
+    void logMarker(String name, @Nullable String tag);
   };
 
-  @Nullable static private MarkerListener sMarkerListener = null;
+  private static @Nullable MarkerListener sMarkerListener = null;
 
   public static void setMarkerListener(MarkerListener listener) {
     SoftAssertions.assertCondition(
@@ -27,8 +27,13 @@ public class ReactMarker {
 
   @DoNotStrip
   public static void logMarker(String name) {
+    logMarker(name, null);
+  }
+
+  @DoNotStrip
+  public static void logMarker(String name, String tag) {
     if (sMarkerListener != null) {
-      sMarkerListener.logMarker(name);
+      sMarkerListener.logMarker(name, tag);
     }
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
index 42ab92753..1d194e776 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
@@ -105,7 +105,7 @@ public class ModuleHolder {
   private NativeModule create() {
     boolean isEagerModule = mModule != null;
     if (!isEagerModule) {
-      ReactMarker.logMarker(CREATE_MODULE_START);
+      ReactMarker.logMarker(CREATE_MODULE_START, mName);
     }
     SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createModule")
       .arg("name", mName)