Move methods internal to the SDK required by other modules to interna…

…l interface

embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/fcm/swazzle/callback/com/android/fcm/FirebaseSwazzledHooks.java

@@ -32,7 +32,7 @@ public static void _onMessageReceived(@NonNull RemoteMessage message) {
  private static void handleRemoteMessage(@NonNull RemoteMessage message) {
  try {
  //flag process is already running to avoid track warm startup
- Embrace.getInstance().setProcessStartedByNotification();
+ Embrace.getInstance().getInternalInterface().setProcessStartedByNotification();
 
  String messageId = null;
  try {

embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.java

@@ -123,7 +123,7 @@ public Response intercept(Chain chain) throws IOException {
  contentLength = 0L;
  }
 
- boolean shouldCaptureNetworkData = embrace.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)) &&

embrace-android-okhttp3/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.shouldCaptureNetworkBody(any(), "POST") } answers { true }
- every { mockEmbrace.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.shouldCaptureNetworkBody(any(), any()) }
+ verify(exactly = 0) { mockEmbrace.internalInterface?.shouldCaptureNetworkBody(any(), any()) }
  }
 
  @Test

embrace-android-sdk/api/embrace-android-sdk.api

@@ -45,7 +45,6 @@ public final class io/embrace/android/embracesdk/Embrace : io/embrace/android/em
  public fun getUnityInternalInterface ()Lio/embrace/android/embracesdk/UnityInternalInterface;
  public fun isStarted ()Z
  public fun isTracingAvailable ()Z
