Move internal annotations to the annotations package

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

@@ -8,7 +8,7 @@
 import com.google.firebase.messaging.RemoteMessage;
 
 import io.embrace.android.embracesdk.Embrace;
-import io.embrace.android.embracesdk.InternalApi;
+import io.embrace.android.embracesdk.annotation.InternalApi;
 
 @InternalApi
 public final class FirebaseSwazzledHooks {

embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceCustomPathException.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.okhttp3
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import java.io.IOException
 
 /**

embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.kt

@@ -1,7 +1,7 @@
 package io.embrace.android.embracesdk.okhttp3
 
 import io.embrace.android.embracesdk.Embrace
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.embrace.android.embracesdk.internal.network.http.EmbraceHttpPathOverride
 import io.embrace.android.embracesdk.network.EmbraceNetworkRequest
 import io.embrace.android.embracesdk.network.http.HttpMethod

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

@@ -1,7 +1,7 @@
 package io.embrace.android.embracesdk.okhttp3
 
 import io.embrace.android.embracesdk.Embrace
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.embrace.android.embracesdk.internal.clock.Clock
 import io.embrace.android.embracesdk.internal.network.http.EmbraceHttpPathOverride
 import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData

embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/swazzle/callback/okhttp3/OkHttpClient.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import io.embrace.android.embracesdk.InternalApi;
+import io.embrace.android.embracesdk.annotation.InternalApi;
 import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger;
 import io.embrace.android.embracesdk.okhttp3.EmbraceOkHttp3ApplicationInterceptor;
 import io.embrace.android.embracesdk.okhttp3.EmbraceOkHttp3NetworkInterceptor;

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

@@ -1,6 +1,3 @@
-public abstract interface annotation class io/embrace/android/embracesdk/BetaApi : java/lang/annotation/Annotation {
-}
-
 public final class io/embrace/android/embracesdk/BuildConfig {
  public static final field BUILD_TYPE Ljava/lang/String;
  public static final field DEBUG Z
@@ -122,9 +119,6 @@ public final class io/embrace/android/embracesdk/EmbraceSamples {
  public static final fun verifyIntegration ()V
 }
 
-public abstract interface annotation class io/embrace/android/embracesdk/InternalApi : java/lang/annotation/Annotation {
-}
-
 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;
@@ -168,6 +162,12 @@ 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 annotation class io/embrace/android/embracesdk/annotation/BetaApi : java/lang/annotation/Annotation {
+}
+
+public abstract interface annotation class io/embrace/android/embracesdk/annotation/InternalApi : java/lang/annotation/Annotation {
+}
+
 public abstract interface annotation class io/embrace/android/embracesdk/annotation/StartupActivity : java/lang/annotation/Annotation {
 }
 

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

@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 
+import io.embrace.android.embracesdk.annotation.InternalApi;
 import io.embrace.android.embracesdk.config.ConfigService;
 import io.embrace.android.embracesdk.internal.EmbraceInternalInterface;
 import io.embrace.android.embracesdk.logging.InternalEmbraceLogger;

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

@@ -2,6 +2,7 @@ package io.embrace.android.embracesdk
 
 import com.google.gson.annotations.SerializedName
 import io.embrace.android.embracesdk.EmbraceEvent.Type
+import io.embrace.android.embracesdk.annotation.InternalApi
 
 /**
  * Wraps the event [Type]. This class is purely used for backwards-compatibility.

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

@@ -16,6 +16,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 
+import io.embrace.android.embracesdk.annotation.InternalApi;
 import io.embrace.android.embracesdk.anr.AnrService;
 import io.embrace.android.embracesdk.anr.ndk.EmbraceNativeThreadSamplerServiceKt;
 import io.embrace.android.embracesdk.anr.ndk.NativeThreadSamplerInstaller;

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

@@ -1,12 +1,14 @@
 package io.embrace.android.embracesdk
 
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.embrace.android.embracesdk.samples.EmbraceCrashSamples
 
 /**
  * Helps to verify and test embrace SDK integration.
  * it allows users to execute code that automatically verifies the integration by calling the verifyIntegration method.
  * It also provides example code to generate ANR and JVM/NDK crashes
  */
+@InternalApi
 public object EmbraceSamples {
 
  private val embraceCrashSamples = EmbraceCrashSamples

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

@@ -1,5 +1,7 @@
 package io.embrace.android.embracesdk
 
+import io.embrace.android.embracesdk.annotation.InternalApi
+
 /**
  * Enum representing the type of exception that occurred.
  * NONE is for a native android log, whether have or not an exception.

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

@@ -2,6 +2,7 @@
 
 import android.util.Pair;
 
+import io.embrace.android.embracesdk.annotation.InternalApi;
 import io.embrace.android.embracesdk.payload.TapBreadcrumb.TapBreadcrumbType;
 import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger;
 

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

@@ -6,6 +6,8 @@
 
 import androidx.annotation.NonNull;
 
+import io.embrace.android.embracesdk.annotation.InternalApi;
+
 @InternalApi
 public final class WebViewChromeClientSwazzledHooks {
 

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

@@ -1,5 +1,7 @@
 package io.embrace.android.embracesdk;
 
+import io.embrace.android.embracesdk.annotation.InternalApi;
+
 @InternalApi
 public final class WebViewClientSwazzledHooks {
 

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/BetaApi.kt → embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/annotation/BetaApi.kt

@@ -1,4 +1,4 @@
-package io.embrace.android.embracesdk
+package io.embrace.android.embracesdk.annotation
 
 /**
  * Classes and methods marked with this annotation are part of Embrace's Beta API that will only function if the app using it is

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/InternalApi.kt → embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/annotation/InternalApi.kt

@@ -1,4 +1,4 @@
-package io.embrace.android.embracesdk
+package io.embrace.android.embracesdk.annotation
 
 /**
  * Classes and methods marked with this annotation are part of Embrace's Internal API

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/config/behavior/SpansBehavior.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.config.behavior
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.embrace.android.embracesdk.config.remote.SpansRemoteConfig
 
 @InternalApi

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/config/remote/SpansRemoteConfig.kt

@@ -1,7 +1,7 @@
 package io.embrace.android.embracesdk.config.remote
 
 import com.google.gson.annotations.SerializedName
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 
 /**
  * Configuration values for the spans feature

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

@@ -2,8 +2,8 @@ package io.embrace.android.embracesdk.internal
 
 import android.util.Pair
 import io.embrace.android.embracesdk.Embrace
-import io.embrace.android.embracesdk.InternalApi
 import io.embrace.android.embracesdk.LogType
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.embrace.android.embracesdk.internal.network.http.NetworkCaptureData
 import io.embrace.android.embracesdk.network.EmbraceNetworkRequest
 

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

@@ -1,7 +1,7 @@
 package io.embrace.android.embracesdk.internal
 
 import android.os.Trace
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 
 /**
  * Shim to add custom events to system traces if running in the applicable API versions. Basic alternative to using androidx.tracing.

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/clock/Clock.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.internal.clock
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 
 @InternalApi
 public fun interface Clock {

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

@@ -5,8 +5,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import io.embrace.android.embracesdk.InternalApi;
-
 /**
  * Counts the number of bytes written to the output stream, also captures the request body.
  */

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

@@ -7,7 +7,7 @@
 import java.util.Locale;
 import java.util.regex.Pattern;
 
-import io.embrace.android.embracesdk.InternalApi;
+import io.embrace.android.embracesdk.annotation.InternalApi;
 import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger;
 
 @InternalApi

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

@@ -33,7 +33,7 @@
 import javax.net.ssl.SSLSocketFactory;
 
 import io.embrace.android.embracesdk.Embrace;
-import io.embrace.android.embracesdk.InternalApi;
+import io.embrace.android.embracesdk.annotation.InternalApi;
 import io.embrace.android.embracesdk.logging.InternalStaticEmbraceLogger;
 import io.embrace.android.embracesdk.network.EmbraceNetworkRequest;
 import io.embrace.android.embracesdk.network.http.HttpMethod;

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

@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import io.embrace.android.embracesdk.InternalApi;
+import io.embrace.android.embracesdk.annotation.InternalApi;
 
 @InternalApi
 public interface HttpPathOverrideRequest {

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/NetworkCaptureData.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.internal.network.http
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 
 /**
  * The additional data captured if network body capture is enabled for the URL

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanExporter.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.internal.spans
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.sdk.common.CompletableResultCode
 import io.opentelemetry.sdk.trace.data.SpanData

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanProcessor.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.internal.spans
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.opentelemetry.api.trace.Span
 import io.opentelemetry.context.Context
 import io.opentelemetry.sdk.trace.ReadWriteSpan

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/FeatureDisabledSpansService.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.internal.spans
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent
 import io.embrace.android.embracesdk.spans.ErrorCode

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/SpansServiceImpl.kt

@@ -1,7 +1,7 @@
 package io.embrace.android.embracesdk.internal.spans
 
 import io.embrace.android.embracesdk.BuildConfig
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.embrace.android.embracesdk.internal.Systrace
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.spans.EmbraceSpanEvent

embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/utils/ThrowableUtils.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.internal.utils
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 
 /**
  * Utilities to handle edge cases related to working with Throwables

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

@@ -1,7 +1,7 @@
 package io.embrace.android.embracesdk.payload
 
 import com.google.gson.annotations.SerializedName
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.embrace.android.embracesdk.session.EmbraceSessionService
 import io.embrace.android.embracesdk.session.MESSAGE_TYPE_START
 

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

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.spans
 
-import io.embrace.android.embracesdk.BetaApi
+import io.embrace.android.embracesdk.annotation.BetaApi
 
 /**
  * Represents a Span that can be started and stopped with the appropriate [ErrorCode] if applicable. This wraps the OpenTelemetry Span

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

@@ -1,7 +1,7 @@
 package io.embrace.android.embracesdk.spans
 
 import com.google.gson.annotations.SerializedName
-import io.embrace.android.embracesdk.BetaApi
+import io.embrace.android.embracesdk.annotation.BetaApi
 
 /**
  * Represents an Event in an [EmbraceSpan]

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

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.spans
 
-import io.embrace.android.embracesdk.BetaApi
+import io.embrace.android.embracesdk.annotation.BetaApi
 import io.embrace.android.embracesdk.internal.spans.EmbraceAttributes
 
 /**

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

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.spans
 
-import io.embrace.android.embracesdk.BetaApi
+import io.embrace.android.embracesdk.annotation.BetaApi
 
 /**
  * The public API used to add traces to your application. Use [isTracingAvailable] to determine if the SDK is ready log traces. Note that

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

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.utils
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import java.util.concurrent.Callable
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Future

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/concurrency/BlockableExecutorService.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.concurrency
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import org.jetbrains.annotations.TestOnly
 import java.util.concurrent.AbstractExecutorService
 import java.util.concurrent.ConcurrentLinkedQueue

embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/concurrency/BlockingScheduledExecutorService.kt

@@ -1,6 +1,6 @@
 package io.embrace.android.embracesdk.concurrency
 
-import io.embrace.android.embracesdk.InternalApi
+import io.embrace.android.embracesdk.annotation.InternalApi
 import io.embrace.android.embracesdk.fakes.FakeClock
 import java.util.LinkedList
 import java.util.concurrent.AbstractExecutorService