ref(options): Return strings from ignored filter getters

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Breaking Changes
 
+- `SentryOptions.getIgnoredErrors()`, `getIgnoredTransactions()`, `getIgnoredCheckIns()` and `getIgnoredSpanOrigins()` now return `List<String>` instead of `List<FilterString>`, matching their setters ([#6489](https://github.com/getsentry/sentry-java/pull/6489))
 - The SDK is now compiled for Java 11 instead of Java 8. JVM applications need Java 11 or newer ([#6459](https://github.com/getsentry/sentry-java/pull/6459))
 - Default trace context status to `ok` when an active span has no explicit status ([#6418](https://github.com/getsentry/sentry-java/pull/6418))
 - Remove the deprecated user feedback APIs ([#6337](https://github.com/getsentry/sentry-java/pull/6337))

sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt

@@ -5,7 +5,6 @@ import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.common.truth.Truth.assertThat
-import io.sentry.FilterString
 import io.sentry.HttpBodyType
 import io.sentry.ILogger
 import io.sentry.KeyValueCollectionBehavior
@@ -2083,7 +2082,7 @@ class ManifestMetadataReaderTest {
 
     // Assert
     assertEquals(
-      listOf(FilterString("Some error"), FilterString("Another .*")),
+      listOf("Some error", "Another .*"),
       fixture.options.ignoredErrors,
     )
   }

sentry-apollo-3/src/main/java/io/sentry/apollo3/SentryApollo3HttpInterceptor.kt

@@ -148,7 +148,7 @@ constructor(
   }
 
   private fun isIgnored(): Boolean =
-    SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN)
+    SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN)
 
   private fun removeSentryInternalHeaders(headers: List<HttpHeader>): List<HttpHeader> =
     headers.filterNot {

sentry-apollo-4/src/main/java/io/sentry/apollo4/SentryApollo4HttpInterceptor.kt

@@ -148,7 +148,7 @@ constructor(
   }
 
   private fun isIgnored(): Boolean =
-    SpanUtils.isIgnored(scopes.getOptions().ignoredSpanOrigins, TRACE_ORIGIN)
+    SpanUtils.isIgnored(scopes.getOptions().ignoredSpanOriginFilters, TRACE_ORIGIN)
 
   private fun removeSentryInternalHeaders(headers: List<HttpHeader>): List<HttpHeader> =
     headers.filterNot { header ->

sentry-apollo-5/src/main/java/io/sentry/apollo5/SentryApollo5HttpInterceptor.kt

@@ -152,7 +152,7 @@ constructor(
   }
 
   private fun isIgnored(): Boolean =
-    SpanUtils.isIgnored(scopes.getOptions().ignoredSpanOrigins, TRACE_ORIGIN)
+    SpanUtils.isIgnored(scopes.getOptions().ignoredSpanOriginFilters, TRACE_ORIGIN)
 
   private fun startChild(
     request: HttpRequest,

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

@@ -164,7 +164,7 @@ class SentryApolloInterceptor(
   }
 
   private fun isIgnored(): Boolean =
-    SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN)
+    SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN)
 
   private fun startChild(request: InterceptorRequest, activeSpan: ISpan): ISpan {
     val operation = request.operation.name().name()

sentry-kafka/src/main/java/io/sentry/kafka/SentryKafkaConsumerTracing.java

@@ -131,7 +131,7 @@ private static <T extends Throwable> void throwUnchecked(final @NotNull Throwabl
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private <K, V> @Nullable ITransaction startTransaction(

sentry-kafka/src/main/java/io/sentry/kafka/SentryKafkaProducer.java

@@ -209,7 +209,7 @@ private void finishWithError(final @NotNull ISpan span, final @NotNull Throwable
     }
 
     private boolean isIgnored() {
-      return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), traceOrigin);
+      return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), traceOrigin);
     }
 
     private void maybeInjectHeaders(final @NotNull Headers headers, final @Nullable ISpan span) {

sentry-ktor-client/src/main/java/io/sentry/ktorClient/SentryKtorClientPlugin.kt

@@ -125,7 +125,7 @@ public val SentryKtorClientPlugin: ClientPlugin<SentryKtorClientPluginConfig> =
 
       if (
         !SpanUtils.isIgnored(
-          effectiveScopes.options.getIgnoredSpanOrigins(),
+          effectiveScopes.options.getIgnoredSpanOriginFilters(),
           TRACE_ORIGIN,
         )
       ) {

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

@@ -234,7 +234,7 @@ public open class SentryOkHttpInterceptor(
   }
 
   private fun isIgnored(): Boolean =
-    SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN)
+    SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN)
 
   private fun sendBreadcrumb(
     request: Request,

sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java

@@ -175,7 +175,7 @@ public Response execute(final @NotNull Request request, final @NotNull Request.O
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private void addBreadcrumb(final @NotNull Request request, final @Nullable Response response) {

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelSpanFactory.java

@@ -67,7 +67,8 @@ public OtelSpanFactory() {
       final @NotNull SpanOptions spanOptions,
       final @NotNull SpanContext spanContext,
       final @Nullable ISpan parentSpan) {
-    if (SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), spanOptions.getOrigin())) {
+    if (SpanUtils.isIgnored(
+        scopes.getOptions().getIgnoredSpanOriginFilters(), spanOptions.getOrigin())) {
       return NoOpSpan.getInstance();
     }
 

sentry-spring-7/src/main/java/io/sentry/spring7/kafka/SentryKafkaRecordInterceptor.java

@@ -129,7 +129,7 @@ public void clearThreadState(final @NotNull Consumer<?, ?> consumer) {
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private @Nullable ConsumerRecord<K, V> delegateIntercept(

sentry-spring-7/src/main/java/io/sentry/spring7/tracing/SentrySpanClientHttpRequestInterceptor.java

@@ -126,7 +126,7 @@ private void maybeAddTracingHeaders(
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), traceOrigin);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), traceOrigin);
   }
 
   private void addBreadcrumb(

sentry-spring-7/src/main/java/io/sentry/spring7/tracing/SentrySpanClientWebRequestFilter.java

@@ -110,7 +110,7 @@ public SentrySpanClientWebRequestFilter(final @NotNull IScopes scopes) {
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private void addBreadcrumb(

sentry-spring-7/src/main/java/io/sentry/spring7/tracing/SentryTracingFilter.java

@@ -127,7 +127,7 @@ protected void doFilterInternal(
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private void doFilterWithTransaction(

sentry-spring-7/src/main/java/io/sentry/spring7/webflux/AbstractSentryWebFilter.java

@@ -66,7 +66,7 @@ && shouldTraceRequest(requestScopes, request)) {
   }
 
   private boolean isIgnored(final @NotNull IScopes scopes, final @NotNull String origin) {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), origin);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), origin);
   }
 
   protected void doFinally(

sentry-spring-boot-4/src/test/kotlin/io/sentry/spring/boot4/SentryAutoConfigurationTest.kt

@@ -4,7 +4,6 @@ import com.acme.MainBootClass
 import io.opentelemetry.api.OpenTelemetry
 import io.sentry.Breadcrumb
 import io.sentry.EventProcessor
-import io.sentry.FilterString
 import io.sentry.Hint
 import io.sentry.IContinuousProfiler
 import io.sentry.IProfileConverter
@@ -279,12 +278,9 @@ class SentryAutoConfigurationTest {
           .containsOnly("localhost", "^(http|https)://api\\..*\$")
         assertThat(options.isEnabled).isEqualTo(false)
         assertThat(options.isSendModules).isEqualTo(false)
-        assertThat(options.ignoredCheckIns)
-          .containsOnly(FilterString("slug1"), FilterString("slugB"))
-        assertThat(options.ignoredErrors)
-          .containsOnly(FilterString("Some error"), FilterString("Another .*"))
-        assertThat(options.ignoredTransactions)
-          .containsOnly(FilterString("transactionName1"), FilterString("transactionNameB"))
+        assertThat(options.ignoredCheckIns).containsOnly("slug1", "slugB")
+        assertThat(options.ignoredErrors).containsOnly("Some error", "Another .*")
+        assertThat(options.ignoredTransactions).containsOnly("transactionName1", "transactionNameB")
         assertThat(options.isEnableBackpressureHandling).isEqualTo(false)
         assertThat(options.isEnableDatabaseTransactionTracing).isEqualTo(true)
         assertThat(options.isEnableCacheTracing).isEqualTo(true)

sentry-spring-boot-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt

@@ -5,7 +5,6 @@ import io.opentelemetry.api.OpenTelemetry
 import io.sentry.Breadcrumb
 import io.sentry.DataCategory
 import io.sentry.EventProcessor
-import io.sentry.FilterString
 import io.sentry.Hint
 import io.sentry.IContinuousProfiler
 import io.sentry.IProfileConverter
@@ -284,12 +283,9 @@ class SentryAutoConfigurationTest {
           .containsOnly("localhost", "^(http|https)://api\\..*\$")
         assertThat(options.isEnabled).isEqualTo(false)
         assertThat(options.isSendModules).isEqualTo(false)
-        assertThat(options.ignoredCheckIns)
-          .containsOnly(FilterString("slug1"), FilterString("slugB"))
-        assertThat(options.ignoredErrors)
-          .containsOnly(FilterString("Some error"), FilterString("Another .*"))
-        assertThat(options.ignoredTransactions)
-          .containsOnly(FilterString("transactionName1"), FilterString("transactionNameB"))
+        assertThat(options.ignoredCheckIns).containsOnly("slug1", "slugB")
+        assertThat(options.ignoredErrors).containsOnly("Some error", "Another .*")
+        assertThat(options.ignoredTransactions).containsOnly("transactionName1", "transactionNameB")
         assertThat(options.isEnableBackpressureHandling).isEqualTo(false)
         assertThat(options.isEnableDatabaseTransactionTracing).isEqualTo(true)
         assertThat(options.isForceInit).isEqualTo(true)

sentry-spring-boot/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt

@@ -5,7 +5,6 @@ import io.opentelemetry.api.OpenTelemetry
 import io.sentry.Breadcrumb
 import io.sentry.DataCategory
 import io.sentry.EventProcessor
-import io.sentry.FilterString
 import io.sentry.Hint
 import io.sentry.IContinuousProfiler
 import io.sentry.IProfileConverter
@@ -282,12 +281,9 @@ class SentryAutoConfigurationTest {
           .containsOnly("localhost", "^(http|https)://api\\..*\$")
         assertThat(options.isEnabled).isEqualTo(false)
         assertThat(options.isSendModules).isEqualTo(false)
-        assertThat(options.ignoredCheckIns)
-          .containsOnly(FilterString("slug1"), FilterString("slugB"))
-        assertThat(options.ignoredErrors)
-          .containsOnly(FilterString("Some error"), FilterString("Another .*"))
-        assertThat(options.ignoredTransactions)
-          .containsOnly(FilterString("transactionName1"), FilterString("transactionNameB"))
+        assertThat(options.ignoredCheckIns).containsOnly("slug1", "slugB")
+        assertThat(options.ignoredErrors).containsOnly("Some error", "Another .*")
+        assertThat(options.ignoredTransactions).containsOnly("transactionName1", "transactionNameB")
         assertThat(options.isEnableBackpressureHandling).isEqualTo(false)
         assertThat(options.isEnableDatabaseTransactionTracing).isEqualTo(true)
         assertThat(options.isForceInit).isEqualTo(true)

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/kafka/SentryKafkaRecordInterceptor.java

@@ -129,7 +129,7 @@ public void clearThreadState(final @NotNull Consumer<?, ?> consumer) {
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private @Nullable ConsumerRecord<K, V> delegateIntercept(

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientHttpRequestInterceptor.java

@@ -126,7 +126,7 @@ private void maybeAddTracingHeaders(
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), traceOrigin);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), traceOrigin);
   }
 
   private void addBreadcrumb(

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentrySpanClientWebRequestFilter.java

@@ -110,7 +110,7 @@ public SentrySpanClientWebRequestFilter(final @NotNull IScopes scopes) {
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private void addBreadcrumb(

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/tracing/SentryTracingFilter.java

@@ -127,7 +127,7 @@ protected void doFilterInternal(
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private void doFilterWithTransaction(

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/webflux/AbstractSentryWebFilter.java

@@ -66,7 +66,7 @@ && shouldTraceRequest(requestScopes, request)) {
   }
 
   private boolean isIgnored(final @NotNull IScopes scopes, final @NotNull String origin) {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), origin);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), origin);
   }
 
   protected void doFinally(

sentry-spring/src/main/java/io/sentry/spring/kafka/SentryKafkaRecordInterceptor.java

@@ -135,7 +135,7 @@ public void clearThreadState(final @NotNull Consumer<?, ?> consumer) {
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private @Nullable ConsumerRecord<K, V> delegateIntercept(

sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientHttpRequestInterceptor.java

@@ -118,7 +118,7 @@ private void maybeAddTracingHeaders(
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private void addBreadcrumb(

sentry-spring/src/main/java/io/sentry/spring/tracing/SentrySpanClientWebRequestFilter.java

@@ -107,7 +107,7 @@ private ClientRequest maybeAddHeaders(
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private void addBreadcrumb(

sentry-spring/src/main/java/io/sentry/spring/tracing/SentryTracingFilter.java

@@ -126,7 +126,7 @@ protected void doFilterInternal(
   }
 
   private boolean isIgnored() {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private void doFilterWithTransaction(

sentry-spring/src/main/java/io/sentry/spring/webflux/SentryWebFilter.java

@@ -110,7 +110,7 @@ isTracingEnabled && shouldTraceRequest(requestScopes, request)
   }
 
   private boolean isIgnored(final @NotNull IScopes scopes) {
-    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOrigins(), TRACE_ORIGIN);
+    return SpanUtils.isIgnored(scopes.getOptions().getIgnoredSpanOriginFilters(), TRACE_ORIGIN);
   }
 
   private boolean shouldTraceRequest(

sentry/api/sentry.api

@@ -3551,10 +3551,14 @@ public class io/sentry/SentryOptions : io/sentry/transport/RateLimiterConfig {
 	public fun getGestureTargetLocators ()Ljava/util/List;
 	public fun getHostnameCache ()Lio/sentry/HostnameCache;
 	public fun getIdleTimeout ()Ljava/lang/Long;
+	public fun getIgnoredCheckInFilters ()Ljava/util/List;
 	public fun getIgnoredCheckIns ()Ljava/util/List;
+	public fun getIgnoredErrorFilters ()Ljava/util/List;
 	public fun getIgnoredErrors ()Ljava/util/List;
 	public fun getIgnoredExceptionsForType ()Ljava/util/Set;
+	public fun getIgnoredSpanOriginFilters ()Ljava/util/List;
 	public fun getIgnoredSpanOrigins ()Ljava/util/List;
+	public fun getIgnoredTransactionFilters ()Ljava/util/List;
 	public fun getIgnoredTransactions ()Ljava/util/List;
 	public fun getInAppExcludes ()Ljava/util/List;
 	public fun getInAppIncludes ()Ljava/util/List;

sentry/src/main/java/io/sentry/Scopes.java

@@ -885,7 +885,7 @@ public void flush(long timeoutMillis) {
               "Instance is disabled and this 'startTransaction' returns a no-op.");
       transaction = NoOpTransaction.getInstance();
     } else if (SpanUtils.isIgnored(
-        getOptions().getIgnoredSpanOrigins(), transactionContext.getOrigin())) {
+        getOptions().getIgnoredSpanOriginFilters(), transactionContext.getOrigin())) {
       getOptions()
           .getLogger()
           .log(

sentry/src/main/java/io/sentry/SentryClient.java

@@ -128,7 +128,7 @@ private boolean shouldApplyScopeData(final @NotNull CheckIn event, final @NotNul
         return SentryId.EMPTY_ID;
       }
 
-      if (ErrorUtils.isIgnored(options.getIgnoredErrors(), event)) {
+      if (ErrorUtils.isIgnored(options.getIgnoredErrorFilters(), event)) {
         options
             .getLogger()
             .log(
@@ -1006,7 +1006,8 @@ public void captureSession(final @NotNull Session session, final @Nullable Hint
         .getLogger()
         .log(SentryLevel.DEBUG, "Capturing transaction: %s", transaction.getEventId());
 
-    if (TracingUtils.isIgnored(options.getIgnoredTransactions(), transaction.getTransaction())) {
+    if (TracingUtils.isIgnored(
+        options.getIgnoredTransactionFilters(), transaction.getTransaction())) {
       options
           .getLogger()
           .log(
@@ -1165,7 +1166,7 @@ public void captureSession(final @NotNull Session session, final @Nullable Hint
       checkIn.setRelease(options.getRelease());
     }
 
-    if (CheckInUtils.isIgnored(options.getIgnoredCheckIns(), checkIn.getMonitorSlug())) {
+    if (CheckInUtils.isIgnored(options.getIgnoredCheckInFilters(), checkIn.getMonitorSlug())) {
       options
           .getLogger()
           .log(