Replaced ReactMarker::logTaggedMarker() with JReactMarker::logPerfMar…

…ker to fix events logging
Skyscanner · Mar 6, 2019 · b1ccb00 · b1ccb00
1 parent 41577ec
commit b1ccb00
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/ReactAndroid/src/main/jni/react/jni/JReactMarker.h b/ReactAndroid/src/main/jni/react/jni/JReactMarker.h
@@ -17,11 +17,10 @@ class JReactMarker : public facebook::jni::JavaClass<JReactMarker> {
 public:
   static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/ReactMarker;";
   static void setLogPerfMarkerIfNeeded();
-
-private:
   static void logMarker(const std::string& marker);
   static void logMarker(const std::string& marker, const std::string& tag);
   static void logPerfMarker(const ReactMarker::ReactMarkerId markerId, const char* tag);
+
 };
 
 }

diff --git a/ReactCommon/jsiexecutor/Android.mk b/ReactCommon/jsiexecutor/Android.mk
@@ -17,6 +17,6 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 LOCAL_CFLAGS := -fexceptions -frtti -O3
 
 LOCAL_STATIC_LIBRARIES := libjsi reactnative
-LOCAL_SHARED_LIBRARIES := libfolly_json glog
+LOCAL_SHARED_LIBRARIES := libfolly_json glog libreactnativejni
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
@@ -8,6 +8,7 @@
 #include <cxxreact/JSBigString.h>
 #include <cxxreact/ModuleRegistry.h>
 #include <cxxreact/ReactMarker.h>
+#include <react/jni/JReactMarker.h>
 #include <cxxreact/SystraceSection.h>
 #include <folly/Conv.h>
 #include <folly/json.h>
@@ -162,20 +163,18 @@ void JSIExecutor::loadApplicationScript(
     runtimeInstaller_(*runtime_);
   }
 
-  bool hasLogger(ReactMarker::logTaggedMarker);
   std::string scriptName = simpleBasename(sourceURL);
-  if (hasLogger) {
-    ReactMarker::logTaggedMarker(
-        ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
-  }
+
+  JReactMarker::logPerfMarker(
+      ReactMarker::RUN_JS_BUNDLE_START, scriptName.c_str());
+
   runtime_->evaluateJavaScript(
       std::make_unique<BigStringBuffer>(std::move(script)), sourceURL);
   flush();
-  if (hasLogger) {
-    ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP);
-    ReactMarker::logTaggedMarker(
-        ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
-  }
+
+  JReactMarker::logPerfMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP, nullptr);
+  JReactMarker::logPerfMarker(
+      ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str());
 }
 
 void JSIExecutor::setBundleRegistry(std::unique_ptr<RAMBundleRegistry> r) {
@@ -200,7 +199,7 @@ void JSIExecutor::registerBundle(
     uint32_t bundleId,
     const std::string& bundlePath) {
   const auto tag = folly::to<std::string>(bundleId);
-  ReactMarker::logTaggedMarker(
+  JReactMarker::logPerfMarker(
       ReactMarker::REGISTER_JS_SEGMENT_START, tag.c_str());
   if (bundleRegistry_) {
     bundleRegistry_->registerBundle(bundleId, bundlePath);
@@ -210,7 +209,7 @@ void JSIExecutor::registerBundle(
         std::make_unique<BigStringBuffer>(std::move(script)),
         JSExecutor::getSyntheticBundlePath(bundleId, bundlePath));
   }
-  ReactMarker::logTaggedMarker(
+  JReactMarker::logPerfMarker(
       ReactMarker::REGISTER_JS_SEGMENT_STOP, tag.c_str());
 }
 

diff --git a/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp b/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp
@@ -11,6 +11,8 @@
 
 #include <string>
 
+#include <react/jni/JReactMarker.h>
+
 using namespace facebook::jsi;
 
 namespace facebook {
@@ -52,11 +54,9 @@ void JSINativeModules::reset() {
 folly::Optional<Object> JSINativeModules::createModule(
     Runtime& rt,
     const std::string& name) {
-  bool hasLogger(ReactMarker::logTaggedMarker);
-  if (hasLogger) {
-    ReactMarker::logTaggedMarker(
-        ReactMarker::NATIVE_MODULE_SETUP_START, name.c_str());
-  }
+
+  JReactMarker::logPerfMarker(
+      ReactMarker::NATIVE_MODULE_SETUP_START, name.c_str());
 
   if (!m_genNativeModuleJS) {
     m_genNativeModuleJS =
@@ -77,10 +77,8 @@ folly::Optional<Object> JSINativeModules::createModule(
   folly::Optional<Object> module(
       moduleInfo.asObject(rt).getPropertyAsObject(rt, "module"));
 
-  if (hasLogger) {
-    ReactMarker::logTaggedMarker(
-        ReactMarker::NATIVE_MODULE_SETUP_STOP, name.c_str());
-  }
+  JReactMarker::logPerfMarker(
+      ReactMarker::NATIVE_MODULE_SETUP_STOP, name.c_str());
 
   return module;
 }