Move logger to wrapper

DataDog · Dec 19, 2023 · fe2a49e · fe2a49e
1 parent e4e04b4
commit fe2a49e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/...id/src/main/kotlin/com/datadog/reactnative/sessionreplay/DdSessionReplayImplementation.kt b/...id/src/main/kotlin/com/datadog/reactnative/sessionreplay/DdSessionReplayImplementation.kt
@@ -6,8 +6,6 @@
 
 package com.datadog.reactnative.sessionreplay
 
-import com.datadog.android.Datadog
-import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.sessionreplay.SessionReplayConfiguration
 import com.datadog.android.sessionreplay.SessionReplayPrivacy
 import com.facebook.react.bridge.Promise
@@ -29,11 +27,9 @@ class DdSessionReplayImplementation(
      * @param defaultPrivacyLevel The privacy level used for replay.
      */
     fun enable(replaySampleRate: Double, defaultPrivacyLevel: String, promise: Promise) {
-        val sdkCore = Datadog.getInstance() as FeatureSdkCore
-        val logger = sdkCore.internalLogger
         val configuration = SessionReplayConfiguration.Builder(replaySampleRate.toFloat())
             .setPrivacy(buildPrivacy(defaultPrivacyLevel))
-            .addExtensionSupport(ReactNativeSessionReplayExtensionSupport(logger, reactContext))
+            .addExtensionSupport(ReactNativeSessionReplayExtensionSupport(reactContext))
             .build()
         sessionReplayProvider().enable(configuration)
         promise.resolve(null)

diff --git a/.../kotlin/com/datadog/reactnative/sessionreplay/ReactNativeSessionReplayExtensionSupport.kt b/.../kotlin/com/datadog/reactnative/sessionreplay/ReactNativeSessionReplayExtensionSupport.kt
@@ -23,8 +23,8 @@ import com.facebook.react.views.textinput.ReactEditText
 import com.facebook.react.views.view.ReactViewGroup
 
 internal class ReactNativeSessionReplayExtensionSupport(
-    private val logger: InternalLogger,
     private val reactContext: ReactContext,
+    private val logger: InternalLogger? = SessionReplaySDKWrapper.getLogger()
 ) : ExtensionSupport {
 
     override fun getCustomViewMappers(): Map<SessionReplayPrivacy, Map<Class<*>, WireframeMapper<View, *>>> {
@@ -51,7 +51,7 @@ internal class ReactNativeSessionReplayExtensionSupport(
         return try {
             reactContext.getNativeModule(UIManagerModule::class.java)
         } catch (e: IllegalStateException) {
-            logger.log(
+            logger?.log(
                 level = InternalLogger.Level.WARN,
                 targets = listOf(InternalLogger.Target.MAINTAINER, InternalLogger.Target.TELEMETRY),
                 messageBuilder = { RESOLVE_UIMANAGERMODULE_ERROR },

diff --git a/.../android/src/main/kotlin/com/datadog/reactnative/sessionreplay/SessionReplaySDKWrapper.kt b/.../android/src/main/kotlin/com/datadog/reactnative/sessionreplay/SessionReplaySDKWrapper.kt
@@ -6,6 +6,9 @@
 
 package com.datadog.reactnative.sessionreplay
 
+import com.datadog.android.Datadog
+import com.datadog.android.api.InternalLogger
+import com.datadog.android.api.feature.FeatureSdkCore
 import com.datadog.android.sessionreplay.SessionReplay
 import com.datadog.android.sessionreplay.SessionReplayConfiguration
 
@@ -21,4 +24,10 @@ internal class SessionReplaySDKWrapper : SessionReplayWrapper {
             sessionReplayConfiguration,
         )
     }
+
+    internal companion object {
+        internal fun getLogger(): InternalLogger? {
+            return (Datadog.getInstance() as? FeatureSdkCore)?.internalLogger
+        }
+    }
 }