diff --git a/CHANGELOG.md b/CHANGELOG.md index 5db2be07e5..e7a027d5aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ ### Improvements - Remove internal API status from get/setDistinctId ([#4708](https://github.com/getsentry/sentry-java/pull/4708)) +- Remove ApiStatus.Experimental annotation from check-in API ([#4721](https://github.com/getsentry/sentry-java/pull/4721)) ### Fixes diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckIn.java b/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckIn.java index 70de3aaad4..47cd80ab5b 100644 --- a/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckIn.java +++ b/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckIn.java @@ -4,13 +4,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.jetbrains.annotations.ApiStatus; import org.springframework.core.annotation.AliasFor; /** Sends a {@link io.sentry.CheckIn} for the annotated method. */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) -@ApiStatus.Experimental public @interface SentryCheckIn { /** diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInAdvice.java b/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInAdvice.java index f5f33c252a..274c20ac89 100644 --- a/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInAdvice.java +++ b/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInAdvice.java @@ -28,7 +28,6 @@ * check-in. */ @ApiStatus.Internal -@ApiStatus.Experimental @Open public class SentryCheckInAdvice implements MethodInterceptor, EmbeddedValueResolverAware { private final @NotNull IScopes scopes; diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInAdviceConfiguration.java b/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInAdviceConfiguration.java index 4ef53629dd..6ab05a2e1c 100644 --- a/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInAdviceConfiguration.java +++ b/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInAdviceConfiguration.java @@ -2,7 +2,6 @@ import com.jakewharton.nopen.annotation.Open; import org.aopalliance.aop.Advice; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.springframework.aop.Advisor; import org.springframework.aop.Pointcut; @@ -15,7 +14,6 @@ @Configuration(proxyBeanMethods = false) @Open -@ApiStatus.Experimental @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public class SentryCheckInAdviceConfiguration { diff --git a/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInPointcutConfiguration.java b/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInPointcutConfiguration.java index 40d1260a46..f79602a639 100644 --- a/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInPointcutConfiguration.java +++ b/sentry-spring-7/src/main/java/io/sentry/spring7/checkin/SentryCheckInPointcutConfiguration.java @@ -1,7 +1,6 @@ package io.sentry.spring7.checkin; import com.jakewharton.nopen.annotation.Open; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.springframework.aop.Pointcut; import org.springframework.aop.support.ComposablePointcut; @@ -15,7 +14,6 @@ /** AOP pointcut configuration for {@link SentryCheckIn}. */ @Configuration(proxyBeanMethods = false) @Open -@ApiStatus.Experimental @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public class SentryCheckInPointcutConfiguration { diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckIn.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckIn.java index a2f53da955..bfb6b724b8 100644 --- a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckIn.java +++ b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckIn.java @@ -4,13 +4,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.jetbrains.annotations.ApiStatus; import org.springframework.core.annotation.AliasFor; /** Sends a {@link io.sentry.CheckIn} for the annotated method. */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) -@ApiStatus.Experimental public @interface SentryCheckIn { /** diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInAdvice.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInAdvice.java index dd22f4dc5d..d2b93471f1 100644 --- a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInAdvice.java +++ b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInAdvice.java @@ -28,7 +28,6 @@ * check-in. */ @ApiStatus.Internal -@ApiStatus.Experimental @Open public class SentryCheckInAdvice implements MethodInterceptor, EmbeddedValueResolverAware { private final @NotNull IScopes scopes; diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInAdviceConfiguration.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInAdviceConfiguration.java index 1f948581f1..615b6da988 100644 --- a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInAdviceConfiguration.java +++ b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInAdviceConfiguration.java @@ -2,7 +2,6 @@ import com.jakewharton.nopen.annotation.Open; import org.aopalliance.aop.Advice; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.springframework.aop.Advisor; import org.springframework.aop.Pointcut; @@ -15,7 +14,6 @@ @Configuration(proxyBeanMethods = false) @Open -@ApiStatus.Experimental @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public class SentryCheckInAdviceConfiguration { diff --git a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInPointcutConfiguration.java b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInPointcutConfiguration.java index d5c7b8e97e..2e7f28305b 100644 --- a/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInPointcutConfiguration.java +++ b/sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/checkin/SentryCheckInPointcutConfiguration.java @@ -1,7 +1,6 @@ package io.sentry.spring.jakarta.checkin; import com.jakewharton.nopen.annotation.Open; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.springframework.aop.Pointcut; import org.springframework.aop.support.ComposablePointcut; @@ -15,7 +14,6 @@ /** AOP pointcut configuration for {@link SentryCheckIn}. */ @Configuration(proxyBeanMethods = false) @Open -@ApiStatus.Experimental @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public class SentryCheckInPointcutConfiguration { diff --git a/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckIn.java b/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckIn.java index 4662bc531c..805f4bd546 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckIn.java +++ b/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckIn.java @@ -4,13 +4,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.jetbrains.annotations.ApiStatus; import org.springframework.core.annotation.AliasFor; /** Sends a {@link io.sentry.CheckIn} for the annotated method. */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) -@ApiStatus.Experimental public @interface SentryCheckIn { /** diff --git a/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInAdvice.java b/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInAdvice.java index 58e7e9430e..719ead46b5 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInAdvice.java +++ b/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInAdvice.java @@ -28,7 +28,6 @@ * check-in. */ @ApiStatus.Internal -@ApiStatus.Experimental @Open public class SentryCheckInAdvice implements MethodInterceptor, EmbeddedValueResolverAware { private final @NotNull IScopes scopes; diff --git a/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInAdviceConfiguration.java b/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInAdviceConfiguration.java index 3c23c35303..7f4efe93c5 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInAdviceConfiguration.java +++ b/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInAdviceConfiguration.java @@ -2,7 +2,6 @@ import com.jakewharton.nopen.annotation.Open; import org.aopalliance.aop.Advice; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.springframework.aop.Advisor; import org.springframework.aop.Pointcut; @@ -15,7 +14,6 @@ @Configuration(proxyBeanMethods = false) @Open -@ApiStatus.Experimental @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public class SentryCheckInAdviceConfiguration { diff --git a/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInPointcutConfiguration.java b/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInPointcutConfiguration.java index 077329fc99..cffecf8415 100644 --- a/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInPointcutConfiguration.java +++ b/sentry-spring/src/main/java/io/sentry/spring/checkin/SentryCheckInPointcutConfiguration.java @@ -1,7 +1,6 @@ package io.sentry.spring.checkin; import com.jakewharton.nopen.annotation.Open; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.springframework.aop.Pointcut; import org.springframework.aop.support.ComposablePointcut; @@ -15,7 +14,6 @@ /** AOP pointcut configuration for {@link SentryCheckIn}. */ @Configuration(proxyBeanMethods = false) @Open -@ApiStatus.Experimental @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public class SentryCheckInPointcutConfiguration { diff --git a/sentry/src/main/java/io/sentry/CheckIn.java b/sentry/src/main/java/io/sentry/CheckIn.java index 83f6cf7b8d..538a7efc9a 100644 --- a/sentry/src/main/java/io/sentry/CheckIn.java +++ b/sentry/src/main/java/io/sentry/CheckIn.java @@ -9,7 +9,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -@ApiStatus.Experimental /** A check-in for a monitor (CRON). */ public final class CheckIn implements JsonUnknown, JsonSerializable { diff --git a/sentry/src/main/java/io/sentry/CheckInStatus.java b/sentry/src/main/java/io/sentry/CheckInStatus.java index 0f0b47b4a4..42ed7bac54 100644 --- a/sentry/src/main/java/io/sentry/CheckInStatus.java +++ b/sentry/src/main/java/io/sentry/CheckInStatus.java @@ -1,11 +1,9 @@ package io.sentry; import java.util.Locale; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** Status of a CheckIn */ -@ApiStatus.Experimental public enum CheckInStatus { IN_PROGRESS, OK, diff --git a/sentry/src/main/java/io/sentry/ExternalOptions.java b/sentry/src/main/java/io/sentry/ExternalOptions.java index 4382477d5a..49e5acc48f 100644 --- a/sentry/src/main/java/io/sentry/ExternalOptions.java +++ b/sentry/src/main/java/io/sentry/ExternalOptions.java @@ -437,12 +437,10 @@ public void setSendDefaultPii(final @Nullable Boolean sendDefaultPii) { this.sendDefaultPii = sendDefaultPii; } - @ApiStatus.Experimental public void setIgnoredCheckIns(final @Nullable List ignoredCheckIns) { this.ignoredCheckIns = ignoredCheckIns; } - @ApiStatus.Experimental public @Nullable List getIgnoredCheckIns() { return ignoredCheckIns; } @@ -482,12 +480,10 @@ public void setForceInit(final @Nullable Boolean forceInit) { return forceInit; } - @ApiStatus.Experimental public @Nullable SentryOptions.Cron getCron() { return cron; } - @ApiStatus.Experimental public void setCron(final @Nullable SentryOptions.Cron cron) { this.cron = cron; } diff --git a/sentry/src/main/java/io/sentry/HubScopesWrapper.java b/sentry/src/main/java/io/sentry/HubScopesWrapper.java index f6e2b39409..4430402af0 100644 --- a/sentry/src/main/java/io/sentry/HubScopesWrapper.java +++ b/sentry/src/main/java/io/sentry/HubScopesWrapper.java @@ -353,7 +353,6 @@ public void reportFullyDisplayed() { return scopes.getBaggage(); } - @ApiStatus.Experimental @Override public @NotNull SentryId captureCheckIn(@NotNull CheckIn checkIn) { return scopes.captureCheckIn(checkIn); diff --git a/sentry/src/main/java/io/sentry/IScopes.java b/sentry/src/main/java/io/sentry/IScopes.java index 7633bf2d57..0fbc100859 100644 --- a/sentry/src/main/java/io/sentry/IScopes.java +++ b/sentry/src/main/java/io/sentry/IScopes.java @@ -727,7 +727,6 @@ TransactionContext continueTrace( @Nullable BaggageHeader getBaggage(); - @ApiStatus.Experimental @NotNull SentryId captureCheckIn(final @NotNull CheckIn checkIn); diff --git a/sentry/src/main/java/io/sentry/ISentryClient.java b/sentry/src/main/java/io/sentry/ISentryClient.java index 6efcca6309..c2bc05516f 100644 --- a/sentry/src/main/java/io/sentry/ISentryClient.java +++ b/sentry/src/main/java/io/sentry/ISentryClient.java @@ -301,7 +301,6 @@ SentryId captureProfileChunk( final @NotNull ProfileChunk profilingContinuousData, final @Nullable IScope scope); @NotNull - @ApiStatus.Experimental SentryId captureCheckIn(@NotNull CheckIn checkIn, @Nullable IScope scope, @Nullable Hint hint); void captureLog(@NotNull SentryLogEvent logEvent, @Nullable IScope scope); diff --git a/sentry/src/main/java/io/sentry/MonitorConfig.java b/sentry/src/main/java/io/sentry/MonitorConfig.java index 8cf02c54a5..f8258e4a78 100644 --- a/sentry/src/main/java/io/sentry/MonitorConfig.java +++ b/sentry/src/main/java/io/sentry/MonitorConfig.java @@ -4,11 +4,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -@ApiStatus.Experimental public final class MonitorConfig implements JsonUnknown, JsonSerializable { private @NotNull MonitorSchedule schedule; diff --git a/sentry/src/main/java/io/sentry/MonitorContexts.java b/sentry/src/main/java/io/sentry/MonitorContexts.java index 34838c3ea5..193d9ee5a6 100644 --- a/sentry/src/main/java/io/sentry/MonitorContexts.java +++ b/sentry/src/main/java/io/sentry/MonitorContexts.java @@ -6,11 +6,9 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -@ApiStatus.Experimental public final class MonitorContexts extends ConcurrentHashMap implements JsonSerializable { private static final long serialVersionUID = 3987329379811822556L; diff --git a/sentry/src/main/java/io/sentry/MonitorSchedule.java b/sentry/src/main/java/io/sentry/MonitorSchedule.java index ca4b7e5cda..438e039963 100644 --- a/sentry/src/main/java/io/sentry/MonitorSchedule.java +++ b/sentry/src/main/java/io/sentry/MonitorSchedule.java @@ -8,7 +8,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -@ApiStatus.Experimental public final class MonitorSchedule implements JsonUnknown, JsonSerializable { public static @NotNull MonitorSchedule crontab(final @NotNull String value) { diff --git a/sentry/src/main/java/io/sentry/MonitorScheduleType.java b/sentry/src/main/java/io/sentry/MonitorScheduleType.java index a1ec20c97e..ac168e3845 100644 --- a/sentry/src/main/java/io/sentry/MonitorScheduleType.java +++ b/sentry/src/main/java/io/sentry/MonitorScheduleType.java @@ -1,11 +1,9 @@ package io.sentry; import java.util.Locale; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** Type of a monitor schedule */ -@ApiStatus.Experimental public enum MonitorScheduleType { CRONTAB, INTERVAL; diff --git a/sentry/src/main/java/io/sentry/MonitorScheduleUnit.java b/sentry/src/main/java/io/sentry/MonitorScheduleUnit.java index 994d9c4be1..adfb0771fe 100644 --- a/sentry/src/main/java/io/sentry/MonitorScheduleUnit.java +++ b/sentry/src/main/java/io/sentry/MonitorScheduleUnit.java @@ -1,11 +1,9 @@ package io.sentry; import java.util.Locale; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** Time unit of a monitor schedule. */ -@ApiStatus.Experimental public enum MonitorScheduleUnit { MINUTE, HOUR, diff --git a/sentry/src/main/java/io/sentry/NoOpHub.java b/sentry/src/main/java/io/sentry/NoOpHub.java index 67a6ded5e5..c6b31c1a5c 100644 --- a/sentry/src/main/java/io/sentry/NoOpHub.java +++ b/sentry/src/main/java/io/sentry/NoOpHub.java @@ -307,7 +307,6 @@ public void reportFullyDisplayed() {} } @Override - @ApiStatus.Experimental public @NotNull SentryId captureCheckIn(final @NotNull CheckIn checkIn) { return SentryId.EMPTY_ID; } diff --git a/sentry/src/main/java/io/sentry/NoOpSentryClient.java b/sentry/src/main/java/io/sentry/NoOpSentryClient.java index 904228b8a0..17e4becbc7 100644 --- a/sentry/src/main/java/io/sentry/NoOpSentryClient.java +++ b/sentry/src/main/java/io/sentry/NoOpSentryClient.java @@ -72,7 +72,6 @@ public SentryId captureEnvelope(@NotNull SentryEnvelope envelope, @Nullable Hint } @Override - @ApiStatus.Experimental public @NotNull SentryId captureCheckIn( @NotNull CheckIn checkIn, @Nullable IScope scope, @Nullable Hint hint) { return SentryId.EMPTY_ID; diff --git a/sentry/src/main/java/io/sentry/Scopes.java b/sentry/src/main/java/io/sentry/Scopes.java index 4b16d71b93..77b9b94731 100644 --- a/sentry/src/main/java/io/sentry/Scopes.java +++ b/sentry/src/main/java/io/sentry/Scopes.java @@ -1155,7 +1155,6 @@ public void reportFullyDisplayed() { } @Override - @ApiStatus.Experimental public @NotNull SentryId captureCheckIn(final @NotNull CheckIn checkIn) { SentryId sentryId = SentryId.EMPTY_ID; if (!isEnabled()) { diff --git a/sentry/src/main/java/io/sentry/Sentry.java b/sentry/src/main/java/io/sentry/Sentry.java index 8c43b83b71..ec61bb7ea3 100644 --- a/sentry/src/main/java/io/sentry/Sentry.java +++ b/sentry/src/main/java/io/sentry/Sentry.java @@ -1286,7 +1286,6 @@ public interface OptionsConfiguration { return getCurrentScopes().getBaggage(); } - @ApiStatus.Experimental public static @NotNull SentryId captureCheckIn(final @NotNull CheckIn checkIn) { return getCurrentScopes().captureCheckIn(checkIn); } diff --git a/sentry/src/main/java/io/sentry/SentryClient.java b/sentry/src/main/java/io/sentry/SentryClient.java index 998f1c5d8d..322f41ba98 100644 --- a/sentry/src/main/java/io/sentry/SentryClient.java +++ b/sentry/src/main/java/io/sentry/SentryClient.java @@ -998,7 +998,6 @@ public void captureSession(final @NotNull Session session, final @Nullable Hint } @Override - @ApiStatus.Experimental public @NotNull SentryId captureCheckIn( @NotNull CheckIn checkIn, final @Nullable IScope scope, @Nullable Hint hint) { if (hint == null) {