Convert EmbraceInternalInterface to Kotlin, move to internal package,…

… and make the getter non-null
embrace-io · Oct 21, 2023 · d7da4f2 · d7da4f2
1 parent 12e634f
commit d7da4f2
Show file tree

Hide file tree

Showing 18 changed files with 226 additions and 134 deletions.
diff --git a/...mpose/src/main/java/io/embrace/android/embracesdk/compose/internal/EmbraceNodeIterator.kt b/...mpose/src/main/java/io/embrace/android/embracesdk/compose/internal/EmbraceNodeIterator.kt
@@ -31,7 +31,7 @@ internal class EmbraceNodeIterator {
  backgroundWorker.submit {
  findClickedElement(semanticsNodes, x, y)?.let {
  val clickedView = ClickedView(it, x, y)
- Embrace.getInstance().internalInterface?.logComposeTap(Pair(clickedView.x, clickedView.y), clickedView.tag)
+ Embrace.getInstance().internalInterface.logComposeTap(Pair(clickedView.x, clickedView.y), clickedView.tag)
  }
  }
  }

diff --git a/...src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.java b/...src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.java
@@ -123,7 +123,8 @@ public Response intercept(Chain chain) throws IOException {
  contentLength = 0L;
  }
 
- boolean shouldCaptureNetworkData = embrace.getInternalInterface().shouldCaptureNetworkBody(request.url().toString(), request.method());
+ boolean shouldCaptureNetworkData =
+ embrace.getInternalInterface().shouldCaptureNetworkBody(request.url().toString(), request.method());
 
  if (shouldCaptureNetworkData &&
  ENCODING_GZIP.equalsIgnoreCase(networkResponse.header(CONTENT_ENCODING_HEADER_NAME)) &&

diff --git a/...3/src/test/kotlin/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3InterceptorsTest.kt b/...3/src/test/kotlin/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3InterceptorsTest.kt
@@ -106,8 +106,8 @@ internal class EmbraceOkHttp3InterceptorsTest {
  .header(requestHeaderName, requestHeaderValue)
  capturedEmbraceNetworkRequest = slot()
  every { mockEmbrace.isStarted } answers { isSDKStarted }
- every { mockEmbrace.internalInterface?.shouldCaptureNetworkBody(any(), "POST") } answers { true }
- every { mockEmbrace.internalInterface?.shouldCaptureNetworkBody(any(), "GET") } answers { false }
+ every { mockEmbrace.internalInterface.shouldCaptureNetworkBody(any(), "POST") } answers { true }
+ every { mockEmbrace.internalInterface.shouldCaptureNetworkBody(any(), "GET") } answers { false }
  every { mockEmbrace.recordNetworkRequest(capture(capturedEmbraceNetworkRequest)) } answers { }
  every { mockEmbrace.generateW3cTraceparent() } answers { GENERATED_TRACEPARENT }
  every { mockSdkFacade.isNetworkSpanForwardingEnabled } answers { isNetworkSpanForwardingEnabled }
@@ -185,7 +185,7 @@ internal class EmbraceOkHttp3InterceptorsTest {
  server.enqueue(createBaseMockResponse())
  runGetRequest()
  verify(exactly = 0) { mockSdkFacade.isNetworkSpanForwardingEnabled }
- verify(exactly = 0) { mockEmbrace.internalInterface?.shouldCaptureNetworkBody(any(), any()) }
+ verify(exactly = 0) { mockEmbrace.internalInterface.shouldCaptureNetworkBody(any(), any()) }
  }
 
  @Test

diff --git a/embrace-android-sdk/api/embrace-android-sdk.api b/embrace-android-sdk/api/embrace-android-sdk.api
@@ -37,7 +37,7 @@ public final class io/embrace/android/embracesdk/Embrace : io/embrace/android/em
  public fun getDeviceId ()Ljava/lang/String;
  public fun getFlutterInternalInterface ()Lio/embrace/android/embracesdk/FlutterInternalInterface;
  public static fun getInstance ()Lio/embrace/android/embracesdk/Embrace;
- public fun getInternalInterface ()Lio/embrace/android/embracesdk/EmbraceInternalInterface;
+ public fun getInternalInterface ()Lio/embrace/android/embracesdk/internal/EmbraceInternalInterface;
  public fun getLastRunEndState ()Lio/embrace/android/embracesdk/Embrace$LastRunEndState;
  public fun getReactNativeInternalInterface ()Lio/embrace/android/embracesdk/ReactNativeInternalInterface;
  public fun getSessionProperties ()Ljava/util/Map;
@@ -113,20 +113,6 @@ public final class io/embrace/android/embracesdk/Embrace$LastRunEndState : java/
  public static fun values ()[Lio/embrace/android/embracesdk/Embrace$LastRunEndState;
 }
 
-public abstract interface class io/embrace/android/embracesdk/EmbraceInternalInterface {
- public abstract fun logComposeTap (Landroid/util/Pair;Ljava/lang/String;)V
- public abstract fun logError (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Z)V
- public abstract fun logHandledException (Ljava/lang/Throwable;Lio/embrace/android/embracesdk/LogType;Ljava/util/Map;[Ljava/lang/StackTraceElement;)V
- public abstract fun logInfo (Ljava/lang/String;Ljava/util/Map;)V
- public abstract fun logWarning (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)V
- public abstract fun recordAndDeduplicateNetworkRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest;)V
- public abstract fun recordCompletedNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJJJILjava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)V
- public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)V
- public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/Throwable;Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)V
- public abstract fun setProcessStartedByNotification ()V
- public abstract fun shouldCaptureNetworkBody (Ljava/lang/String;Ljava/lang/String;)Z
-}
-
 public final class io/embrace/android/embracesdk/EmbraceSamples {
  public static final field INSTANCE Lio/embrace/android/embracesdk/EmbraceSamples;
  public static final fun causeNdkIllegalInstruction ()V
@@ -191,6 +177,20 @@ public final class io/embrace/android/embracesdk/WebViewClientSwazzledHooks {
 public abstract interface annotation class io/embrace/android/embracesdk/annotation/StartupActivity : java/lang/annotation/Annotation {
 }
 
+public abstract interface class io/embrace/android/embracesdk/internal/EmbraceInternalInterface {
+ public abstract fun logComposeTap (Landroid/util/Pair;Ljava/lang/String;)V
+ public abstract fun logError (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;Z)V
+ public abstract fun logHandledException (Ljava/lang/Throwable;Lio/embrace/android/embracesdk/LogType;Ljava/util/Map;[Ljava/lang/StackTraceElement;)V
+ public abstract fun logInfo (Ljava/lang/String;Ljava/util/Map;)V
+ public abstract fun logWarning (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)V
+ public abstract fun recordAndDeduplicateNetworkRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest;)V
+ public abstract fun recordCompletedNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJJJILjava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)V
+ public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)V
+ public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/Throwable;Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/NetworkCaptureData;)V
+ public abstract fun setProcessStartedByNotification ()V
+ public abstract fun shouldCaptureNetworkBody (Ljava/lang/String;Ljava/lang/String;)Z
+}
+
 public final class io/embrace/android/embracesdk/network/EmbraceNetworkRequest {
  public static fun fromCompletedRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJJJI)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest;
  public static fun fromCompletedRequest (Ljava/lang/String;Lio/embrace/android/embracesdk/network/http/HttpMethod;JJJJILjava/lang/String;)Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest;

