Remove methods from EmbraceInternalInterface with analogs in Embrace.…

…java

embrace-android-compose/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().logComposeTap(Pair(clickedView.x, clickedView.y), clickedView.tag)
+ Embrace.getInstance().internalInterface?.logComposeTap(Pair(clickedView.x, clickedView.y), clickedView.tag)
  }
  }
  }

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

@@ -117,38 +117,15 @@ public final class io/embrace/android/embracesdk/Embrace$LastRunEndState : java/
 }
 
 public abstract interface class io/embrace/android/embracesdk/EmbraceInternalInterface {
- public abstract fun addBreadcrumb (Ljava/lang/String;)V
- public abstract fun addSessionProperty (Ljava/lang/String;Ljava/lang/String;Z)Z
- public abstract fun addUserPersona (Ljava/lang/String;)V
- public abstract fun clearAllUserPersonas ()V
- public abstract fun clearUserAsPayer ()V
- public abstract fun clearUserEmail ()V
- public abstract fun clearUserIdentifier ()V
- public abstract fun clearUserPersona (Ljava/lang/String;)V
- public abstract fun clearUsername ()V
- public abstract fun endAppStartup (Ljava/util/Map;)V
- public abstract fun endMoment (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
- public abstract fun endSession (Z)V
- public abstract fun endView (Ljava/lang/String;)Z
- public abstract fun getDeviceId ()Ljava/lang/String;
- public abstract fun getSessionProperties ()Ljava/util/Map;
  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 logInternalError (Ljava/lang/String;Ljava/lang/String;)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 removeSessionProperty (Ljava/lang/String;)Z
- public abstract fun setUserAsPayer ()V
- public abstract fun setUserEmail (Ljava/lang/String;)V
- public abstract fun setUserIdentifier (Ljava/lang/String;)V
- public abstract fun setUsername (Ljava/lang/String;)V
- public abstract fun startMoment (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;)V
- public abstract fun startView (Ljava/lang/String;)Z
 }
 
 public final class io/embrace/android/embracesdk/EmbraceSamples {

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

@@ -1072,12 +1072,12 @@ public String generateW3cTraceparent() {
  }
 
  public void recordNetworkRequest(@NonNull EmbraceNetworkRequest request) {
- recordAndDeduplicateNetworkRequest(UUID.randomUUID().toString(), request);
+ if (isStarted() && embraceInternalInterface != null) {
+ embraceInternalInterface.recordAndDeduplicateNetworkRequest(UUID.randomUUID().toString(), request);
+ }
  }
 
  public void recordAndDeduplicateNetworkRequest(@NonNull String callId, @NonNull EmbraceNetworkRequest request) {
- internalEmbraceLogger.logDeveloper("Embrace", "recordNetworkRequest()");
-
  if (request == null) {
  internalEmbraceLogger.logDeveloper("Embrace", "Request is null");
  return;

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

@@ -46,129 +46,6 @@ void logHandledException(@NonNull Throwable throwable,
  @Nullable Map<String, Object> properties,
  @Nullable StackTraceElement[] customStackTrace);
 
- /**
- * {@see Embrace#logBreadcrumb}
- */
- void addBreadcrumb(@NonNull String message);
-
- /**
- * {@see Embrace#getDeviceId}
- */
- @NonNull
- String getDeviceId();
-
- /**
- * {@see Embrace#setUsername}
- */
- void setUsername(@Nullable String username);
-
- /**
- * {@see Embrace#clearUsername}
- */
- void clearUsername();
-
- /**
- * {@see Embrace#setUserIdentifier}
- */
- void setUserIdentifier(@Nullable String userId);
-
- /**
- * {@see Embrace#clearUserIdentifier}
- */
- void clearUserIdentifier();
-
- /**
- * {@see Embrace#setUserEmail}
- */
- void setUserEmail(@Nullable String email);
-
- /**
- * {@see Embrace#clearUserEmail}
- */
- void clearUserEmail();
-
- /**
- * {@see Embrace#setUserAsPayer}
- */
- void setUserAsPayer();
-
- /**
- * {@see Embrace#clearUserAsPayer}
- */
- void clearUserAsPayer();
-
- /**
- * {@see Embrace#addUserPersona}
- */
- void addUserPersona(@NonNull String persona);
-
- /**
- * {@see Embrace#clearUserPersona}
- */
- void clearUserPersona(@NonNull String persona);
-
- /**
- * {@see Embrace#clearAllUserPersonas}
- */
- void clearAllUserPersonas();
-
- /**
- * {@see Embrace#addSessionProperty}
- */
- boolean addSessionProperty(@NonNull String key,
- @NonNull String value,
- boolean permanent);
-
- /**
- * {@see Embrace#removeSessionProperty}
- */
- boolean removeSessionProperty(@NonNull String key);
-
- /**
- * {@see Embrace#getSessionProperties}
- */
- @Nullable
- Map<String, String> getSessionProperties();
-
- /**
- * {@see Embrace#startEvent}
- */
- void startMoment(@NonNull String name,
- @Nullable String identifier,
- @Nullable Map<String, Object> properties);
-
- /**
- * {@see Embrace#endMoment}
- */
- void endMoment(@NonNull String name,
- @Nullable String identifier,
- @Nullable Map<String, Object> properties);
-
- /**
- * {@see Embrace#startFragment}
- */
- boolean startView(@NonNull String name);
-
- /**
- * {@see Embrace#endFragment}
- */
- boolean endView(@NonNull String name);
-
- /**
- * {@see Embrace#endAppStartup}
- */
- void endAppStartup(@NonNull Map<String, Object> properties);
-
- /**
- * {@see Embrace#logInternalError}
- */
- void logInternalError(@Nullable String message, @Nullable String details);
-
- /**
- * {@see Embrace#endSession}
- */
- void endSession(boolean clearUserInfo);
-
  /**
  * See {@link Embrace#recordNetworkRequest(EmbraceNetworkRequest)}
  */

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

@@ -7,11 +7,11 @@ import io.embrace.android.embracesdk.network.http.NetworkCaptureData
 import io.embrace.android.embracesdk.payload.TapBreadcrumb
 
 internal class EmbraceInternalInterfaceImpl(
- private val embrace: EmbraceImpl
+ private val embraceImpl: EmbraceImpl
 ) : EmbraceInternalInterface {
 
  override fun logInfo(message: String, properties: Map<String, Any>?) {
- embrace.logMessage(
+ embraceImpl.logMessage(
  EmbraceEvent.Type.INFO_LOG,
  message,
  properties,
@@ -28,7 +28,7 @@ internal class EmbraceInternalInterfaceImpl(
  properties: Map<String, Any>?,
  stacktrace: String?
  ) {
- embrace.logMessage(
+ embraceImpl.logMessage(
  EmbraceEvent.Type.WARNING_LOG,
  message,
  properties,
@@ -46,7 +46,7 @@ internal class EmbraceInternalInterfaceImpl(
  stacktrace: String?,
  isException: Boolean,
  ) {
- embrace.logMessage(
+ embraceImpl.logMessage(
  EmbraceEvent.Type.ERROR_LOG,
  message,
  properties,
@@ -64,7 +64,7 @@ internal class EmbraceInternalInterfaceImpl(
  properties: Map<String, Any>?,
  customStackTrace: Array<out StackTraceElement>?
  ) {
- embrace.logMessage(
+ embraceImpl.logMessage(
  type.toEventType(),
  throwable.message ?: "",
  properties,
@@ -76,104 +76,8 @@ internal class EmbraceInternalInterfaceImpl(
  )
  }
 
- override fun addBreadcrumb(message: String) {
- embrace.addBreadcrumb(message)
- }
-
- override fun getDeviceId(): String {
- return embrace.deviceId
- }
-
- override fun setUserIdentifier(userId: String?) {
- embrace.setUserIdentifier(userId)
- }
-
- override fun clearUserIdentifier() {
- embrace.clearUserIdentifier()
- }
-
- override fun setUsername(username: String?) {
- embrace.setUsername(username)
- }
-
- override fun clearUsername() {
- embrace.clearUsername()
- }
-
- override fun setUserEmail(email: String?) {
- embrace.setUserEmail(email)
- }
-
- override fun clearUserEmail() {
- embrace.clearUserEmail()
- }
-
- override fun setUserAsPayer() {
- embrace.setUserAsPayer()
- }
-
- override fun clearUserAsPayer() {
- embrace.clearUserAsPayer()
- }
-
- override fun addUserPersona(persona: String) {
- embrace.addUserPersona(persona)
- }
-
- override fun clearUserPersona(persona: String) {
- embrace.clearUserPersona(persona)
- }
-
- override fun clearAllUserPersonas() {
- embrace.clearAllUserPersonas()
- }
-
- override fun addSessionProperty(key: String, value: String, permanent: Boolean): Boolean {
- return embrace.addSessionProperty(key, value, permanent)
- }
-
- override fun removeSessionProperty(key: String): Boolean {
- return embrace.removeSessionProperty(key)
- }
-
- override fun getSessionProperties(): Map<String, String>? {
- return embrace.sessionProperties
- }
-
- override fun startMoment(
- name: String,
- identifier: String?,
- properties: Map<String, Any>?
- ) {
- embrace.startMoment(name, identifier, properties)
- }
-
- override fun endMoment(name: String, identifier: String?, properties: Map<String, Any>?) {
- embrace.endMoment(name, identifier, properties)
- }
-
- override fun startView(name: String): Boolean {
- return embrace.startView(name)
- }
-
- override fun endView(name: String): Boolean {
- return embrace.endView(name)
- }
-
- override fun endAppStartup(properties: Map<String, Any>) {
- embrace.endAppStartup(properties)
- }
-
- override fun logInternalError(message: String?, details: String?) {
- embrace.logInternalError(message, details)
- }
-
- override fun endSession(clearUserInfo: Boolean) {
- embrace.endSession(clearUserInfo)
- }
-
  override fun logComposeTap(point: Pair<Float, Float>, elementName: String) {
- embrace.logTap(point, elementName, TapBreadcrumb.TapBreadcrumbType.TAP)
+ embraceImpl.logTap(point, elementName, TapBreadcrumb.TapBreadcrumbType.TAP)
  }
 
  override fun recordCompletedNetworkRequest(
@@ -187,7 +91,7 @@ internal class EmbraceInternalInterfaceImpl(
  traceId: String?,
  networkCaptureData: NetworkCaptureData?
  ) {
- embrace.recordNetworkRequest(
+ embraceImpl.recordNetworkRequest(
  EmbraceNetworkRequest.fromCompletedRequest(
  url,
  HttpMethod.fromString(httpMethod),
@@ -212,7 +116,7 @@ internal class EmbraceInternalInterfaceImpl(
  traceId: String?,
  networkCaptureData: NetworkCaptureData?
  ) {
- embrace.recordNetworkRequest(
+ embraceImpl.recordNetworkRequest(
  EmbraceNetworkRequest.fromIncompleteRequest(
  url,
  HttpMethod.fromString(httpMethod),
@@ -237,7 +141,7 @@ internal class EmbraceInternalInterfaceImpl(
  traceId: String?,
  networkCaptureData: NetworkCaptureData?
  ) {
- embrace.recordNetworkRequest(
+ embraceImpl.recordNetworkRequest(
  EmbraceNetworkRequest.fromIncompleteRequest(
  url,
  HttpMethod.fromString(httpMethod),
@@ -252,7 +156,10 @@ internal class EmbraceInternalInterfaceImpl(
  )
  }
 
- override fun recordAndDeduplicateNetworkRequest(callId: String, embraceNetworkRequest: EmbraceNetworkRequest) {
- embrace.recordAndDeduplicateNetworkRequest(callId, embraceNetworkRequest)
+ override fun recordAndDeduplicateNetworkRequest(
+ callId: String,
+ embraceNetworkRequest: EmbraceNetworkRequest
+ ) {
+ embraceImpl.recordAndDeduplicateNetworkRequest(callId, embraceNetworkRequest)
  }
 }