- public fun logComposeTap (Landroid/util/Pair;Ljava/lang/String;)V
  public fun logCustomStacktrace ([Ljava/lang/StackTraceElement;)V
  public fun logCustomStacktrace ([Ljava/lang/StackTraceElement;Lio/embrace/android/embracesdk/Severity;)V
  public fun logCustomStacktrace ([Ljava/lang/StackTraceElement;Lio/embrace/android/embracesdk/Severity;Ljava/util/Map;)V
@@ -80,12 +79,10 @@ public final class io/embrace/android/embracesdk/Embrace : io/embrace/android/em
  public fun setAppId (Ljava/lang/String;)Z
  public fun setDartVersion (Ljava/lang/String;)V
  public fun setEmbraceFlutterSdkVersion (Ljava/lang/String;)V
- public fun setProcessStartedByNotification ()V
  public fun setUserAsPayer ()V
  public fun setUserEmail (Ljava/lang/String;)V
  public fun setUserIdentifier (Ljava/lang/String;)V
  public fun setUsername (Ljava/lang/String;)V
- public fun shouldCaptureNetworkBody (Ljava/lang/String;Ljava/lang/String;)Z
  public fun start (Landroid/content/Context;)V
  public fun start (Landroid/content/Context;Z)V
  public fun start (Landroid/content/Context;ZLio/embrace/android/embracesdk/Embrace$AppFramework;)V
@@ -126,6 +123,8 @@ public abstract interface class io/embrace/android/embracesdk/EmbraceInternalInt
  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 {

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/Embrace.java

@@ -566,15 +566,10 @@ public LastRunEndState getLastRunEndState() {
  return impl.getLastRunEndState();
  }
 
- /**
- * Logs a React Native Redux Action - this is not intended for public use.
- */
+ @Nullable
  @InternalApi
- public void logRnAction(@NonNull String name, long startTime, long endTime,
- @NonNull Map<String, Object> properties, int bytesSent, @NonNull String output) {
- if (verifyNonNullParameters("logRnAction", name, properties, output)) {
- impl.logRnAction(name, startTime, endTime, properties, bytesSent, output);
- }
+ public EmbraceInternalInterface getInternalInterface() {
+ return impl.getEmbraceInternalInterface();
  }
 
  /**
@@ -593,36 +588,12 @@ public void logInternalError(@NonNull Throwable error) {
  impl.logInternalError(error);
  }
 
- /**
- * Logs the fact that a particular view was entered.
- * <p>
- * If the previously logged view has the same name, a duplicate view breadcrumb will not be
- * logged.
- *
- * @param screen the name of the view to log
- */
- @InternalApi
- public void logRnView(@NonNull String screen) {
- impl.logRnView(screen);
- }
-
  @Nullable
  @InternalApi
  public ConfigService getConfigService() {
  return impl.getConfigService();
  }
 
- @InternalApi
- void installUnityThreadSampler() {
- getImpl().installUnityThreadSampler();
- }
-
- @Nullable
- @InternalApi
- public EmbraceInternalInterface getInternalInterface() {
- return impl.getEmbraceInternalInterface();
- }
-
  /**
  * Gets the {@link ReactNativeInternalInterface} that should be used as the sole source of
  * communication with the Android SDK for React Native.
@@ -633,6 +604,30 @@ public ReactNativeInternalInterface getReactNativeInternalInterface() {
  return impl.getReactNativeInternalInterface();
  }
 
+ /**
+ * Logs a React Native Redux Action - this is not intended for public use.
+ */
+ @InternalApi
+ public void logRnAction(@NonNull String name, long startTime, long endTime,
+ @NonNull Map<String, Object> properties, int bytesSent, @NonNull String output) {
+ if (verifyNonNullParameters("logRnAction", name, properties, output)) {
+ impl.logRnAction(name, startTime, endTime, properties, bytesSent, output);
+ }
+ }
+
+ /**
+ * Logs the fact that a particular view was entered.
+ * <p>
+ * If the previously logged view has the same name, a duplicate view breadcrumb will not be
+ * logged.
+ *
+ * @param screen the name of the view to log
+ */
+ @InternalApi
+ public void logRnView(@NonNull String screen) {
+ impl.logRnView(screen);
+ }
+
  /**
  * Gets the {@link UnityInternalInterface} that should be used as the sole source of
  * communication with the Android SDK for Unity.
@@ -643,6 +638,11 @@ public UnityInternalInterface getUnityInternalInterface() {
  return impl.getUnityInternalInterface();
  }
 
+ @InternalApi
+ void installUnityThreadSampler() {
+ getImpl().installUnityThreadSampler();
+ }
+
  /**
  * Gets the {@link FlutterInternalInterface} that should be used as the sole source of
  * communication with the Android SDK for Flutter.
@@ -702,41 +702,6 @@ public void sampleCurrentThreadDuringAnrs() {
  impl.sampleCurrentThreadDuringAnrs();
  }
 
- /**
- * Determine if a network call should be captured based on the network capture rules
- *
- * @param url the url of the network call
- * @param method the method of the network call
- * @return the network capture rule to apply or null
- */
- @InternalApi
- public boolean shouldCaptureNetworkBody(@NonNull String url, @NonNull String method) {
- if (isStarted()) {
- return impl.shouldCaptureNetworkCall(url, method);
- } else {
- internalEmbraceLogger.logSDKNotInitialized("Embrace SDK is not initialized yet, cannot check for capture rules.");
- return false;
- }
- }
-
- @InternalApi
- public void setProcessStartedByNotification() {
- impl.setProcessStartedByNotification();
- }
-
- /**
- * Logs taps from Compose views
- *
- * @param point Position of the captured clicked
- * @param elementName Name of the clicked element
- */
- @InternalApi
- public void logComposeTap(@NonNull Pair<Float, Float> point, @NonNull String elementName) {
- if (isStarted()) {
- impl.getEmbraceInternalInterface().logComposeTap(point, elementName);
- }
- }
-
  private boolean verifyNonNullParameters(@NonNull String functionName, @NonNull Object... params) {
  for (Object param : params) {
  if (param == null) {

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceImpl.java

@@ -1662,8 +1662,13 @@ private void onActivityReported() {
  }
  }
 
- public boolean shouldCaptureNetworkCall(String url, String method) {
- return !networkCaptureService.getNetworkCaptureRules(url, method).isEmpty();
+ public boolean shouldCaptureNetworkCall(@NonNull String url, @NonNull String method) {
+ if (isStarted() && networkCaptureService != null) {
+ return !networkCaptureService.getNetworkCaptureRules(url, method).isEmpty();
+ } else {
+ internalEmbraceLogger.logSDKNotInitialized("Embrace SDK is not initialized yet, cannot check for capture rules.");
+ return false;
+ }
  }
 
  public void setProcessStartedByNotification() {

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterface.java

@@ -99,4 +99,8 @@ void recordAndDeduplicateNetworkRequest(@NonNull String callId,
  * @param elementName the name of the element which was tapped
  */
  void logComposeTap(@NonNull Pair<Float, Float> point, @NonNull String elementName);
+
+ boolean shouldCaptureNetworkBody(@NonNull String url, @NonNull String method);
+
+ void setProcessStartedByNotification();
 }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceInternalInterfaceImpl.kt

@@ -162,4 +162,17 @@ internal class EmbraceInternalInterfaceImpl(
  ) {
  embraceImpl.recordAndDeduplicateNetworkRequest(callId, embraceNetworkRequest)
  }
+
+ /**
+ * Determine if a network call should be captured based on the network capture rules
+ *
+ * @param url the url of the network call
+ * @param method the method of the network call
+ * @return the network capture rule to apply or null
+ */
+ override fun shouldCaptureNetworkBody(url: String, method: String): Boolean = embraceImpl.shouldCaptureNetworkCall(url, method)
+
+ override fun setProcessStartedByNotification() {
+ embraceImpl.setProcessStartedByNotification()
+ }
 }

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/network/http/EmbraceUrlConnectionOverride.java

@@ -823,7 +823,7 @@ private boolean hasNetworkCaptureRules() {
  String url = this.connection.getURL().toString();
  String method = this.connection.getRequestMethod();
 
- return embrace.shouldCaptureNetworkBody(url, method);
+ return embrace.getInternalInterface().shouldCaptureNetworkBody(url, method);
  }
 
  /**

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/network/http/EmbraceUrlConnectionOverrideTest.kt

@@ -44,7 +44,6 @@ internal class EmbraceUrlConnectionOverrideTest {
  mockEmbrace = mockk(relaxed = true)
  every { mockEmbrace.internalInterface } answers { mockInternalInterface }
  shouldCaptureNetworkBody = false
- every { mockEmbrace.shouldCaptureNetworkBody(any(), any()) } answers { shouldCaptureNetworkBody }
  capturedCallId = mutableListOf()
  capturedEmbraceNetworkRequest = slot()
  remoteNetworkSpanForwardingConfig = NetworkSpanForwardingRemoteConfig(pctEnabled = 0f)
@@ -54,6 +53,7 @@ internal class EmbraceUrlConnectionOverrideTest {
  )
  )
  mockInternalInterface = mockk(relaxed = true)
+ every { mockInternalInterface.shouldCaptureNetworkBody(any(), any()) } answers { shouldCaptureNetworkBody }
  every {
  mockInternalInterface.recordAndDeduplicateNetworkRequest(capture(capturedCallId), capture(capturedEmbraceNetworkRequest))
  } answers { }