diff --git a/...c/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt b/...c/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/NetworkRequestApiTest.kt
@@ -212,7 +212,7 @@ internal class NetworkRequestApiTest {
  harness.fakeClock.tick(5)
 
  val callId = UUID.randomUUID().toString()
- embrace.internalInterface?.recordAndDeduplicateNetworkRequest(
+ embrace.internalInterface.recordAndDeduplicateNetworkRequest(
  callId,
  EmbraceNetworkRequest.fromCompletedRequest(
  "$URL/bad",
@@ -224,7 +224,7 @@ internal class NetworkRequestApiTest {
  200
  )
  )
- embrace.internalInterface?.recordAndDeduplicateNetworkRequest(
+ embrace.internalInterface.recordAndDeduplicateNetworkRequest(
  callId,
  EmbraceNetworkRequest.fromCompletedRequest(
  URL,

diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/Embrace.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/Embrace.java
@@ -4,7 +4,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.util.Pair;
 import android.webkit.ConsoleMessage;
 
 import androidx.annotation.NonNull;
@@ -14,6 +13,7 @@
 import java.util.Map;
 
 import io.embrace.android.embracesdk.config.ConfigService;
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface;
 import io.embrace.android.embracesdk.logging.InternalEmbraceLogger;
 import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger;
 import io.embrace.android.embracesdk.network.EmbraceNetworkRequest;
@@ -566,7 +566,7 @@ public LastRunEndState getLastRunEndState() {
  return impl.getLastRunEndState();
  }
 
- @Nullable
+ @NonNull
  @InternalApi
  public EmbraceInternalInterface getInternalInterface() {
  return impl.getEmbraceInternalInterface();

diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceImpl.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceImpl.java
@@ -62,6 +62,8 @@
 import io.embrace.android.embracesdk.internal.BuildInfo;
 import io.embrace.android.embracesdk.internal.DeviceArchitecture;
 import io.embrace.android.embracesdk.internal.DeviceArchitectureImpl;
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface;
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterfaceKt;
 import io.embrace.android.embracesdk.internal.MessageType;
 import io.embrace.android.embracesdk.internal.TraceparentGenerator;
 import io.embrace.android.embracesdk.internal.crash.LastRunCrashVerifier;
@@ -1565,9 +1567,14 @@ private Map<String, Object> normalizeProperties(@Nullable Map<String, Object> pr
  * Gets the {@link EmbraceInternalInterface} that should be used as the sole source of
  * communication with other Android SDK modules.
  */
- @Nullable
+ @NonNull
  EmbraceInternalInterface getEmbraceInternalInterface() {
- return embraceInternalInterface;
+ if (isStarted() && embraceInternalInterface != null) {
+ return embraceInternalInterface;
+ } else {
+ return EmbraceInternalInterfaceKt.getDefault();
+ }
+
  }
 
  /**

diff --git a/...ace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterface.java b/...ace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterface.java
diff --git a/...e-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterfaceImpl.kt b/...e-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterfaceImpl.kt
@@ -1,6 +1,7 @@
 package io.embrace.android.embracesdk
 
 import android.util.Pair
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
 import io.embrace.android.embracesdk.network.EmbraceNetworkRequest
 import io.embrace.android.embracesdk.network.http.HttpMethod
 import io.embrace.android.embracesdk.network.http.NetworkCaptureData
@@ -62,7 +63,7 @@ internal class EmbraceInternalInterfaceImpl(
  throwable: Throwable,
  type: LogType,
  properties: Map<String, Any>?,
- customStackTrace: Array<out StackTraceElement>?
+ customStackTrace: Array<StackTraceElement>?
  ) {
  embraceImpl.logMessage(
  type.toEventType(),

diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/FlutterInternalInterface.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/FlutterInternalInterface.kt
@@ -1,5 +1,7 @@
 package io.embrace.android.embracesdk
 
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
+
 /**
  * Provides an internal interface to Embrace that is intended for use by Flutter as its
  * sole source of communication with the Android SDK.

diff --git a/...e-android-sdk/src/main/java/io/embrace/android/embracesdk/FlutterInternalInterfaceImpl.kt b/...e-android-sdk/src/main/java/io/embrace/android/embracesdk/FlutterInternalInterfaceImpl.kt
@@ -1,6 +1,7 @@
 package io.embrace.android.embracesdk
 
 import io.embrace.android.embracesdk.capture.metadata.MetadataService
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
 import io.embrace.android.embracesdk.logging.InternalEmbraceLogger
 
 internal class FlutterInternalInterfaceImpl(

diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/InternalInterfaceModule.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/InternalInterfaceModule.kt
@@ -5,6 +5,7 @@ import io.embrace.android.embracesdk.injection.CoreModule
 import io.embrace.android.embracesdk.injection.CrashModule
 import io.embrace.android.embracesdk.injection.EssentialServiceModule
 import io.embrace.android.embracesdk.injection.singleton
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
 
 internal interface InternalInterfaceModule {
  val embraceInternalInterface: EmbraceInternalInterface

diff --git a/...e-android-sdk/src/main/java/io/embrace/android/embracesdk/ReactNativeInternalInterface.kt b/...e-android-sdk/src/main/java/io/embrace/android/embracesdk/ReactNativeInternalInterface.kt
@@ -1,6 +1,7 @@
 package io.embrace.android.embracesdk
 
 import android.content.Context
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
 
 /**
  * Provides an internal interface to Embrace that is intended for use by React Native as its

diff --git a/...droid-sdk/src/main/java/io/embrace/android/embracesdk/ReactNativeInternalInterfaceImpl.kt b/...droid-sdk/src/main/java/io/embrace/android/embracesdk/ReactNativeInternalInterfaceImpl.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import io.embrace.android.embracesdk.Embrace.AppFramework
 import io.embrace.android.embracesdk.capture.crash.CrashService
 import io.embrace.android.embracesdk.capture.metadata.MetadataService
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
 import io.embrace.android.embracesdk.logging.InternalEmbraceLogger
 import io.embrace.android.embracesdk.payload.JsException
 import io.embrace.android.embracesdk.prefs.PreferencesService

diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/UnityInternalInterface.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/UnityInternalInterface.kt
@@ -1,5 +1,7 @@
 package io.embrace.android.embracesdk
 
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
+
 /**
  * Provides an internal interface to Embrace that is intended for use by Unity as its
  * sole source of communication with the Android SDK.

diff --git a/...ace-android-sdk/src/main/java/io/embrace/android/embracesdk/UnityInternalInterfaceImpl.kt b/...ace-android-sdk/src/main/java/io/embrace/android/embracesdk/UnityInternalInterfaceImpl.kt
@@ -1,5 +1,6 @@
 package io.embrace.android.embracesdk
 
+import io.embrace.android.embracesdk.internal.EmbraceInternalInterface
 import io.embrace.android.embracesdk.logging.InternalEmbraceLogger
 import io.embrace.android.embracesdk.prefs.PreferencesService