diff --git a/embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/fcm/swazzle/callback/com/android/fcm/FirebaseSwazzledHooks.java b/embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/fcm/swazzle/callback/com/android/fcm/FirebaseSwazzledHooks.java index 82da2ad05..482500523 100644 --- a/embrace-android-fcm/src/main/java/io/embrace/android/embracesdk/fcm/swazzle/callback/com/android/fcm/FirebaseSwazzledHooks.java +++ b/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 { diff --git a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceCustomPathException.kt b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceCustomPathException.kt index b60c096bd..5622c33cc 100644 --- a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceCustomPathException.kt +++ b/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 /** diff --git a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.kt b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.kt index ef7a5a5a0..4f2bf1014 100644 --- a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3ApplicationInterceptor.kt +++ b/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 diff --git a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.kt b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.kt index 2d1c91d02..0422764d3 100644 --- a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/EmbraceOkHttp3NetworkInterceptor.kt +++ b/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 diff --git a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/swazzle/callback/okhttp3/OkHttpClient.java b/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/swazzle/callback/okhttp3/OkHttpClient.java index 80667d877..98a19ac16 100644 --- a/embrace-android-okhttp3/src/main/java/io/embrace/android/embracesdk/okhttp3/swazzle/callback/okhttp3/OkHttpClient.java +++ b/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; diff --git a/embrace-android-sdk/api/embrace-android-sdk.api b/embrace-android-sdk/api/embrace-android-sdk.api index 797ec2a17..a8ad1a67e 100644 --- a/embrace-android-sdk/api/embrace-android-sdk.api +++ b/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 { } 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 index 5f30fab7e..d95d1521b 100644 --- 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 @@ -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; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceEvent.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceEvent.kt index 4d6c1edbb..3310f1d00 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceEvent.kt +++ b/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. 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 index dd7637103..5e7443219 100644 --- 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 @@ -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; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceSamples.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceSamples.kt index b1139a49d..71ed052a9 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceSamples.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/EmbraceSamples.kt @@ -1,5 +1,6 @@ package io.embrace.android.embracesdk +import io.embrace.android.embracesdk.annotation.InternalApi import io.embrace.android.embracesdk.samples.EmbraceCrashSamples /** @@ -7,6 +8,7 @@ import io.embrace.android.embracesdk.samples.EmbraceCrashSamples * 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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/LogExceptionType.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/LogExceptionType.kt index 47055572f..ea9a5394b 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/LogExceptionType.kt +++ b/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. diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java index 0b0d212ac..1960fd8d5 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/ViewSwazzledHooks.java +++ b/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; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java index a22c5ab2b..4de185973 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewChromeClientSwazzledHooks.java +++ b/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 { diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewClientSwazzledHooks.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewClientSwazzledHooks.java index 566adacf3..b262806f9 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/WebViewClientSwazzledHooks.java +++ b/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 { diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/BetaApi.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/annotation/BetaApi.kt similarity index 91% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/BetaApi.kt rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/annotation/BetaApi.kt index 3343f81a6..473f2fbfd 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/BetaApi.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/InternalApi.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/annotation/InternalApi.kt similarity index 86% rename from embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/InternalApi.kt rename to embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/annotation/InternalApi.kt index 949eb99f9..94cb4e94e 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/InternalApi.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/config/behavior/SpansBehavior.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/config/behavior/SpansBehavior.kt index 7ec0ea4b2..c01a0da9d 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/config/behavior/SpansBehavior.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/config/remote/SpansRemoteConfig.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/config/remote/SpansRemoteConfig.kt index 816a9d297..a011cd11e 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/config/remote/SpansRemoteConfig.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/EmbraceInternalInterface.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/EmbraceInternalInterface.kt index 86f5b3e2e..53e604708 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/EmbraceInternalInterface.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/Systrace.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/Systrace.kt index deb5f7d48..6fd95805a 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/Systrace.kt +++ b/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. diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/clock/Clock.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/clock/Clock.kt index a264abc65..1532a4165 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/clock/Clock.kt +++ b/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 { diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/CountingOutputStream.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/CountingOutputStream.java index 5cddac227..d5eb67e06 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/CountingOutputStream.java +++ b/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. */ diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java index e0f9164cb..64ebcd5f1 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceHttpPathOverride.java +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java index 51225016d..9628c39a7 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/EmbraceUrlConnectionDelegate.java +++ b/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; diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest.java b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest.java index 34634b27d..265c84da3 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/HttpPathOverrideRequest.java +++ b/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 { diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/NetworkCaptureData.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/NetworkCaptureData.kt index 9aec1024f..f7d073b7e 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/network/http/NetworkCaptureData.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanExporter.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanExporter.kt index 34a93fd3a..d1ccc2a39 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanExporter.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanProcessor.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanProcessor.kt index 2de1a2f7d..253250538 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/EmbraceSpanProcessor.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/FeatureDisabledSpansService.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/FeatureDisabledSpansService.kt index 68e92fe8c..dd25f6332 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/FeatureDisabledSpansService.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/SpansServiceImpl.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/SpansServiceImpl.kt index f82155dd4..f2ca6f654 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/spans/SpansServiceImpl.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/utils/ThrowableUtils.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/utils/ThrowableUtils.kt index 39cb85225..5db7872e3 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/utils/ThrowableUtils.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/payload/Session.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/payload/Session.kt index 261589c1f..709c0d607 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/payload/Session.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/EmbraceSpan.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/EmbraceSpan.kt index 041ff5d06..651456479 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/EmbraceSpan.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/EmbraceSpanEvent.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/EmbraceSpanEvent.kt index 7533372cf..b1adf93e9 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/EmbraceSpanEvent.kt +++ b/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] diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/ErrorCode.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/ErrorCode.kt index b30173255..3db786c8c 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/ErrorCode.kt +++ b/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 /** diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/TracingApi.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/TracingApi.kt index 989a004f6..97a432eb1 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/spans/TracingApi.kt +++ b/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 diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/utils/ExecutorServiceExtensions.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/utils/ExecutorServiceExtensions.kt index 2c485564b..5e4e933aa 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/utils/ExecutorServiceExtensions.kt +++ b/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 diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/concurrency/BlockableExecutorService.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/concurrency/BlockableExecutorService.kt index 0c529125e..eb133fdd9 100644 --- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/concurrency/BlockableExecutorService.kt +++ b/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 diff --git a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/concurrency/BlockingScheduledExecutorService.kt b/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/concurrency/BlockingScheduledExecutorService.kt index 1874f166b..d496ef013 100644 --- a/embrace-android-sdk/src/test/java/io/embrace/android/embracesdk/concurrency/BlockingScheduledExecutorService.kt +++ b/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