Skip to content

Commit

Permalink
refactor: move internal interfaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@fractalwrench
fractalwrench committed Aug 19, 2024
1 parent 3a03203 commit 4b146d6
Show file tree
Hide file tree
Showing 9 changed files with 92 additions and 93 deletions.
57 changes: 57 additions & 0 deletions embrace-android-api/api/embrace-android-api.api
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
public abstract interface class io/embrace/android/embracesdk/FlutterInternalInterface : io/embrace/android/embracesdk/internal/EmbraceInternalInterface {
public abstract fun logHandledDartException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun logUnhandledDartException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun setDartVersion (Ljava/lang/String;)V
public abstract fun setEmbraceFlutterSdkVersion (Ljava/lang/String;)V
}

public final class io/embrace/android/embracesdk/LogExceptionType : java/lang/Enum {
public static final field HANDLED Lio/embrace/android/embracesdk/LogExceptionType;
public static final field NONE Lio/embrace/android/embracesdk/LogExceptionType;
Expand All @@ -15,6 +22,18 @@ public final class io/embrace/android/embracesdk/LogType : java/lang/Enum {
public static fun values ()[Lio/embrace/android/embracesdk/LogType;
}

public abstract interface class io/embrace/android/embracesdk/ReactNativeInternalInterface : io/embrace/android/embracesdk/internal/EmbraceInternalInterface {
public abstract fun logHandledJsException (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)V
public abstract fun logRnAction (Ljava/lang/String;JJLjava/util/Map;ILjava/lang/String;)V
public abstract fun logRnView (Ljava/lang/String;)V
public abstract fun logUnhandledJsException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun setCacheableJavaScriptBundleUrl (Landroid/content/Context;Ljava/lang/String;Z)V
public abstract fun setJavaScriptBundleUrl (Landroid/content/Context;Ljava/lang/String;)V
public abstract fun setJavaScriptPatchNumber (Ljava/lang/String;)V
public abstract fun setReactNativeSdkVersion (Ljava/lang/String;)V
public abstract fun setReactNativeVersionNumber (Ljava/lang/String;)V
}

public final class io/embrace/android/embracesdk/Severity : java/lang/Enum {
public static final field ERROR Lio/embrace/android/embracesdk/Severity;
public static final field INFO Lio/embrace/android/embracesdk/Severity;
Expand All @@ -23,6 +42,15 @@ public final class io/embrace/android/embracesdk/Severity : java/lang/Enum {
public static fun values ()[Lio/embrace/android/embracesdk/Severity;
}

public abstract interface class io/embrace/android/embracesdk/UnityInternalInterface : io/embrace/android/embracesdk/internal/EmbraceInternalInterface {
public abstract fun installUnityThreadSampler ()V
public abstract fun logHandledUnityException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun logUnhandledUnityException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun recordCompletedNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJJJILjava/lang/String;)V
public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun setUnityMetaData (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
}

public abstract interface annotation class io/embrace/android/embracesdk/annotation/BetaApi : java/lang/annotation/Annotation {
}

Expand All @@ -32,6 +60,28 @@ public abstract interface annotation class io/embrace/android/embracesdk/annotat
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 : io/embrace/android/embracesdk/internal/InternalTracingApi {
public abstract fun getSdkCurrentTime ()J
public abstract fun isAnrCaptureEnabled ()Z
public abstract fun isInternalNetworkCaptureDisabled ()Z
public abstract fun isNdkEnabled ()Z
public abstract fun isNetworkSpanForwardingEnabled ()Z
public abstract fun logComposeTap (Lkotlin/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 logInternalError (Ljava/lang/Throwable;)V
public abstract fun logWarning (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)V
public abstract fun recordCompletedNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJJJILjava/lang/String;Lio/embrace/android/embracesdk/internal/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/internal/network/http/NetworkCaptureData;)V
public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/Throwable;Ljava/lang/String;Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;)V
public abstract fun recordNetworkRequest (Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest;)V
public abstract fun setProcessStartedByNotification ()V
public abstract fun shouldCaptureNetworkBody (Ljava/lang/String;Ljava/lang/String;)Z
public abstract fun stopSdk ()V
}

public abstract interface class io/embrace/android/embracesdk/internal/InternalTracingApi {
public abstract fun addSpanAttribute (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Z
public abstract fun addSpanEvent (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/util/Map;)Z
Expand All @@ -53,6 +103,13 @@ public abstract interface class io/embrace/android/embracesdk/internal/api/Bread
public abstract fun addBreadcrumb (Ljava/lang/String;)V
}

public abstract interface class io/embrace/android/embracesdk/internal/api/InternalInterfaceApi {
public abstract fun getFlutterInternalInterface ()Lio/embrace/android/embracesdk/FlutterInternalInterface;
public abstract fun getInternalInterface ()Lio/embrace/android/embracesdk/internal/EmbraceInternalInterface;
public abstract fun getReactNativeInternalInterface ()Lio/embrace/android/embracesdk/ReactNativeInternalInterface;
public abstract fun getUnityInternalInterface ()Lio/embrace/android/embracesdk/UnityInternalInterface;
}

public abstract interface class io/embrace/android/embracesdk/internal/api/InternalWebViewApi {
public abstract fun logWebView (Ljava/lang/String;)V
public abstract fun trackWebViewPerformance (Ljava/lang/String;Landroid/webkit/ConsoleMessage;)V
Expand Down
35 changes: 34 additions & 1 deletion embrace-android-api/lint-baseline.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.5.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.1)" variant="all" version="8.5.1">
<issues format="6" by="lint 8.5.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.2)" variant="all" version="8.5.2">

<issue
id="DefaultLocale"
Expand All @@ -12,6 +12,17 @@
column="55"/>
</issue>

<issue
id="EmbracePublicApiPackageRule"
message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
errorLine1="public interface FlutterInternalInterface : EmbraceInternalInterface {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/kotlin/io/embrace/android/embracesdk/FlutterInternalInterface.kt"
line="12"
column="18"/>
</issue>

<issue
id="EmbracePublicApiPackageRule"
message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
Expand All @@ -34,6 +45,17 @@
column="19"/>
</issue>

<issue
id="EmbracePublicApiPackageRule"
message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
errorLine1="public interface ReactNativeInternalInterface : EmbraceInternalInterface {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/kotlin/io/embrace/android/embracesdk/ReactNativeInternalInterface.kt"
line="13"
column="18"/>
</issue>

<issue
id="EmbracePublicApiPackageRule"
message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
Expand All @@ -45,6 +67,17 @@
column="13"/>
</issue>

<issue
id="EmbracePublicApiPackageRule"
message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
errorLine1="public interface UnityInternalInterface : EmbraceInternalInterface {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/kotlin/io/embrace/android/embracesdk/UnityInternalInterface.kt"
line="12"
column="18"/>
</issue>

<issue
id="UnknownNullness"
message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
Expand Down
0 ...id/embracesdk/FlutterInternalInterface.kt → ...id/embracesdk/FlutterInternalInterface.kt
View file
File renamed without changes.
0 ...mbracesdk/ReactNativeInternalInterface.kt → ...mbracesdk/ReactNativeInternalInterface.kt
View file
File renamed without changes.
0 ...roid/embracesdk/UnityInternalInterface.kt → ...roid/embracesdk/UnityInternalInterface.kt
View file
File renamed without changes.
1 change: 0 additions & 1 deletion ...esdk/internal/EmbraceInternalInterface.kt → ...esdk/internal/EmbraceInternalInterface.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

package io.embrace.android.embracesdk.internal

import io.embrace.android.embracesdk.Embrace
import io.embrace.android.embracesdk.LogType
import io.embrace.android.embracesdk.annotation.InternalApi
import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData
Expand Down
0 ...esdk/internal/api/InternalInterfaceApi.kt → ...esdk/internal/api/InternalInterfaceApi.kt
View file
File renamed without changes.
57 changes: 0 additions & 57 deletions embrace-android-sdk/api/embrace-android-sdk.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,34 +119,6 @@ public final class io/embrace/android/embracesdk/EmbraceSamples {
public static final fun triggerLongAnr ()V
}

public abstract interface class io/embrace/android/embracesdk/FlutterInternalInterface : io/embrace/android/embracesdk/internal/EmbraceInternalInterface {
public abstract fun logHandledDartException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun logUnhandledDartException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun setDartVersion (Ljava/lang/String;)V
public abstract fun setEmbraceFlutterSdkVersion (Ljava/lang/String;)V
}

public abstract interface class io/embrace/android/embracesdk/ReactNativeInternalInterface : io/embrace/android/embracesdk/internal/EmbraceInternalInterface {
public abstract fun logHandledJsException (Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)V
public abstract fun logRnAction (Ljava/lang/String;JJLjava/util/Map;ILjava/lang/String;)V
public abstract fun logRnView (Ljava/lang/String;)V
public abstract fun logUnhandledJsException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun setCacheableJavaScriptBundleUrl (Landroid/content/Context;Ljava/lang/String;Z)V
public abstract fun setJavaScriptBundleUrl (Landroid/content/Context;Ljava/lang/String;)V
public abstract fun setJavaScriptPatchNumber (Ljava/lang/String;)V
public abstract fun setReactNativeSdkVersion (Ljava/lang/String;)V
public abstract fun setReactNativeVersionNumber (Ljava/lang/String;)V
}

public abstract interface class io/embrace/android/embracesdk/UnityInternalInterface : io/embrace/android/embracesdk/internal/EmbraceInternalInterface {
public abstract fun installUnityThreadSampler ()V
public abstract fun logHandledUnityException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun logUnhandledUnityException (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun recordCompletedNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJJJILjava/lang/String;)V
public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public abstract fun setUnityMetaData (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
}

public final class io/embrace/android/embracesdk/ViewSwazzledHooks {
}

Expand All @@ -166,28 +138,6 @@ public final class io/embrace/android/embracesdk/WebViewClientSwazzledHooks {
public static fun _preOnPageStarted (Landroid/webkit/WebView;Ljava/lang/String;Landroid/graphics/Bitmap;)V
}

public abstract interface class io/embrace/android/embracesdk/internal/EmbraceInternalInterface : io/embrace/android/embracesdk/internal/InternalTracingApi {
public abstract fun getSdkCurrentTime ()J
public abstract fun isAnrCaptureEnabled ()Z
public abstract fun isInternalNetworkCaptureDisabled ()Z
public abstract fun isNdkEnabled ()Z
public abstract fun isNetworkSpanForwardingEnabled ()Z
public abstract fun logComposeTap (Lkotlin/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 logInternalError (Ljava/lang/Throwable;)V
public abstract fun logWarning (Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)V
public abstract fun recordCompletedNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJJJILjava/lang/String;Lio/embrace/android/embracesdk/internal/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/internal/network/http/NetworkCaptureData;)V
public abstract fun recordIncompleteNetworkRequest (Ljava/lang/String;Ljava/lang/String;JJLjava/lang/Throwable;Ljava/lang/String;Lio/embrace/android/embracesdk/internal/network/http/NetworkCaptureData;)V
public abstract fun recordNetworkRequest (Lio/embrace/android/embracesdk/network/EmbraceNetworkRequest;)V
public abstract fun setProcessStartedByNotification ()V
public abstract fun shouldCaptureNetworkBody (Ljava/lang/String;Ljava/lang/String;)Z
public abstract fun stopSdk ()V
}

public abstract interface class io/embrace/android/embracesdk/internal/api/EmbraceAndroidApi {
public abstract fun endView (Ljava/lang/String;)Z
public abstract fun start (Landroid/content/Context;)V
Expand All @@ -197,13 +147,6 @@ public abstract interface class io/embrace/android/embracesdk/internal/api/Embra
public abstract fun startView (Ljava/lang/String;)Z
}

public abstract interface class io/embrace/android/embracesdk/internal/api/InternalInterfaceApi {
public abstract fun getFlutterInternalInterface ()Lio/embrace/android/embracesdk/FlutterInternalInterface;
public abstract fun getInternalInterface ()Lio/embrace/android/embracesdk/internal/EmbraceInternalInterface;
public abstract fun getReactNativeInternalInterface ()Lio/embrace/android/embracesdk/ReactNativeInternalInterface;
public abstract fun getUnityInternalInterface ()Lio/embrace/android/embracesdk/UnityInternalInterface;
}

public abstract interface class io/embrace/android/embracesdk/internal/api/SdkApi : io/embrace/android/embracesdk/internal/api/BreadcrumbApi, io/embrace/android/embracesdk/internal/api/EmbraceAndroidApi, io/embrace/android/embracesdk/internal/api/InternalInterfaceApi, io/embrace/android/embracesdk/internal/api/InternalWebViewApi, io/embrace/android/embracesdk/internal/api/LogsApi, io/embrace/android/embracesdk/internal/api/MomentsApi, io/embrace/android/embracesdk/internal/api/NetworkRequestApi, io/embrace/android/embracesdk/internal/api/OTelApi, io/embrace/android/embracesdk/internal/api/SdkStateApi, io/embrace/android/embracesdk/internal/api/SessionApi, io/embrace/android/embracesdk/internal/api/UserApi, io/embrace/android/embracesdk/spans/TracingApi {
}

Expand Down
35 changes: 1 addition & 34 deletions embrace-android-sdk/lint-baseline.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<issues format="6" by="lint 8.5.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.1)" variant="all" version="8.5.1">
<issues format="6" by="lint 8.5.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.2)" variant="all" version="8.5.2">

<issue
id="EmbracePublicApiPackageRule"
Expand All @@ -12,39 +12,6 @@
column="15"/>
</issue>

<issue
id="EmbracePublicApiPackageRule"
message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
errorLine1="public interface FlutterInternalInterface : EmbraceInternalInterface {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/io/embrace/android/embracesdk/FlutterInternalInterface.kt"
line="12"
column="18"/>
</issue>

<issue
id="EmbracePublicApiPackageRule"
message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
errorLine1="public interface ReactNativeInternalInterface : EmbraceInternalInterface {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/io/embrace/android/embracesdk/ReactNativeInternalInterface.kt"
line="13"
column="18"/>
</issue>

<issue
id="EmbracePublicApiPackageRule"
message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
errorLine1="public interface UnityInternalInterface : EmbraceInternalInterface {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="src/main/java/io/embrace/android/embracesdk/UnityInternalInterface.kt"
line="12"
column="18"/>
</issue>

<issue
id="EmbracePublicApiPackageRule"
message="Don&apos;t put classes in the io.embrace.android.embracesdk package unless they&apos;re part of the public API. Please move the new class to an appropriate package or (if you&apos;re adding to the public API) suppress this error via the lint baseline file."
Expand Down

0 comments on commit 4b146d6

Please sign in to comment.