Move Hint one package up into io.sentry (#2064)

Author: adinauer

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 {

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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

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

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")

sentry-android-okhttp/src/main/java/io/sentry/android/okhttp/SentryOkHttpInterceptor.kt

@@ -1,14 +1,14 @@
 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
 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

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 <init> (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 {

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;

sentry-apollo/src/main/java/io/sentry/apollo/SentryApolloInterceptor.kt

@@ -12,14 +12,14 @@ 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
 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(

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;
 

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;

sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java

@@ -6,14 +6,14 @@
 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;
 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;

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;

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;

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;

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;

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;

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;

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

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;

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;

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