From 6fa883bbc8ce1977873358a3f3c58e8369d6f5af Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Mon, 23 May 2022 18:39:50 +0200 Subject: [PATCH] Move Hint one package up into io.sentry --- .../api/sentry-android-core.api | 2 +- .../core/ActivityLifecycleIntegration.java | 2 +- .../AppComponentsBreadcrumbsIntegration.java | 2 +- .../core/DefaultAndroidEventProcessor.java | 2 +- .../android/core/EnvelopeFileObserver.java | 2 +- .../PerformanceAndroidEventProcessor.java | 2 +- .../core/ScreenshotEventProcessor.java | 2 +- .../SystemEventsBreadcrumbsIntegration.java | 2 +- .../TempSensorBreadcrumbsIntegration.java | 2 +- .../gestures/SentryGestureListener.java | 2 +- .../core/DefaultAndroidEventProcessorTest.kt | 2 +- .../PerformanceAndroidEventProcessorTest.kt | 2 +- .../core/ScreenshotEventProcessorTest.kt | 2 +- .../SentryFragmentLifecycleCallbacks.kt | 2 +- .../android/okhttp/SentryOkHttpInterceptor.kt | 2 +- .../api/sentry-apache-http-client-5.api | 2 +- .../apache/ApacheHttpClientTransport.java | 2 +- .../sentry/apollo/SentryApolloInterceptor.kt | 2 +- .../SentryDataFetcherExceptionHandler.java | 2 +- .../java/io/sentry/jul/SentryHandler.java | 2 +- .../java/io/sentry/log4j2/SentryAppender.java | 2 +- .../io/sentry/logback/SentryAppender.java | 2 +- .../sentry/openfeign/SentryFeignClient.java | 2 +- .../java/io/sentry/samples/console/Main.java | 2 +- .../spring/boot/CustomEventProcessor.java | 2 +- ...tryRequestHttpServletRequestProcessor.java | 2 +- .../jakarta/SentryServletRequestListener.java | 2 +- ...yRequestHttpServletRequestProcessorTest.kt | 2 +- ...tryRequestHttpServletRequestProcessor.java | 2 +- .../servlet/SentryServletRequestListener.java | 2 +- ...yRequestHttpServletRequestProcessorTest.kt | 2 +- .../boot/SentryAutoConfigurationTest.kt | 2 +- sentry-spring/api/sentry-spring.api | 2 +- .../spring/SentryExceptionResolver.java | 2 +- ...tryRequestHttpServletRequestProcessor.java | 2 +- .../io/sentry/spring/SentrySpringFilter.java | 2 +- ...entrySpanClientHttpRequestInterceptor.java | 2 +- .../SentrySpanClientWebRequestFilter.java | 2 +- .../webflux/SentryWebExceptionHandler.java | 2 +- .../spring/webflux/SentryWebFilter.java | 2 +- ...yRequestHttpServletRequestProcessorTest.kt | 2 +- sentry/api/sentry.api | 166 +++++++++--------- .../java/io/sentry/DirectoryProcessor.java | 1 - ...DuplicateEventDetectionEventProcessor.java | 1 - .../main/java/io/sentry/EnvelopeSender.java | 1 - .../main/java/io/sentry/EventProcessor.java | 1 - .../main/java/io/sentry/{hints => }/Hint.java | 3 +- sentry/src/main/java/io/sentry/Hub.java | 1 - .../src/main/java/io/sentry/HubAdapter.java | 1 - .../main/java/io/sentry/IEnvelopeSender.java | 1 - sentry/src/main/java/io/sentry/IHub.java | 1 - .../main/java/io/sentry/ISentryClient.java | 1 - .../java/io/sentry/MainEventProcessor.java | 1 - sentry/src/main/java/io/sentry/NoOpHub.java | 1 - .../main/java/io/sentry/NoOpSentryClient.java | 1 - .../src/main/java/io/sentry/OutboxSender.java | 1 - sentry/src/main/java/io/sentry/Scope.java | 1 - sentry/src/main/java/io/sentry/Sentry.java | 1 - .../src/main/java/io/sentry/SentryClient.java | 1 - .../main/java/io/sentry/SentryOptions.java | 1 - .../sentry/SentryRuntimeEventProcessor.java | 1 - .../UncaughtExceptionHandlerIntegration.java | 1 - .../java/io/sentry/cache/EnvelopeCache.java | 2 +- .../java/io/sentry/cache/IEnvelopeCache.java | 2 +- .../sentry/transport/AsyncHttpTransport.java | 2 +- .../java/io/sentry/transport/ITransport.java | 2 +- .../sentry/transport/NoOpEnvelopeCache.java | 2 +- .../io/sentry/transport/NoOpTransport.java | 2 +- .../java/io/sentry/transport/RateLimiter.java | 2 +- .../io/sentry/transport/StdoutTransport.java | 2 +- .../main/java/io/sentry/util/HintUtils.java | 2 +- .../java/io/sentry/CustomEventProcessor.kt | 2 - ...plicateEventDetectionEventProcessorTest.kt | 1 - .../test/java/io/sentry/EnvelopeSenderTest.kt | 1 - sentry/src/test/java/io/sentry/HubTest.kt | 1 - .../java/io/sentry/MainEventProcessorTest.kt | 1 - sentry/src/test/java/io/sentry/NoOpHubTest.kt | 1 - sentry/src/test/java/io/sentry/ScopeTest.kt | 1 - .../test/java/io/sentry/SentryClientTest.kt | 1 - .../sentry/clientreport/ClientReportTest.kt | 2 +- .../src/test/java/io/sentry/hints/HintTest.kt | 1 + .../io/sentry/transport/RateLimiterTest.kt | 2 +- .../test/java/io/sentry/util/HintUtilsTest.kt | 2 +- 83 files changed, 138 insertions(+), 166 deletions(-) rename sentry/src/main/java/io/sentry/{hints => }/Hint.java (98%) diff --git a/sentry-android-core/api/sentry-android-core.api b/sentry-android-core/api/sentry-android-core.api index 60279e1e6dc..f326074de5c 100644 --- a/sentry-android-core/api/sentry-android-core.api +++ b/sentry-android-core/api/sentry-android-core.api @@ -110,7 +110,7 @@ public final class io/sentry/android/core/ScreenshotEventProcessor : android/app public fun onActivitySaveInstanceState (Landroid/app/Activity;Landroid/os/Bundle;)V public fun onActivityStarted (Landroid/app/Activity;)V public fun onActivityStopped (Landroid/app/Activity;)V - public fun process (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/SentryEvent; + public fun process (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent; } public final class io/sentry/android/core/SentryAndroid { diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java index 1e183e5a960..86b0c089ed8 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java @@ -11,6 +11,7 @@ import android.os.Bundle; import android.os.Process; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.ISpan; import io.sentry.ITransaction; @@ -19,7 +20,6 @@ import io.sentry.SentryLevel; import io.sentry.SentryOptions; import io.sentry.SpanStatus; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java index 5c1b186b4e0..088bf1505a2 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java @@ -6,12 +6,12 @@ import android.content.Context; import android.content.res.Configuration; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.Integration; import io.sentry.SentryLevel; import io.sentry.SentryOptions; import io.sentry.android.core.internal.util.DeviceOrientations; -import io.sentry.hints.Hint; import io.sentry.protocol.Device; import io.sentry.util.Objects; import java.io.Closeable; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java index c20fe06a4f6..3575aea7854 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java @@ -22,6 +22,7 @@ import android.util.DisplayMetrics; import io.sentry.DateUtils; import io.sentry.EventProcessor; +import io.sentry.Hint; import io.sentry.ILogger; import io.sentry.SentryBaseEvent; import io.sentry.SentryEvent; @@ -30,7 +31,6 @@ import io.sentry.android.core.internal.util.DeviceOrientations; import io.sentry.android.core.internal.util.MainThreadChecker; import io.sentry.android.core.internal.util.RootChecker; -import io.sentry.hints.Hint; import io.sentry.protocol.App; import io.sentry.protocol.Device; import io.sentry.protocol.OperatingSystem; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserver.java b/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserver.java index 2723b798db9..4a3dc7a1786 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserver.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserver.java @@ -3,13 +3,13 @@ import static io.sentry.SentryLevel.ERROR; import android.os.FileObserver; +import io.sentry.Hint; import io.sentry.IEnvelopeSender; import io.sentry.ILogger; import io.sentry.SentryLevel; import io.sentry.hints.ApplyScopeData; import io.sentry.hints.Cached; import io.sentry.hints.Flushable; -import io.sentry.hints.Hint; import io.sentry.hints.Resettable; import io.sentry.hints.Retryable; import io.sentry.hints.SubmissionResult; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/PerformanceAndroidEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/PerformanceAndroidEventProcessor.java index ae2dffc3b02..9c09d24f87d 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/PerformanceAndroidEventProcessor.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/PerformanceAndroidEventProcessor.java @@ -5,9 +5,9 @@ import static io.sentry.android.core.ActivityLifecycleIntegration.UI_LOAD_OP; import io.sentry.EventProcessor; +import io.sentry.Hint; import io.sentry.SentryEvent; import io.sentry.SpanContext; -import io.sentry.hints.Hint; import io.sentry.protocol.MeasurementValue; import io.sentry.protocol.SentryId; import io.sentry.protocol.SentrySpan; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ScreenshotEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/ScreenshotEventProcessor.java index 0583235a4af..cf7edb46912 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/ScreenshotEventProcessor.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/ScreenshotEventProcessor.java @@ -14,9 +14,9 @@ import androidx.annotation.Nullable; import io.sentry.Attachment; import io.sentry.EventProcessor; +import io.sentry.Hint; import io.sentry.SentryEvent; import io.sentry.SentryLevel; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import java.io.ByteArrayOutputStream; import java.io.Closeable; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java index 36b38b82663..b4ee214fcce 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java @@ -38,12 +38,12 @@ import android.content.IntentFilter; import android.os.Bundle; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.ILogger; import io.sentry.Integration; import io.sentry.SentryLevel; import io.sentry.SentryOptions; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import io.sentry.util.StringUtils; import java.io.Closeable; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/TempSensorBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/TempSensorBreadcrumbsIntegration.java index edf8183abde..49014c1fecd 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/TempSensorBreadcrumbsIntegration.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/TempSensorBreadcrumbsIntegration.java @@ -9,11 +9,11 @@ import android.hardware.SensorEventListener; import android.hardware.SensorManager; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.Integration; import io.sentry.SentryLevel; import io.sentry.SentryOptions; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import java.io.Closeable; import java.io.IOException; diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java index 6e3ca29f648..d01db42ef9a 100644 --- a/sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java +++ b/sentry-android-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java @@ -10,13 +10,13 @@ import android.view.View; import android.view.Window; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.ITransaction; import io.sentry.Scope; import io.sentry.SentryLevel; import io.sentry.SpanStatus; import io.sentry.android.core.SentryAndroidOptions; -import io.sentry.hints.Hint; import java.lang.ref.WeakReference; import java.util.Collections; import java.util.Map; diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt index a1cde833be8..095c2e84882 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt @@ -12,6 +12,7 @@ import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever import io.sentry.DiagnosticLogger +import io.sentry.Hint import io.sentry.ILogger import io.sentry.SentryEvent import io.sentry.SentryLevel @@ -22,7 +23,6 @@ import io.sentry.android.core.DefaultAndroidEventProcessor.EMULATOR import io.sentry.android.core.DefaultAndroidEventProcessor.KERNEL_VERSION import io.sentry.android.core.DefaultAndroidEventProcessor.ROOTED import io.sentry.android.core.DefaultAndroidEventProcessor.SIDE_LOADED -import io.sentry.hints.Hint import io.sentry.protocol.OperatingSystem import io.sentry.protocol.SdkVersion import io.sentry.protocol.SentryThread diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/PerformanceAndroidEventProcessorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/PerformanceAndroidEventProcessorTest.kt index fda61660d1e..30a78d411d5 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/PerformanceAndroidEventProcessorTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/PerformanceAndroidEventProcessorTest.kt @@ -3,11 +3,11 @@ package io.sentry.android.core import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.whenever +import io.sentry.Hint import io.sentry.IHub import io.sentry.SentryTracer import io.sentry.TransactionContext import io.sentry.android.core.ActivityLifecycleIntegration.UI_LOAD_OP -import io.sentry.hints.Hint import io.sentry.protocol.MeasurementValue import io.sentry.protocol.SentryTransaction import java.util.Date diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ScreenshotEventProcessorTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ScreenshotEventProcessorTest.kt index 4665eacf0ff..d57c510300b 100644 --- a/sentry-android-core/src/test/java/io/sentry/android/core/ScreenshotEventProcessorTest.kt +++ b/sentry-android-core/src/test/java/io/sentry/android/core/ScreenshotEventProcessorTest.kt @@ -11,10 +11,10 @@ import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever import io.sentry.Attachment +import io.sentry.Hint import io.sentry.MainEventProcessor import io.sentry.SentryEvent import io.sentry.TypeCheckHint.ANDROID_ACTIVITY -import io.sentry.hints.Hint import org.junit.runner.RunWith import kotlin.test.BeforeTest import kotlin.test.Test diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt index edd4e29e613..dcc1b116a86 100644 --- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt +++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt @@ -7,13 +7,13 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks import io.sentry.Breadcrumb +import io.sentry.Hint import io.sentry.HubAdapter import io.sentry.IHub import io.sentry.ISpan import io.sentry.SentryLevel.INFO import io.sentry.SpanStatus import io.sentry.TypeCheckHint.ANDROID_FRAGMENT -import io.sentry.hints.Hint import java.util.WeakHashMap @Suppress("TooManyFunctions") diff --git a/sentry-android-okhttp/src/main/java/io/sentry/android/okhttp/SentryOkHttpInterceptor.kt b/sentry-android-okhttp/src/main/java/io/sentry/android/okhttp/SentryOkHttpInterceptor.kt index 10c7f4b2bb8..9228ca0a529 100644 --- a/sentry-android-okhttp/src/main/java/io/sentry/android/okhttp/SentryOkHttpInterceptor.kt +++ b/sentry-android-okhttp/src/main/java/io/sentry/android/okhttp/SentryOkHttpInterceptor.kt @@ -1,6 +1,7 @@ package io.sentry.android.okhttp import io.sentry.Breadcrumb +import io.sentry.Hint import io.sentry.HubAdapter import io.sentry.IHub import io.sentry.ISpan @@ -8,7 +9,6 @@ import io.sentry.SpanStatus import io.sentry.TracingOrigins import io.sentry.TypeCheckHint.OKHTTP_REQUEST import io.sentry.TypeCheckHint.OKHTTP_RESPONSE -import io.sentry.hints.Hint import okhttp3.Interceptor import okhttp3.Request import okhttp3.Response diff --git a/sentry-apache-http-client-5/api/sentry-apache-http-client-5.api b/sentry-apache-http-client-5/api/sentry-apache-http-client-5.api index b7ec1ca4a7d..7d7479c9fd3 100644 --- a/sentry-apache-http-client-5/api/sentry-apache-http-client-5.api +++ b/sentry-apache-http-client-5/api/sentry-apache-http-client-5.api @@ -2,7 +2,7 @@ public final class io/sentry/transport/apache/ApacheHttpClientTransport : io/sen public fun (Lio/sentry/SentryOptions;Lio/sentry/RequestDetails;Lorg/apache/hc/client5/http/impl/async/CloseableHttpAsyncClient;Lio/sentry/transport/RateLimiter;)V public fun close ()V public fun flush (J)V - public fun send (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)V + public fun send (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V } public final class io/sentry/transport/apache/ApacheHttpClientTransportFactory : io/sentry/ITransportFactory { diff --git a/sentry-apache-http-client-5/src/main/java/io/sentry/transport/apache/ApacheHttpClientTransport.java b/sentry-apache-http-client-5/src/main/java/io/sentry/transport/apache/ApacheHttpClientTransport.java index 0dee7688ed3..d157d400684 100644 --- a/sentry-apache-http-client-5/src/main/java/io/sentry/transport/apache/ApacheHttpClientTransport.java +++ b/sentry-apache-http-client-5/src/main/java/io/sentry/transport/apache/ApacheHttpClientTransport.java @@ -2,12 +2,12 @@ import static io.sentry.SentryLevel.*; +import io.sentry.Hint; import io.sentry.RequestDetails; import io.sentry.SentryEnvelope; import io.sentry.SentryLevel; import io.sentry.SentryOptions; import io.sentry.clientreport.DiscardReason; -import io.sentry.hints.Hint; import io.sentry.hints.Retryable; import io.sentry.transport.ITransport; import io.sentry.transport.RateLimiter; diff --git a/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt b/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt index 63ef1209dc9..c286a945787 100644 --- a/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt +++ b/sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt @@ -12,6 +12,7 @@ import com.apollographql.apollo.interceptor.ApolloInterceptor.InterceptorRequest import com.apollographql.apollo.interceptor.ApolloInterceptor.InterceptorResponse import com.apollographql.apollo.interceptor.ApolloInterceptorChain import io.sentry.Breadcrumb +import io.sentry.Hint import io.sentry.HubAdapter import io.sentry.IHub import io.sentry.ISpan @@ -19,7 +20,6 @@ import io.sentry.SentryLevel import io.sentry.SpanStatus import io.sentry.TypeCheckHint.APOLLO_REQUEST import io.sentry.TypeCheckHint.APOLLO_RESPONSE -import io.sentry.hints.Hint import java.util.concurrent.Executor class SentryApolloInterceptor( diff --git a/sentry-graphql/src/main/java/io/sentry/graphql/SentryDataFetcherExceptionHandler.java b/sentry-graphql/src/main/java/io/sentry/graphql/SentryDataFetcherExceptionHandler.java index b9526a3a63f..5101b687de6 100644 --- a/sentry-graphql/src/main/java/io/sentry/graphql/SentryDataFetcherExceptionHandler.java +++ b/sentry-graphql/src/main/java/io/sentry/graphql/SentryDataFetcherExceptionHandler.java @@ -5,9 +5,9 @@ import graphql.execution.DataFetcherExceptionHandler; import graphql.execution.DataFetcherExceptionHandlerParameters; import graphql.execution.DataFetcherExceptionHandlerResult; +import io.sentry.Hint; import io.sentry.HubAdapter; import io.sentry.IHub; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import org.jetbrains.annotations.NotNull; diff --git a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java index b4cbc23483b..343cacba35d 100644 --- a/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java +++ b/sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java @@ -5,11 +5,11 @@ import com.jakewharton.nopen.annotation.Open; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.Sentry; import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.SentryOptions; -import io.sentry.hints.Hint; import io.sentry.protocol.Message; import io.sentry.protocol.SdkVersion; import io.sentry.util.CollectionUtils; diff --git a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java index 93ede9f59e2..b9a6b2c693d 100644 --- a/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java +++ b/sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java @@ -6,6 +6,7 @@ import com.jakewharton.nopen.annotation.Open; import io.sentry.Breadcrumb; import io.sentry.DateUtils; +import io.sentry.Hint; import io.sentry.HubAdapter; import io.sentry.IHub; import io.sentry.ITransportFactory; @@ -13,7 +14,6 @@ import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.SentryOptions; -import io.sentry.hints.Hint; import io.sentry.protocol.Message; import io.sentry.protocol.SdkVersion; import io.sentry.util.CollectionUtils; diff --git a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java index 941f139aa92..8271340dc3f 100644 --- a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java +++ b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java @@ -10,12 +10,12 @@ import com.jakewharton.nopen.annotation.Open; import io.sentry.Breadcrumb; import io.sentry.DateUtils; +import io.sentry.Hint; import io.sentry.ITransportFactory; import io.sentry.Sentry; import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.SentryOptions; -import io.sentry.hints.Hint; import io.sentry.protocol.Message; import io.sentry.protocol.SdkVersion; import io.sentry.util.CollectionUtils; diff --git a/sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java b/sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java index 361b7433402..ebc62738280 100644 --- a/sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java +++ b/sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java @@ -7,11 +7,11 @@ import feign.Request; import feign.Response; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.ISpan; import io.sentry.SentryTraceHeader; import io.sentry.SpanStatus; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import java.io.IOException; import java.util.Collection; diff --git a/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java b/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java index 29d3ca02713..d2fb71f6251 100644 --- a/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java +++ b/sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java @@ -2,13 +2,13 @@ import io.sentry.Breadcrumb; import io.sentry.EventProcessor; +import io.sentry.Hint; import io.sentry.ISpan; import io.sentry.ITransaction; import io.sentry.Sentry; import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.SpanStatus; -import io.sentry.hints.Hint; import io.sentry.protocol.Message; import io.sentry.protocol.User; import java.util.Collections; diff --git a/sentry-samples/sentry-samples-spring-boot/src/main/java/io/sentry/samples/spring/boot/CustomEventProcessor.java b/sentry-samples/sentry-samples-spring-boot/src/main/java/io/sentry/samples/spring/boot/CustomEventProcessor.java index 1ef69b9671b..b74310a6761 100644 --- a/sentry-samples/sentry-samples-spring-boot/src/main/java/io/sentry/samples/spring/boot/CustomEventProcessor.java +++ b/sentry-samples/sentry-samples-spring-boot/src/main/java/io/sentry/samples/spring/boot/CustomEventProcessor.java @@ -1,8 +1,8 @@ package io.sentry.samples.spring.boot; import io.sentry.EventProcessor; +import io.sentry.Hint; import io.sentry.SentryEvent; -import io.sentry.hints.Hint; import io.sentry.protocol.SentryRuntime; import org.jetbrains.annotations.NotNull; import org.springframework.boot.SpringBootVersion; diff --git a/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessor.java b/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessor.java index 101bd8585bf..1dd6471ab81 100644 --- a/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessor.java +++ b/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessor.java @@ -1,8 +1,8 @@ package io.sentry.servlet.jakarta; import io.sentry.EventProcessor; +import io.sentry.Hint; import io.sentry.SentryEvent; -import io.sentry.hints.Hint; import io.sentry.protocol.Request; import io.sentry.util.Objects; import jakarta.servlet.http.HttpServletRequest; diff --git a/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryServletRequestListener.java b/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryServletRequestListener.java index e3c759bc960..e3811157f8e 100644 --- a/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryServletRequestListener.java +++ b/sentry-servlet-jakarta/src/main/java/io/sentry/servlet/jakarta/SentryServletRequestListener.java @@ -4,9 +4,9 @@ import com.jakewharton.nopen.annotation.Open; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.HubAdapter; import io.sentry.IHub; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletRequestEvent; diff --git a/sentry-servlet-jakarta/src/test/kotlin/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessorTest.kt b/sentry-servlet-jakarta/src/test/kotlin/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessorTest.kt index e696a621a73..ca05d5dd348 100644 --- a/sentry-servlet-jakarta/src/test/kotlin/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessorTest.kt +++ b/sentry-servlet-jakarta/src/test/kotlin/io/sentry/servlet/jakarta/SentryRequestHttpServletRequestProcessorTest.kt @@ -3,9 +3,9 @@ package io.sentry.servlet.jakarta import com.nhaarman.mockitokotlin2.any import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.whenever +import io.sentry.Hint import io.sentry.SentryEvent import io.sentry.SentryOptions -import io.sentry.hints.Hint import jakarta.servlet.http.HttpServletRequest import java.net.URI import java.util.Collections diff --git a/sentry-servlet/src/main/java/io/sentry/servlet/SentryRequestHttpServletRequestProcessor.java b/sentry-servlet/src/main/java/io/sentry/servlet/SentryRequestHttpServletRequestProcessor.java index aa87abccdea..b7b8558ebeb 100644 --- a/sentry-servlet/src/main/java/io/sentry/servlet/SentryRequestHttpServletRequestProcessor.java +++ b/sentry-servlet/src/main/java/io/sentry/servlet/SentryRequestHttpServletRequestProcessor.java @@ -1,8 +1,8 @@ package io.sentry.servlet; import io.sentry.EventProcessor; +import io.sentry.Hint; import io.sentry.SentryEvent; -import io.sentry.hints.Hint; import io.sentry.protocol.Request; import io.sentry.util.Objects; import java.util.Arrays; diff --git a/sentry-servlet/src/main/java/io/sentry/servlet/SentryServletRequestListener.java b/sentry-servlet/src/main/java/io/sentry/servlet/SentryServletRequestListener.java index cf82fd853fd..9b981676c47 100644 --- a/sentry-servlet/src/main/java/io/sentry/servlet/SentryServletRequestListener.java +++ b/sentry-servlet/src/main/java/io/sentry/servlet/SentryServletRequestListener.java @@ -4,9 +4,9 @@ import com.jakewharton.nopen.annotation.Open; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.HubAdapter; import io.sentry.IHub; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import javax.servlet.ServletRequest; import javax.servlet.ServletRequestEvent; diff --git a/sentry-servlet/src/test/kotlin/io/sentry/servlet/SentryRequestHttpServletRequestProcessorTest.kt b/sentry-servlet/src/test/kotlin/io/sentry/servlet/SentryRequestHttpServletRequestProcessorTest.kt index 8d8174c2029..74d93cb8bca 100644 --- a/sentry-servlet/src/test/kotlin/io/sentry/servlet/SentryRequestHttpServletRequestProcessorTest.kt +++ b/sentry-servlet/src/test/kotlin/io/sentry/servlet/SentryRequestHttpServletRequestProcessorTest.kt @@ -1,8 +1,8 @@ package io.sentry.servlet +import io.sentry.Hint import io.sentry.SentryEvent import io.sentry.SentryOptions -import io.sentry.hints.Hint import org.springframework.mock.web.MockServletContext import org.springframework.test.web.servlet.request.MockMvcRequestBuilders import java.net.URI diff --git a/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt b/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt index 898c362f5fd..e63b7ee78b0 100644 --- a/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt +++ b/sentry-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt @@ -9,6 +9,7 @@ import com.nhaarman.mockitokotlin2.whenever import io.sentry.AsyncHttpTransportFactory import io.sentry.Breadcrumb import io.sentry.EventProcessor +import io.sentry.Hint import io.sentry.IHub import io.sentry.ITransportFactory import io.sentry.Integration @@ -19,7 +20,6 @@ import io.sentry.SentryEvent import io.sentry.SentryLevel import io.sentry.SentryOptions import io.sentry.checkEvent -import io.sentry.hints.Hint import io.sentry.protocol.User import io.sentry.spring.HttpServletRequestSentryUserProvider import io.sentry.spring.SentryExceptionResolver diff --git a/sentry-spring/api/sentry-spring.api b/sentry-spring/api/sentry-spring.api index 1a185dee21e..dadda349f80 100644 --- a/sentry-spring/api/sentry-spring.api +++ b/sentry-spring/api/sentry-spring.api @@ -36,7 +36,7 @@ public class io/sentry/spring/SentryInitBeanPostProcessor : org/springframework/ public class io/sentry/spring/SentryRequestHttpServletRequestProcessor : io/sentry/EventProcessor { public fun (Lio/sentry/spring/tracing/TransactionNameProvider;Ljavax/servlet/http/HttpServletRequest;)V - public fun process (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/SentryEvent; + public fun process (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent; } public class io/sentry/spring/SentryRequestResolver { diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryExceptionResolver.java b/sentry-spring/src/main/java/io/sentry/spring/SentryExceptionResolver.java index d1ac9d05217..259e2284ed2 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryExceptionResolver.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryExceptionResolver.java @@ -4,11 +4,11 @@ import static io.sentry.TypeCheckHint.SPRING_RESOLVER_RESPONSE; import com.jakewharton.nopen.annotation.Open; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.exception.ExceptionMechanismException; -import io.sentry.hints.Hint; import io.sentry.protocol.Mechanism; import io.sentry.spring.tracing.TransactionNameProvider; import io.sentry.util.Objects; diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentryRequestHttpServletRequestProcessor.java b/sentry-spring/src/main/java/io/sentry/spring/SentryRequestHttpServletRequestProcessor.java index 34f7e5a0eb3..38c1067caba 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentryRequestHttpServletRequestProcessor.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentryRequestHttpServletRequestProcessor.java @@ -2,8 +2,8 @@ import com.jakewharton.nopen.annotation.Open; import io.sentry.EventProcessor; +import io.sentry.Hint; import io.sentry.SentryEvent; -import io.sentry.hints.Hint; import io.sentry.spring.tracing.TransactionNameProvider; import io.sentry.util.Objects; import javax.servlet.http.HttpServletRequest; diff --git a/sentry-spring/src/main/java/io/sentry/spring/SentrySpringFilter.java b/sentry-spring/src/main/java/io/sentry/spring/SentrySpringFilter.java index 791936a8f37..8fd81809418 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/SentrySpringFilter.java +++ b/sentry-spring/src/main/java/io/sentry/spring/SentrySpringFilter.java @@ -7,13 +7,13 @@ import com.jakewharton.nopen.annotation.Open; import io.sentry.Breadcrumb; import io.sentry.EventProcessor; +import io.sentry.Hint; import io.sentry.HubAdapter; import io.sentry.IHub; import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.SentryOptions; import io.sentry.SentryOptions.RequestSize; -import io.sentry.hints.Hint; import io.sentry.spring.tracing.SpringMvcTransactionNameProvider; import io.sentry.spring.tracing.TransactionNameProvider; import io.sentry.util.Objects; diff --git a/sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientHttpRequestInterceptor.java b/sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientHttpRequestInterceptor.java index d12da58998f..1ab1c9f20f4 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientHttpRequestInterceptor.java +++ b/sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientHttpRequestInterceptor.java @@ -6,12 +6,12 @@ import com.jakewharton.nopen.annotation.Open; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.ISpan; import io.sentry.SentryTraceHeader; import io.sentry.SpanStatus; import io.sentry.TracingOrigins; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientWebRequestFilter.java b/sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientWebRequestFilter.java index 8c8525ad1ba..31b280467a0 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientWebRequestFilter.java +++ b/sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientWebRequestFilter.java @@ -5,12 +5,12 @@ import com.jakewharton.nopen.annotation.Open; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.ISpan; import io.sentry.SentryTraceHeader; import io.sentry.SpanStatus; import io.sentry.TracingOrigins; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryWebExceptionHandler.java b/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryWebExceptionHandler.java index ba71d8eb563..5e9b89842a6 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryWebExceptionHandler.java +++ b/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryWebExceptionHandler.java @@ -3,11 +3,11 @@ import static io.sentry.TypeCheckHint.WEBFLUX_EXCEPTION_HANDLER_REQUEST; import static io.sentry.TypeCheckHint.WEBFLUX_EXCEPTION_HANDLER_RESPONSE; +import io.sentry.Hint; import io.sentry.IHub; import io.sentry.SentryEvent; import io.sentry.SentryLevel; import io.sentry.exception.ExceptionMechanismException; -import io.sentry.hints.Hint; import io.sentry.protocol.Mechanism; import io.sentry.util.Objects; import org.jetbrains.annotations.ApiStatus; diff --git a/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryWebFilter.java b/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryWebFilter.java index 6613252c4b6..0163ddc2bf4 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryWebFilter.java +++ b/sentry-spring/src/main/java/io/sentry/spring/webflux/SentryWebFilter.java @@ -4,8 +4,8 @@ import static io.sentry.TypeCheckHint.WEBFLUX_FILTER_RESPONSE; import io.sentry.Breadcrumb; +import io.sentry.Hint; import io.sentry.IHub; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/SentryRequestHttpServletRequestProcessorTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/SentryRequestHttpServletRequestProcessorTest.kt index 370fbc1ffc6..cc324790d8b 100644 --- a/sentry-spring/src/test/kotlin/io/sentry/spring/SentryRequestHttpServletRequestProcessorTest.kt +++ b/sentry-spring/src/test/kotlin/io/sentry/spring/SentryRequestHttpServletRequestProcessorTest.kt @@ -2,10 +2,10 @@ package io.sentry.spring import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.whenever +import io.sentry.Hint import io.sentry.IHub import io.sentry.SentryEvent import io.sentry.SentryOptions -import io.sentry.hints.Hint import io.sentry.spring.tracing.SpringMvcTransactionNameProvider import org.springframework.mock.web.MockServletContext import org.springframework.test.web.servlet.request.MockMvcRequestBuilders diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api index c9519a4812a..84d2788a7ed 100644 --- a/sentry/api/sentry.api +++ b/sentry/api/sentry.api @@ -119,7 +119,7 @@ public final class io/sentry/DiagnosticLogger : io/sentry/ILogger { public final class io/sentry/DuplicateEventDetectionEventProcessor : io/sentry/EventProcessor { public fun (Lio/sentry/SentryOptions;)V - public fun process (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/SentryEvent; + public fun process (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent; } public final class io/sentry/EnvelopeReader : io/sentry/IEnvelopeReader { @@ -130,12 +130,12 @@ public final class io/sentry/EnvelopeReader : io/sentry/IEnvelopeReader { public final class io/sentry/EnvelopeSender : io/sentry/IEnvelopeSender { public fun (Lio/sentry/IHub;Lio/sentry/ISerializer;Lio/sentry/ILogger;J)V public synthetic fun processDirectory (Ljava/io/File;)V - public fun processEnvelopeFile (Ljava/lang/String;Lio/sentry/hints/Hint;)V + public fun processEnvelopeFile (Ljava/lang/String;Lio/sentry/Hint;)V } public abstract interface class io/sentry/EventProcessor { - public fun process (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/SentryEvent; - public fun process (Lio/sentry/protocol/SentryTransaction;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryTransaction; + public fun process (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent; + public fun process (Lio/sentry/protocol/SentryTransaction;Lio/sentry/Hint;)Lio/sentry/protocol/SentryTransaction; } public final class io/sentry/ExternalOptions { @@ -185,15 +185,32 @@ public final class io/sentry/ExternalOptions { public fun setTracesSampleRate (Ljava/lang/Double;)V } +public final class io/sentry/Hint { + public fun ()V + public fun addAttachment (Lio/sentry/Attachment;)V + public fun addAttachments (Ljava/util/List;)V + public fun clearAttachments ()V + public fun get (Ljava/lang/String;)Ljava/lang/Object; + public fun getAs (Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object; + public fun getAttachments ()Ljava/util/List; + public fun getScreenshot ()Lio/sentry/Attachment; + public fun remove (Ljava/lang/String;)V + public fun replaceAttachments (Ljava/util/List;)V + public fun set (Ljava/lang/String;Ljava/lang/Object;)V + public fun setScreenshot (Lio/sentry/Attachment;)V + public static fun withAttachment (Lio/sentry/Attachment;)Lio/sentry/Hint; + public static fun withAttachments (Ljava/util/List;)Lio/sentry/Hint; +} + public final class io/sentry/Hub : io/sentry/IHub { public fun (Lio/sentry/SentryOptions;)V - public fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/hints/Hint;)V + public fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/Hint;)V public fun bindClient (Lio/sentry/ISentryClient;)V - public fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureException (Ljava/lang/Throwable;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public fun captureException (Ljava/lang/Throwable;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureMessage (Ljava/lang/String;Lio/sentry/SentryLevel;)Lio/sentry/protocol/SentryId; - public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/hints/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; + public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; public fun captureUserFeedback (Lio/sentry/UserFeedback;)V public fun clearBreadcrumbs ()V public fun clone ()Lio/sentry/IHub; @@ -227,13 +244,13 @@ public final class io/sentry/Hub : io/sentry/IHub { } public final class io/sentry/HubAdapter : io/sentry/IHub { - public fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/hints/Hint;)V + public fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/Hint;)V public fun bindClient (Lio/sentry/ISentryClient;)V - public fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureException (Ljava/lang/Throwable;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public fun captureException (Ljava/lang/Throwable;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureMessage (Ljava/lang/String;Lio/sentry/SentryLevel;)Lio/sentry/protocol/SentryId; - public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/hints/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; + public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; public fun captureUserFeedback (Lio/sentry/UserFeedback;)V public fun clearBreadcrumbs ()V public fun clone ()Lio/sentry/IHub; @@ -273,27 +290,27 @@ public abstract interface class io/sentry/IEnvelopeReader { } public abstract interface class io/sentry/IEnvelopeSender { - public abstract fun processEnvelopeFile (Ljava/lang/String;Lio/sentry/hints/Hint;)V + public abstract fun processEnvelopeFile (Ljava/lang/String;Lio/sentry/Hint;)V } public abstract interface class io/sentry/IHub { public fun addBreadcrumb (Lio/sentry/Breadcrumb;)V - public abstract fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/hints/Hint;)V + public abstract fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/Hint;)V public fun addBreadcrumb (Ljava/lang/String;)V public fun addBreadcrumb (Ljava/lang/String;Ljava/lang/String;)V public abstract fun bindClient (Lio/sentry/ISentryClient;)V public fun captureEnvelope (Lio/sentry/SentryEnvelope;)Lio/sentry/protocol/SentryId; - public abstract fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public abstract fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureEvent (Lio/sentry/SentryEvent;)Lio/sentry/protocol/SentryId; - public abstract fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public abstract fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureException (Ljava/lang/Throwable;)Lio/sentry/protocol/SentryId; - public abstract fun captureException (Ljava/lang/Throwable;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public abstract fun captureException (Ljava/lang/Throwable;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureMessage (Ljava/lang/String;)Lio/sentry/protocol/SentryId; public abstract fun captureMessage (Ljava/lang/String;Lio/sentry/SentryLevel;)Lio/sentry/protocol/SentryId; + public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;)Lio/sentry/protocol/SentryId; - public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public abstract fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/hints/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; - public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public abstract fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; public abstract fun captureUserFeedback (Lio/sentry/UserFeedback;)V public abstract fun clearBreadcrumbs ()V public abstract fun clone ()Lio/sentry/IHub; @@ -352,24 +369,24 @@ public abstract interface class io/sentry/IScopeObserver { public abstract interface class io/sentry/ISentryClient { public fun captureEnvelope (Lio/sentry/SentryEnvelope;)Lio/sentry/protocol/SentryId; - public abstract fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public abstract fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureEvent (Lio/sentry/SentryEvent;)Lio/sentry/protocol/SentryId; + public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Scope;)Lio/sentry/protocol/SentryId; - public abstract fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Scope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public abstract fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Scope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureException (Ljava/lang/Throwable;)Lio/sentry/protocol/SentryId; + public fun captureException (Ljava/lang/Throwable;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureException (Ljava/lang/Throwable;Lio/sentry/Scope;)Lio/sentry/protocol/SentryId; - public fun captureException (Ljava/lang/Throwable;Lio/sentry/Scope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureException (Ljava/lang/Throwable;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public fun captureException (Ljava/lang/Throwable;Lio/sentry/Scope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureMessage (Ljava/lang/String;Lio/sentry/SentryLevel;)Lio/sentry/protocol/SentryId; public fun captureMessage (Ljava/lang/String;Lio/sentry/SentryLevel;Lio/sentry/Scope;)Lio/sentry/protocol/SentryId; public fun captureSession (Lio/sentry/Session;)V - public abstract fun captureSession (Lio/sentry/Session;Lio/sentry/hints/Hint;)V + public abstract fun captureSession (Lio/sentry/Session;Lio/sentry/Hint;)V public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;)Lio/sentry/protocol/SentryId; - public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/Scope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/Scope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;)Lio/sentry/protocol/SentryId; - public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Scope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public abstract fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Scope;Lio/sentry/hints/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; + public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Scope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public abstract fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Scope;Lio/sentry/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; public abstract fun captureUserFeedback (Lio/sentry/UserFeedback;)V public abstract fun close ()V public abstract fun flush (J)V @@ -508,8 +525,8 @@ public abstract interface class io/sentry/JsonUnknown { public final class io/sentry/MainEventProcessor : io/sentry/EventProcessor, java/io/Closeable { public fun (Lio/sentry/SentryOptions;)V public fun close ()V - public fun process (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/SentryEvent; - public fun process (Lio/sentry/protocol/SentryTransaction;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryTransaction; + public fun process (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent; + public fun process (Lio/sentry/protocol/SentryTransaction;Lio/sentry/Hint;)Lio/sentry/protocol/SentryTransaction; } public final class io/sentry/NoOpEnvelopeReader : io/sentry/IEnvelopeReader { @@ -518,13 +535,13 @@ public final class io/sentry/NoOpEnvelopeReader : io/sentry/IEnvelopeReader { } public final class io/sentry/NoOpHub : io/sentry/IHub { - public fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/hints/Hint;)V + public fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/Hint;)V public fun bindClient (Lio/sentry/ISentryClient;)V - public fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureException (Ljava/lang/Throwable;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public fun captureException (Ljava/lang/Throwable;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public fun captureMessage (Ljava/lang/String;Lio/sentry/SentryLevel;)Lio/sentry/protocol/SentryId; - public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/hints/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; + public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; public fun captureUserFeedback (Lio/sentry/UserFeedback;)V public fun clearBreadcrumbs ()V public fun clone ()Lio/sentry/IHub; @@ -645,7 +662,7 @@ public final class io/sentry/OptionsContainer { public final class io/sentry/OutboxSender : io/sentry/IEnvelopeSender { public fun (Lio/sentry/IHub;Lio/sentry/IEnvelopeReader;Lio/sentry/ISerializer;Lio/sentry/ILogger;J)V public synthetic fun processDirectory (Ljava/io/File;)V - public fun processEnvelopeFile (Ljava/lang/String;Lio/sentry/hints/Hint;)V + public fun processEnvelopeFile (Ljava/lang/String;Lio/sentry/Hint;)V } public final class io/sentry/ProfilingTraceData : io/sentry/JsonSerializable, io/sentry/JsonUnknown { @@ -745,7 +762,7 @@ public final class io/sentry/Scope { public fun (Lio/sentry/SentryOptions;)V public fun addAttachment (Lio/sentry/Attachment;)V public fun addBreadcrumb (Lio/sentry/Breadcrumb;)V - public fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/hints/Hint;)V + public fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/Hint;)V public fun addEventProcessor (Lio/sentry/EventProcessor;)V public fun clear ()V public fun clearAttachments ()V @@ -819,14 +836,14 @@ public final class io/sentry/SendFireAndForgetOutboxSender : io/sentry/SendCache public final class io/sentry/Sentry { public static fun addBreadcrumb (Lio/sentry/Breadcrumb;)V - public static fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/hints/Hint;)V + public static fun addBreadcrumb (Lio/sentry/Breadcrumb;Lio/sentry/Hint;)V public static fun addBreadcrumb (Ljava/lang/String;)V public static fun addBreadcrumb (Ljava/lang/String;Ljava/lang/String;)V public static fun bindClient (Lio/sentry/ISentryClient;)V public static fun captureEvent (Lio/sentry/SentryEvent;)Lio/sentry/protocol/SentryId; - public static fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public static fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public static fun captureException (Ljava/lang/Throwable;)Lio/sentry/protocol/SentryId; - public static fun captureException (Ljava/lang/Throwable;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; + public static fun captureException (Ljava/lang/Throwable;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; public static fun captureMessage (Ljava/lang/String;)Lio/sentry/protocol/SentryId; public static fun captureMessage (Ljava/lang/String;Lio/sentry/SentryLevel;)Lio/sentry/protocol/SentryId; public static fun captureUserFeedback (Lio/sentry/UserFeedback;)V @@ -948,10 +965,10 @@ public final class io/sentry/SentryBaseEvent$Serializer { } public final class io/sentry/SentryClient : io/sentry/ISentryClient { - public fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Scope;Lio/sentry/hints/Hint;)Lio/sentry/protocol/SentryId; - public fun captureSession (Lio/sentry/Session;Lio/sentry/hints/Hint;)V - public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Scope;Lio/sentry/hints/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; + public fun captureEnvelope (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public fun captureEvent (Lio/sentry/SentryEvent;Lio/sentry/Scope;Lio/sentry/Hint;)Lio/sentry/protocol/SentryId; + public fun captureSession (Lio/sentry/Session;Lio/sentry/Hint;)V + public fun captureTransaction (Lio/sentry/protocol/SentryTransaction;Lio/sentry/TraceState;Lio/sentry/Scope;Lio/sentry/Hint;Lio/sentry/ProfilingTraceData;)Lio/sentry/protocol/SentryId; public fun captureUserFeedback (Lio/sentry/UserFeedback;)V public fun close ()V public fun flush (J)V @@ -1263,11 +1280,11 @@ public class io/sentry/SentryOptions { } public abstract interface class io/sentry/SentryOptions$BeforeBreadcrumbCallback { - public abstract fun execute (Lio/sentry/Breadcrumb;Lio/sentry/hints/Hint;)Lio/sentry/Breadcrumb; + public abstract fun execute (Lio/sentry/Breadcrumb;Lio/sentry/Hint;)Lio/sentry/Breadcrumb; } public abstract interface class io/sentry/SentryOptions$BeforeSendCallback { - public abstract fun execute (Lio/sentry/SentryEvent;Lio/sentry/hints/Hint;)Lio/sentry/SentryEvent; + public abstract fun execute (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent; } public final class io/sentry/SentryOptions$Proxy { @@ -1710,13 +1727,13 @@ public final class io/sentry/cache/EnvelopeCache : io/sentry/cache/IEnvelopeCach public static fun create (Lio/sentry/SentryOptions;)Lio/sentry/cache/IEnvelopeCache; public fun discard (Lio/sentry/SentryEnvelope;)V public fun iterator ()Ljava/util/Iterator; - public fun store (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)V + public fun store (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V } public abstract interface class io/sentry/cache/IEnvelopeCache : java/lang/Iterable { public abstract fun discard (Lio/sentry/SentryEnvelope;)V public fun store (Lio/sentry/SentryEnvelope;)V - public abstract fun store (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)V + public abstract fun store (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V } public final class io/sentry/clientreport/ClientReport : io/sentry/JsonSerializable, io/sentry/JsonUnknown { @@ -1853,23 +1870,6 @@ public abstract interface class io/sentry/hints/Flushable { public abstract fun waitFlush ()Z } -public final class io/sentry/hints/Hint { - public fun ()V - public fun addAttachment (Lio/sentry/Attachment;)V - public fun addAttachments (Ljava/util/List;)V - public fun clearAttachments ()V - public fun get (Ljava/lang/String;)Ljava/lang/Object; - public fun getAs (Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object; - public fun getAttachments ()Ljava/util/List; - public fun getScreenshot ()Lio/sentry/Attachment; - public fun remove (Ljava/lang/String;)V - public fun replaceAttachments (Ljava/util/List;)V - public fun set (Ljava/lang/String;Ljava/lang/Object;)V - public fun setScreenshot (Lio/sentry/Attachment;)V - public static fun withAttachment (Lio/sentry/Attachment;)Lio/sentry/hints/Hint; - public static fun withAttachments (Ljava/util/List;)Lio/sentry/hints/Hint; -} - public abstract interface class io/sentry/hints/Resettable { public abstract fun reset ()V } @@ -2852,7 +2852,7 @@ public final class io/sentry/transport/AsyncHttpTransport : io/sentry/transport/ public fun (Lio/sentry/transport/QueuedThreadPoolExecutor;Lio/sentry/SentryOptions;Lio/sentry/transport/RateLimiter;Lio/sentry/transport/ITransportGate;Lio/sentry/transport/HttpConnection;)V public fun close ()V public fun flush (J)V - public fun send (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)V + public fun send (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V } public final class io/sentry/transport/CurrentDateProvider : io/sentry/transport/ICurrentDateProvider { @@ -2867,7 +2867,7 @@ public abstract interface class io/sentry/transport/ICurrentDateProvider { public abstract interface class io/sentry/transport/ITransport : java/io/Closeable { public abstract fun flush (J)V public fun send (Lio/sentry/SentryEnvelope;)V - public abstract fun send (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)V + public abstract fun send (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V } public abstract interface class io/sentry/transport/ITransportGate { @@ -2879,14 +2879,14 @@ public final class io/sentry/transport/NoOpEnvelopeCache : io/sentry/cache/IEnve public fun discard (Lio/sentry/SentryEnvelope;)V public static fun getInstance ()Lio/sentry/transport/NoOpEnvelopeCache; public fun iterator ()Ljava/util/Iterator; - public fun store (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)V + public fun store (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V } public final class io/sentry/transport/NoOpTransport : io/sentry/transport/ITransport { public fun close ()V public fun flush (J)V public static fun getInstance ()Lio/sentry/transport/NoOpTransport; - public fun send (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)V + public fun send (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V } public final class io/sentry/transport/NoOpTransportGate : io/sentry/transport/ITransportGate { @@ -2897,7 +2897,7 @@ public final class io/sentry/transport/NoOpTransportGate : io/sentry/transport/I public final class io/sentry/transport/RateLimiter { public fun (Lio/sentry/SentryOptions;)V public fun (Lio/sentry/transport/ICurrentDateProvider;Lio/sentry/SentryOptions;)V - public fun filter (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)Lio/sentry/SentryEnvelope; + public fun filter (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)Lio/sentry/SentryEnvelope; public fun updateRetryAfterLimits (Ljava/lang/String;Ljava/lang/String;I)V } @@ -2915,7 +2915,7 @@ public final class io/sentry/transport/StdoutTransport : io/sentry/transport/ITr public fun (Lio/sentry/ISerializer;)V public fun close ()V public fun flush (J)V - public fun send (Lio/sentry/SentryEnvelope;Lio/sentry/hints/Hint;)V + public fun send (Lio/sentry/SentryEnvelope;Lio/sentry/Hint;)V } public abstract class io/sentry/transport/TransportResult { @@ -2950,15 +2950,15 @@ public final class io/sentry/util/FileUtils { } public final class io/sentry/util/HintUtils { - public static fun createWithTypeCheckHint (Ljava/lang/Object;)Lio/sentry/hints/Hint; - public static fun getSentrySdkHint (Lio/sentry/hints/Hint;)Ljava/lang/Object; - public static fun hasType (Lio/sentry/hints/Hint;Ljava/lang/Class;)Z - public static fun runIfDoesNotHaveType (Lio/sentry/hints/Hint;Ljava/lang/Class;Lio/sentry/util/HintUtils$SentryNullableConsumer;)V - public static fun runIfHasType (Lio/sentry/hints/Hint;Ljava/lang/Class;Lio/sentry/util/HintUtils$SentryConsumer;)V - public static fun runIfHasType (Lio/sentry/hints/Hint;Ljava/lang/Class;Lio/sentry/util/HintUtils$SentryConsumer;Lio/sentry/util/HintUtils$SentryHintFallback;)V - public static fun runIfHasTypeLogIfNot (Lio/sentry/hints/Hint;Ljava/lang/Class;Lio/sentry/ILogger;Lio/sentry/util/HintUtils$SentryConsumer;)V - public static fun setTypeCheckHint (Lio/sentry/hints/Hint;Ljava/lang/Object;)V - public static fun shouldApplyScopeData (Lio/sentry/hints/Hint;)Z + public static fun createWithTypeCheckHint (Ljava/lang/Object;)Lio/sentry/Hint; + public static fun getSentrySdkHint (Lio/sentry/Hint;)Ljava/lang/Object; + public static fun hasType (Lio/sentry/Hint;Ljava/lang/Class;)Z + public static fun runIfDoesNotHaveType (Lio/sentry/Hint;Ljava/lang/Class;Lio/sentry/util/HintUtils$SentryNullableConsumer;)V + public static fun runIfHasType (Lio/sentry/Hint;Ljava/lang/Class;Lio/sentry/util/HintUtils$SentryConsumer;)V + public static fun runIfHasType (Lio/sentry/Hint;Ljava/lang/Class;Lio/sentry/util/HintUtils$SentryConsumer;Lio/sentry/util/HintUtils$SentryHintFallback;)V + public static fun runIfHasTypeLogIfNot (Lio/sentry/Hint;Ljava/lang/Class;Lio/sentry/ILogger;Lio/sentry/util/HintUtils$SentryConsumer;)V + public static fun setTypeCheckHint (Lio/sentry/Hint;Ljava/lang/Object;)V + public static fun shouldApplyScopeData (Lio/sentry/Hint;)Z } public abstract interface class io/sentry/util/HintUtils$SentryConsumer { diff --git a/sentry/src/main/java/io/sentry/DirectoryProcessor.java b/sentry/src/main/java/io/sentry/DirectoryProcessor.java index 3777a966f0f..d8924a38adb 100644 --- a/sentry/src/main/java/io/sentry/DirectoryProcessor.java +++ b/sentry/src/main/java/io/sentry/DirectoryProcessor.java @@ -4,7 +4,6 @@ import io.sentry.hints.Cached; import io.sentry.hints.Flushable; -import io.sentry.hints.Hint; import io.sentry.hints.Retryable; import io.sentry.hints.SubmissionResult; import io.sentry.util.HintUtils; diff --git a/sentry/src/main/java/io/sentry/DuplicateEventDetectionEventProcessor.java b/sentry/src/main/java/io/sentry/DuplicateEventDetectionEventProcessor.java index 896b5d8dd33..e9b77a8860c 100644 --- a/sentry/src/main/java/io/sentry/DuplicateEventDetectionEventProcessor.java +++ b/sentry/src/main/java/io/sentry/DuplicateEventDetectionEventProcessor.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import java.util.ArrayList; import java.util.Collections; diff --git a/sentry/src/main/java/io/sentry/EnvelopeSender.java b/sentry/src/main/java/io/sentry/EnvelopeSender.java index 4b41b31db62..b74606fa1a5 100644 --- a/sentry/src/main/java/io/sentry/EnvelopeSender.java +++ b/sentry/src/main/java/io/sentry/EnvelopeSender.java @@ -2,7 +2,6 @@ import io.sentry.cache.EnvelopeCache; import io.sentry.hints.Flushable; -import io.sentry.hints.Hint; import io.sentry.hints.Retryable; import io.sentry.util.HintUtils; import io.sentry.util.Objects; diff --git a/sentry/src/main/java/io/sentry/EventProcessor.java b/sentry/src/main/java/io/sentry/EventProcessor.java index 1030af9e981..ba675086142 100644 --- a/sentry/src/main/java/io/sentry/EventProcessor.java +++ b/sentry/src/main/java/io/sentry/EventProcessor.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import io.sentry.protocol.SentryTransaction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry/src/main/java/io/sentry/hints/Hint.java b/sentry/src/main/java/io/sentry/Hint.java similarity index 98% rename from sentry/src/main/java/io/sentry/hints/Hint.java rename to sentry/src/main/java/io/sentry/Hint.java index 1e40302a83c..c44aa33cf3c 100644 --- a/sentry/src/main/java/io/sentry/hints/Hint.java +++ b/sentry/src/main/java/io/sentry/Hint.java @@ -1,6 +1,5 @@ -package io.sentry.hints; +package io.sentry; -import io.sentry.Attachment; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/sentry/src/main/java/io/sentry/Hub.java b/sentry/src/main/java/io/sentry/Hub.java index a93ecc989ea..e4acc4e40ca 100644 --- a/sentry/src/main/java/io/sentry/Hub.java +++ b/sentry/src/main/java/io/sentry/Hub.java @@ -2,7 +2,6 @@ import io.sentry.Stack.StackItem; import io.sentry.clientreport.DiscardReason; -import io.sentry.hints.Hint; import io.sentry.hints.SessionEndHint; import io.sentry.hints.SessionStartHint; import io.sentry.protocol.SentryId; diff --git a/sentry/src/main/java/io/sentry/HubAdapter.java b/sentry/src/main/java/io/sentry/HubAdapter.java index 9266c336c4c..0f5cbc29ae6 100644 --- a/sentry/src/main/java/io/sentry/HubAdapter.java +++ b/sentry/src/main/java/io/sentry/HubAdapter.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import io.sentry.protocol.SentryId; import io.sentry.protocol.SentryTransaction; import io.sentry.protocol.User; diff --git a/sentry/src/main/java/io/sentry/IEnvelopeSender.java b/sentry/src/main/java/io/sentry/IEnvelopeSender.java index b37307fa5be..f36d9c82a8b 100644 --- a/sentry/src/main/java/io/sentry/IEnvelopeSender.java +++ b/sentry/src/main/java/io/sentry/IEnvelopeSender.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import org.jetbrains.annotations.NotNull; public interface IEnvelopeSender { diff --git a/sentry/src/main/java/io/sentry/IHub.java b/sentry/src/main/java/io/sentry/IHub.java index 57946ae2ccd..6a90ba00dcc 100644 --- a/sentry/src/main/java/io/sentry/IHub.java +++ b/sentry/src/main/java/io/sentry/IHub.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import io.sentry.protocol.SentryId; import io.sentry.protocol.SentryTransaction; import io.sentry.protocol.User; diff --git a/sentry/src/main/java/io/sentry/ISentryClient.java b/sentry/src/main/java/io/sentry/ISentryClient.java index 30ca7428388..76e2c5af32b 100644 --- a/sentry/src/main/java/io/sentry/ISentryClient.java +++ b/sentry/src/main/java/io/sentry/ISentryClient.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import io.sentry.protocol.Message; import io.sentry.protocol.SentryId; import io.sentry.protocol.SentryTransaction; diff --git a/sentry/src/main/java/io/sentry/MainEventProcessor.java b/sentry/src/main/java/io/sentry/MainEventProcessor.java index 83c0b56be07..31c4ea7ab8d 100644 --- a/sentry/src/main/java/io/sentry/MainEventProcessor.java +++ b/sentry/src/main/java/io/sentry/MainEventProcessor.java @@ -1,7 +1,6 @@ package io.sentry; import io.sentry.hints.Cached; -import io.sentry.hints.Hint; import io.sentry.protocol.DebugImage; import io.sentry.protocol.DebugMeta; import io.sentry.protocol.SentryException; diff --git a/sentry/src/main/java/io/sentry/NoOpHub.java b/sentry/src/main/java/io/sentry/NoOpHub.java index 4d9a5b3c2e0..cfaec1c9d43 100644 --- a/sentry/src/main/java/io/sentry/NoOpHub.java +++ b/sentry/src/main/java/io/sentry/NoOpHub.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import io.sentry.protocol.SentryId; import io.sentry.protocol.SentryTransaction; import io.sentry.protocol.User; diff --git a/sentry/src/main/java/io/sentry/NoOpSentryClient.java b/sentry/src/main/java/io/sentry/NoOpSentryClient.java index 7916c1b899c..a0688457b4a 100644 --- a/sentry/src/main/java/io/sentry/NoOpSentryClient.java +++ b/sentry/src/main/java/io/sentry/NoOpSentryClient.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import io.sentry.protocol.SentryId; import io.sentry.protocol.SentryTransaction; import org.jetbrains.annotations.NotNull; diff --git a/sentry/src/main/java/io/sentry/OutboxSender.java b/sentry/src/main/java/io/sentry/OutboxSender.java index e653f170f8f..842a5121b55 100644 --- a/sentry/src/main/java/io/sentry/OutboxSender.java +++ b/sentry/src/main/java/io/sentry/OutboxSender.java @@ -4,7 +4,6 @@ import static io.sentry.cache.EnvelopeCache.PREFIX_CURRENT_SESSION_FILE; import io.sentry.hints.Flushable; -import io.sentry.hints.Hint; import io.sentry.hints.Resettable; import io.sentry.hints.Retryable; import io.sentry.hints.SubmissionResult; diff --git a/sentry/src/main/java/io/sentry/Scope.java b/sentry/src/main/java/io/sentry/Scope.java index b2b60a699c6..e13ebd0273d 100644 --- a/sentry/src/main/java/io/sentry/Scope.java +++ b/sentry/src/main/java/io/sentry/Scope.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import io.sentry.protocol.Contexts; import io.sentry.protocol.Request; import io.sentry.protocol.User; diff --git a/sentry/src/main/java/io/sentry/Sentry.java b/sentry/src/main/java/io/sentry/Sentry.java index 6c632696649..ac79bdc5aec 100644 --- a/sentry/src/main/java/io/sentry/Sentry.java +++ b/sentry/src/main/java/io/sentry/Sentry.java @@ -2,7 +2,6 @@ import io.sentry.cache.EnvelopeCache; import io.sentry.config.PropertiesProviderFactory; -import io.sentry.hints.Hint; import io.sentry.protocol.SentryId; import io.sentry.protocol.User; import io.sentry.util.FileUtils; diff --git a/sentry/src/main/java/io/sentry/SentryClient.java b/sentry/src/main/java/io/sentry/SentryClient.java index 4d8f4476b7b..5b0813b1d1b 100644 --- a/sentry/src/main/java/io/sentry/SentryClient.java +++ b/sentry/src/main/java/io/sentry/SentryClient.java @@ -3,7 +3,6 @@ import io.sentry.clientreport.DiscardReason; import io.sentry.exception.SentryEnvelopeException; import io.sentry.hints.DiskFlushNotification; -import io.sentry.hints.Hint; import io.sentry.protocol.Contexts; import io.sentry.protocol.SentryId; import io.sentry.protocol.SentryTransaction; diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java index e36f06cad93..535d8b2db6d 100644 --- a/sentry/src/main/java/io/sentry/SentryOptions.java +++ b/sentry/src/main/java/io/sentry/SentryOptions.java @@ -5,7 +5,6 @@ import io.sentry.clientreport.ClientReportRecorder; import io.sentry.clientreport.IClientReportRecorder; import io.sentry.clientreport.NoOpClientReportRecorder; -import io.sentry.hints.Hint; import io.sentry.protocol.SdkVersion; import io.sentry.transport.ITransportGate; import io.sentry.transport.NoOpEnvelopeCache; diff --git a/sentry/src/main/java/io/sentry/SentryRuntimeEventProcessor.java b/sentry/src/main/java/io/sentry/SentryRuntimeEventProcessor.java index 43cbea7824a..9d0d6443aaa 100644 --- a/sentry/src/main/java/io/sentry/SentryRuntimeEventProcessor.java +++ b/sentry/src/main/java/io/sentry/SentryRuntimeEventProcessor.java @@ -1,6 +1,5 @@ package io.sentry; -import io.sentry.hints.Hint; import io.sentry.protocol.SentryRuntime; import io.sentry.protocol.SentryTransaction; import org.jetbrains.annotations.NotNull; diff --git a/sentry/src/main/java/io/sentry/UncaughtExceptionHandlerIntegration.java b/sentry/src/main/java/io/sentry/UncaughtExceptionHandlerIntegration.java index 965b3ff17b8..9058d536b94 100644 --- a/sentry/src/main/java/io/sentry/UncaughtExceptionHandlerIntegration.java +++ b/sentry/src/main/java/io/sentry/UncaughtExceptionHandlerIntegration.java @@ -5,7 +5,6 @@ import io.sentry.exception.ExceptionMechanismException; import io.sentry.hints.DiskFlushNotification; import io.sentry.hints.Flushable; -import io.sentry.hints.Hint; import io.sentry.hints.SessionEnd; import io.sentry.protocol.Mechanism; import io.sentry.util.HintUtils; diff --git a/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java b/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java index 5be26bf8a86..e700e07d027 100644 --- a/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java +++ b/sentry/src/main/java/io/sentry/cache/EnvelopeCache.java @@ -7,6 +7,7 @@ import static java.lang.String.format; import io.sentry.DateUtils; +import io.sentry.Hint; import io.sentry.SentryCrashLastRunState; import io.sentry.SentryEnvelope; import io.sentry.SentryEnvelopeItem; @@ -15,7 +16,6 @@ import io.sentry.SentryOptions; import io.sentry.Session; import io.sentry.hints.DiskFlushNotification; -import io.sentry.hints.Hint; import io.sentry.hints.SessionEnd; import io.sentry.hints.SessionStart; import io.sentry.transport.NoOpEnvelopeCache; diff --git a/sentry/src/main/java/io/sentry/cache/IEnvelopeCache.java b/sentry/src/main/java/io/sentry/cache/IEnvelopeCache.java index 9a6e7056cdb..ba607656c63 100644 --- a/sentry/src/main/java/io/sentry/cache/IEnvelopeCache.java +++ b/sentry/src/main/java/io/sentry/cache/IEnvelopeCache.java @@ -1,7 +1,7 @@ package io.sentry.cache; +import io.sentry.Hint; import io.sentry.SentryEnvelope; -import io.sentry.hints.Hint; import org.jetbrains.annotations.NotNull; public interface IEnvelopeCache extends Iterable { diff --git a/sentry/src/main/java/io/sentry/transport/AsyncHttpTransport.java b/sentry/src/main/java/io/sentry/transport/AsyncHttpTransport.java index e472cde84a1..49ff077b114 100644 --- a/sentry/src/main/java/io/sentry/transport/AsyncHttpTransport.java +++ b/sentry/src/main/java/io/sentry/transport/AsyncHttpTransport.java @@ -1,5 +1,6 @@ package io.sentry.transport; +import io.sentry.Hint; import io.sentry.ILogger; import io.sentry.RequestDetails; import io.sentry.SentryEnvelope; @@ -9,7 +10,6 @@ import io.sentry.clientreport.DiscardReason; import io.sentry.hints.Cached; import io.sentry.hints.DiskFlushNotification; -import io.sentry.hints.Hint; import io.sentry.hints.Retryable; import io.sentry.hints.SubmissionResult; import io.sentry.util.HintUtils; diff --git a/sentry/src/main/java/io/sentry/transport/ITransport.java b/sentry/src/main/java/io/sentry/transport/ITransport.java index d2f755b8f4a..131a5f04070 100644 --- a/sentry/src/main/java/io/sentry/transport/ITransport.java +++ b/sentry/src/main/java/io/sentry/transport/ITransport.java @@ -1,7 +1,7 @@ package io.sentry.transport; +import io.sentry.Hint; import io.sentry.SentryEnvelope; -import io.sentry.hints.Hint; import java.io.Closeable; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/sentry/src/main/java/io/sentry/transport/NoOpEnvelopeCache.java b/sentry/src/main/java/io/sentry/transport/NoOpEnvelopeCache.java index 7d638f5d6e8..27ce1dc3c39 100644 --- a/sentry/src/main/java/io/sentry/transport/NoOpEnvelopeCache.java +++ b/sentry/src/main/java/io/sentry/transport/NoOpEnvelopeCache.java @@ -1,8 +1,8 @@ package io.sentry.transport; +import io.sentry.Hint; import io.sentry.SentryEnvelope; import io.sentry.cache.IEnvelopeCache; -import io.sentry.hints.Hint; import java.util.ArrayList; import java.util.Iterator; import org.jetbrains.annotations.NotNull; diff --git a/sentry/src/main/java/io/sentry/transport/NoOpTransport.java b/sentry/src/main/java/io/sentry/transport/NoOpTransport.java index fce2d7aefef..79d639ee0ba 100644 --- a/sentry/src/main/java/io/sentry/transport/NoOpTransport.java +++ b/sentry/src/main/java/io/sentry/transport/NoOpTransport.java @@ -1,7 +1,7 @@ package io.sentry.transport; +import io.sentry.Hint; import io.sentry.SentryEnvelope; -import io.sentry.hints.Hint; import java.io.IOException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/sentry/src/main/java/io/sentry/transport/RateLimiter.java b/sentry/src/main/java/io/sentry/transport/RateLimiter.java index deec4326b35..3fd850047ca 100644 --- a/sentry/src/main/java/io/sentry/transport/RateLimiter.java +++ b/sentry/src/main/java/io/sentry/transport/RateLimiter.java @@ -4,12 +4,12 @@ import static io.sentry.SentryLevel.INFO; import io.sentry.DataCategory; +import io.sentry.Hint; import io.sentry.SentryEnvelope; import io.sentry.SentryEnvelopeItem; import io.sentry.SentryLevel; import io.sentry.SentryOptions; import io.sentry.clientreport.DiscardReason; -import io.sentry.hints.Hint; import io.sentry.hints.Retryable; import io.sentry.hints.SubmissionResult; import io.sentry.util.HintUtils; diff --git a/sentry/src/main/java/io/sentry/transport/StdoutTransport.java b/sentry/src/main/java/io/sentry/transport/StdoutTransport.java index 1f035e0e344..c503df9f94b 100644 --- a/sentry/src/main/java/io/sentry/transport/StdoutTransport.java +++ b/sentry/src/main/java/io/sentry/transport/StdoutTransport.java @@ -1,8 +1,8 @@ package io.sentry.transport; +import io.sentry.Hint; import io.sentry.ISerializer; import io.sentry.SentryEnvelope; -import io.sentry.hints.Hint; import io.sentry.util.Objects; import java.io.IOException; import org.jetbrains.annotations.NotNull; diff --git a/sentry/src/main/java/io/sentry/util/HintUtils.java b/sentry/src/main/java/io/sentry/util/HintUtils.java index 73067c15688..13c6c87d05b 100644 --- a/sentry/src/main/java/io/sentry/util/HintUtils.java +++ b/sentry/src/main/java/io/sentry/util/HintUtils.java @@ -2,10 +2,10 @@ import static io.sentry.TypeCheckHint.SENTRY_TYPE_CHECK_HINT; +import io.sentry.Hint; import io.sentry.ILogger; import io.sentry.hints.ApplyScopeData; import io.sentry.hints.Cached; -import io.sentry.hints.Hint; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/sentry/src/test/java/io/sentry/CustomEventProcessor.kt b/sentry/src/test/java/io/sentry/CustomEventProcessor.kt index a6ed0afc076..1eebf91e557 100644 --- a/sentry/src/test/java/io/sentry/CustomEventProcessor.kt +++ b/sentry/src/test/java/io/sentry/CustomEventProcessor.kt @@ -1,7 +1,5 @@ package io.sentry -import io.sentry.hints.Hint - class CustomEventProcessor : EventProcessor { override fun process(event: SentryEvent, hint: Hint): SentryEvent? = null } diff --git a/sentry/src/test/java/io/sentry/DuplicateEventDetectionEventProcessorTest.kt b/sentry/src/test/java/io/sentry/DuplicateEventDetectionEventProcessorTest.kt index e8fb213a5f8..cd4417f83a4 100644 --- a/sentry/src/test/java/io/sentry/DuplicateEventDetectionEventProcessorTest.kt +++ b/sentry/src/test/java/io/sentry/DuplicateEventDetectionEventProcessorTest.kt @@ -1,7 +1,6 @@ package io.sentry import io.sentry.exception.ExceptionMechanismException -import io.sentry.hints.Hint import io.sentry.protocol.Mechanism import java.lang.RuntimeException import kotlin.test.Test diff --git a/sentry/src/test/java/io/sentry/EnvelopeSenderTest.kt b/sentry/src/test/java/io/sentry/EnvelopeSenderTest.kt index d141a0afec4..cf7e1a8b48d 100644 --- a/sentry/src/test/java/io/sentry/EnvelopeSenderTest.kt +++ b/sentry/src/test/java/io/sentry/EnvelopeSenderTest.kt @@ -8,7 +8,6 @@ import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import com.nhaarman.mockitokotlin2.whenever import io.sentry.cache.EnvelopeCache -import io.sentry.hints.Hint import io.sentry.hints.Retryable import io.sentry.util.HintUtils import io.sentry.util.noFlushTimeout diff --git a/sentry/src/test/java/io/sentry/HubTest.kt b/sentry/src/test/java/io/sentry/HubTest.kt index 22b260d7901..6ef755c67a4 100644 --- a/sentry/src/test/java/io/sentry/HubTest.kt +++ b/sentry/src/test/java/io/sentry/HubTest.kt @@ -18,7 +18,6 @@ import io.sentry.cache.EnvelopeCache import io.sentry.clientreport.ClientReportTestHelper.Companion.assertClientReport import io.sentry.clientreport.DiscardReason import io.sentry.clientreport.DiscardedEvent -import io.sentry.hints.Hint import io.sentry.hints.SessionEndHint import io.sentry.hints.SessionStartHint import io.sentry.protocol.SentryId diff --git a/sentry/src/test/java/io/sentry/MainEventProcessorTest.kt b/sentry/src/test/java/io/sentry/MainEventProcessorTest.kt index 970eb936d67..b5dc8846706 100644 --- a/sentry/src/test/java/io/sentry/MainEventProcessorTest.kt +++ b/sentry/src/test/java/io/sentry/MainEventProcessorTest.kt @@ -6,7 +6,6 @@ import com.nhaarman.mockitokotlin2.times import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.whenever import io.sentry.hints.ApplyScopeData -import io.sentry.hints.Hint import io.sentry.protocol.DebugMeta import io.sentry.protocol.SdkVersion import io.sentry.protocol.SentryTransaction diff --git a/sentry/src/test/java/io/sentry/NoOpHubTest.kt b/sentry/src/test/java/io/sentry/NoOpHubTest.kt index 0c9c904e16e..f7616a9c432 100644 --- a/sentry/src/test/java/io/sentry/NoOpHubTest.kt +++ b/sentry/src/test/java/io/sentry/NoOpHubTest.kt @@ -1,7 +1,6 @@ package io.sentry import com.nhaarman.mockitokotlin2.mock -import io.sentry.hints.Hint import io.sentry.protocol.SentryId import kotlin.test.Test import kotlin.test.assertEquals diff --git a/sentry/src/test/java/io/sentry/ScopeTest.kt b/sentry/src/test/java/io/sentry/ScopeTest.kt index bb1fb37b4f9..94b8ec0becd 100644 --- a/sentry/src/test/java/io/sentry/ScopeTest.kt +++ b/sentry/src/test/java/io/sentry/ScopeTest.kt @@ -5,7 +5,6 @@ import com.nhaarman.mockitokotlin2.eq import com.nhaarman.mockitokotlin2.mock import com.nhaarman.mockitokotlin2.never import com.nhaarman.mockitokotlin2.verify -import io.sentry.hints.Hint import io.sentry.protocol.Request import io.sentry.protocol.User import io.sentry.test.callMethod diff --git a/sentry/src/test/java/io/sentry/SentryClientTest.kt b/sentry/src/test/java/io/sentry/SentryClientTest.kt index 41f85ced34e..8c16b99e93d 100644 --- a/sentry/src/test/java/io/sentry/SentryClientTest.kt +++ b/sentry/src/test/java/io/sentry/SentryClientTest.kt @@ -22,7 +22,6 @@ import io.sentry.exception.SentryEnvelopeException import io.sentry.hints.ApplyScopeData import io.sentry.hints.Cached import io.sentry.hints.DiskFlushNotification -import io.sentry.hints.Hint import io.sentry.protocol.Mechanism import io.sentry.protocol.Request import io.sentry.protocol.SdkVersion diff --git a/sentry/src/test/java/io/sentry/clientreport/ClientReportTest.kt b/sentry/src/test/java/io/sentry/clientreport/ClientReportTest.kt index e5071a2c066..53e2d0c27d9 100644 --- a/sentry/src/test/java/io/sentry/clientreport/ClientReportTest.kt +++ b/sentry/src/test/java/io/sentry/clientreport/ClientReportTest.kt @@ -4,6 +4,7 @@ import io.sentry.Attachment import io.sentry.DataCategory import io.sentry.DateUtils import io.sentry.EventProcessor +import io.sentry.Hint import io.sentry.Sentry import io.sentry.SentryEnvelope import io.sentry.SentryEnvelopeHeader @@ -14,7 +15,6 @@ import io.sentry.Session import io.sentry.UserFeedback import io.sentry.dsnString import io.sentry.hints.DiskFlushNotification -import io.sentry.hints.Hint import io.sentry.hints.Retryable import io.sentry.protocol.SentryId import io.sentry.protocol.SentryTransaction diff --git a/sentry/src/test/java/io/sentry/hints/HintTest.kt b/sentry/src/test/java/io/sentry/hints/HintTest.kt index ffde4fd048f..467208897f3 100644 --- a/sentry/src/test/java/io/sentry/hints/HintTest.kt +++ b/sentry/src/test/java/io/sentry/hints/HintTest.kt @@ -1,6 +1,7 @@ package io.sentry.hints import io.sentry.Attachment +import io.sentry.Hint import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull diff --git a/sentry/src/test/java/io/sentry/transport/RateLimiterTest.kt b/sentry/src/test/java/io/sentry/transport/RateLimiterTest.kt index e7fd08e411f..117a049839d 100644 --- a/sentry/src/test/java/io/sentry/transport/RateLimiterTest.kt +++ b/sentry/src/test/java/io/sentry/transport/RateLimiterTest.kt @@ -8,6 +8,7 @@ import com.nhaarman.mockitokotlin2.verify import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions import com.nhaarman.mockitokotlin2.whenever import io.sentry.Attachment +import io.sentry.Hint import io.sentry.ISerializer import io.sentry.NoOpLogger import io.sentry.SentryEnvelope @@ -22,7 +23,6 @@ import io.sentry.TransactionContext import io.sentry.UserFeedback import io.sentry.clientreport.DiscardReason import io.sentry.clientreport.IClientReportRecorder -import io.sentry.hints.Hint import io.sentry.protocol.SentryId import io.sentry.protocol.SentryTransaction import io.sentry.protocol.User diff --git a/sentry/src/test/java/io/sentry/util/HintUtilsTest.kt b/sentry/src/test/java/io/sentry/util/HintUtilsTest.kt index d6f24ab5661..1061531bf4e 100644 --- a/sentry/src/test/java/io/sentry/util/HintUtilsTest.kt +++ b/sentry/src/test/java/io/sentry/util/HintUtilsTest.kt @@ -2,9 +2,9 @@ package io.sentry.util import com.nhaarman.mockitokotlin2.mock import io.sentry.CustomCachedApplyScopeDataHint +import io.sentry.Hint import io.sentry.hints.ApplyScopeData import io.sentry.hints.Cached -import io.sentry.hints.Hint import kotlin.test.Test import kotlin.test.assertFalse import kotlin.test.assertTrue