From 7ec9af0fcf428d39b673438b00ea709ff3da7328 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Wed, 4 Mar 2020 15:03:31 -0800 Subject: [PATCH] Temporarily add logs in TM initialization Summary: Marketplace eagerly initializes a few NativeModules. These NativeModules are TurboModule compatible, and the device/user is in the TurboModule test. So these NativeModuels should be returned from the TurboModule system. However, for some reason, we end up doing a lookup on the `NativeModuleRegistry` for these NativeModules. This means that either: 1. The TurboModuleManager isn't attached to the CatalystInstance 2. The TurboModuleManager returned null from getModule. These logs will help us get to the bottom of what's going on. Changelog: [Internal] Reviewed By: JoshuaGross Differential Revision: D20260150 fbshipit-source-id: bb554ead412ad3b0fa7502b77f575365608ebc98 --- .../facebook/react/ReactInstanceManager.java | 19 +++++++++++++++++++ .../react/bridge/CatalystInstanceImpl.java | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java index 3fe49600579..1e111d3e78a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java @@ -1239,14 +1239,33 @@ public class ReactInstanceManager { reactContext.initializeWithInstance(catalystInstance); + // TODO(T46487253): Remove after task is closed + FLog.e( + ReactConstants.TAG, + "ReactInstanceManager.createReactContext: mJSIModulePackage " + + (mJSIModulePackage != null ? "not null" : "null")); + if (mJSIModulePackage != null) { catalystInstance.addJSIModules( mJSIModulePackage.getJSIModules( reactContext, catalystInstance.getJavaScriptContextHolder())); + // TODO(T46487253): Remove after task is closed + FLog.e( + ReactConstants.TAG, + "ReactInstanceManager.createReactContext: ReactFeatureFlags.useTurboModules == " + + (ReactFeatureFlags.useTurboModules == false ? "false" : "true")); + if (ReactFeatureFlags.useTurboModules) { JSIModule turboModuleManager = catalystInstance.getJSIModule(JSIModuleType.TurboModuleManager); + + // TODO(T46487253): Remove after task is closed + FLog.e( + ReactConstants.TAG, + "ReactInstanceManager.createReactContext: TurboModuleManager " + + (turboModuleManager == null ? "not created" : "created")); + catalystInstance.setTurboModuleManager(turboModuleManager); TurboModuleRegistry registry = (TurboModuleRegistry) turboModuleManager; diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java index ec4521a5963..44d3cb2b723 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java @@ -581,6 +581,13 @@ public class CatalystInstanceImpl implements CatalystInstance { if (getTurboModuleRegistry() != null) { TurboModule turboModule = getTurboModuleRegistry().getModule(moduleName); + // TODO(T46487253): Remove after task is closed + FLog.e( + ReactConstants.TAG, + "CatalystInstanceImpl.getNativeModule: TurboModule " + + moduleName + + (turboModule == null ? " not" : "") + + " found"); if (turboModule != null) { return (NativeModule) turboModule; }