Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
* check-in.
*/
@ApiStatus.Internal
@ApiStatus.Experimental
@Open
public class SentryCheckInAdvice implements MethodInterceptor, EmbeddedValueResolverAware {
private final @NotNull IScopes scopes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -15,7 +14,6 @@

@Configuration(proxyBeanMethods = false)
@Open
@ApiStatus.Experimental
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
public class SentryCheckInAdviceConfiguration {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,7 +14,6 @@
/** AOP pointcut configuration for {@link SentryCheckIn}. */
@Configuration(proxyBeanMethods = false)
@Open
@ApiStatus.Experimental
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
public class SentryCheckInPointcutConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
* check-in.
*/
@ApiStatus.Internal
@ApiStatus.Experimental
@Open
public class SentryCheckInAdvice implements MethodInterceptor, EmbeddedValueResolverAware {
private final @NotNull IScopes scopes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -15,7 +14,6 @@

@Configuration(proxyBeanMethods = false)
@Open
@ApiStatus.Experimental
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
public class SentryCheckInAdviceConfiguration {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,7 +14,6 @@
/** AOP pointcut configuration for {@link SentryCheckIn}. */
@Configuration(proxyBeanMethods = false)
@Open
@ApiStatus.Experimental
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
public class SentryCheckInPointcutConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
* check-in.
*/
@ApiStatus.Internal
@ApiStatus.Experimental
@Open
public class SentryCheckInAdvice implements MethodInterceptor, EmbeddedValueResolverAware {
private final @NotNull IScopes scopes;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -15,7 +14,6 @@

@Configuration(proxyBeanMethods = false)
@Open
@ApiStatus.Experimental
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
public class SentryCheckInAdviceConfiguration {

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -15,7 +14,6 @@
/** AOP pointcut configuration for {@link SentryCheckIn}. */
@Configuration(proxyBeanMethods = false)
@Open
@ApiStatus.Experimental
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
public class SentryCheckInPointcutConfiguration {

Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/CheckIn.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 0 additions & 2 deletions sentry/src/main/java/io/sentry/CheckInStatus.java
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 0 additions & 4 deletions sentry/src/main/java/io/sentry/ExternalOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -437,12 +437,10 @@ public void setSendDefaultPii(final @Nullable Boolean sendDefaultPii) {
this.sendDefaultPii = sendDefaultPii;
}

@ApiStatus.Experimental
public void setIgnoredCheckIns(final @Nullable List<String> ignoredCheckIns) {
this.ignoredCheckIns = ignoredCheckIns;
}

@ApiStatus.Experimental
public @Nullable List<String> getIgnoredCheckIns() {
return ignoredCheckIns;
}
Expand Down Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/HubScopesWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ public void reportFullyDisplayed() {
return scopes.getBaggage();
}

@ApiStatus.Experimental
@Override
public @NotNull SentryId captureCheckIn(@NotNull CheckIn checkIn) {
return scopes.captureCheckIn(checkIn);
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/IScopes.java
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,6 @@ TransactionContext continueTrace(
@Nullable
BaggageHeader getBaggage();

@ApiStatus.Experimental
@NotNull
SentryId captureCheckIn(final @NotNull CheckIn checkIn);

Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/ISentryClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions sentry/src/main/java/io/sentry/MonitorConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions sentry/src/main/java/io/sentry/MonitorContexts.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object>
implements JsonSerializable {
private static final long serialVersionUID = 3987329379811822556L;
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/MonitorSchedule.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 0 additions & 2 deletions sentry/src/main/java/io/sentry/MonitorScheduleType.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 0 additions & 2 deletions sentry/src/main/java/io/sentry/MonitorScheduleUnit.java
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/NoOpHub.java
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ public void reportFullyDisplayed() {}
}

@Override
@ApiStatus.Experimental
public @NotNull SentryId captureCheckIn(final @NotNull CheckIn checkIn) {
return SentryId.EMPTY_ID;
}
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/NoOpSentryClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/Scopes.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/Sentry.java
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,6 @@ public interface OptionsConfiguration<T extends SentryOptions> {
return getCurrentScopes().getBaggage();
}

@ApiStatus.Experimental
public static @NotNull SentryId captureCheckIn(final @NotNull CheckIn checkIn) {
return getCurrentScopes().captureCheckIn(checkIn);
}
Expand Down
1 change: 0 additions & 1 deletion sentry/src/main/java/io/sentry/SentryClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading