Merge branch 'main' into rz/feat/attach-raw-tombstone

romtsn · web-flow · commit dd089bc98168 · 2026-05-20T11:36:30.000+02:00
diff --git a/.craft.yml b/.craft.yml
@@ -42,16 +42,20 @@ targets:
       maven:io.sentry:sentry-bom:
       maven:io.sentry:sentry-openfeign:
       maven:io.sentry:sentry-openfeature:
+      maven:io.sentry:sentry-launchdarkly-android:
+      maven:io.sentry:sentry-launchdarkly-server:
       maven:io.sentry:sentry-opentelemetry-agent:
       maven:io.sentry:sentry-opentelemetry-agentcustomization:
       maven:io.sentry:sentry-opentelemetry-agentless:
       maven:io.sentry:sentry-opentelemetry-agentless-spring:
       maven:io.sentry:sentry-opentelemetry-bootstrap:
       maven:io.sentry:sentry-opentelemetry-core:
-#      maven:io.sentry:sentry-opentelemetry-otlp:
-#      maven:io.sentry:sentry-opentelemetry-otlp-spring:
+      maven:io.sentry:sentry-opentelemetry-otlp:
+      maven:io.sentry:sentry-opentelemetry-otlp-spring:
+      maven:io.sentry:sentry-kafka:
       maven:io.sentry:sentry-apollo:
       maven:io.sentry:sentry-jdbc:
+      maven:io.sentry:sentry-jcache:
       maven:io.sentry:sentry-graphql:
       maven:io.sentry:sentry-graphql-22:
       maven:io.sentry:sentry-graphql-core:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Add option to attach raw tombstone protobuf on native crash events ([#5446](https://github.com/getsentry/sentry-java/pull/5446))
   - Enable via `options.isAttachRawTombstone = true` or manifest: `<meta-data android:name="io.sentry.tombstone.attach-raw" android:value="true" />`
+- Add API to clear feature flags from scopes ([#5426](https://github.com/getsentry/sentry-java/pull/5426))
 - Add support to configure reporting historical ANRs via `AndroidManifest.xml` using the  `io.sentry.anr.report-historical` attribute ([#5387](https://github.com/getsentry/sentry-java/pull/5387))
 
 ### Dependencies
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
@@ -274,6 +274,7 @@ public final class io/sentry/CombinedScopeView : io/sentry/IScope {
 	public fun clear ()V
 	public fun clearAttachments ()V
 	public fun clearBreadcrumbs ()V
+	public fun clearFeatureFlags ()V
 	public fun clearSession ()V
 	public fun clearTransaction ()V
 	public fun clone ()Lio/sentry/IScope;
@@ -904,6 +905,7 @@ public abstract interface class io/sentry/IScope {
 	public abstract fun clear ()V
 	public abstract fun clearAttachments ()V
 	public abstract fun clearBreadcrumbs ()V
+	public abstract fun clearFeatureFlags ()V
 	public abstract fun clearSession ()V
 	public abstract fun clearTransaction ()V
 	public abstract fun clone ()Lio/sentry/IScope;
@@ -1718,6 +1720,7 @@ public final class io/sentry/NoOpScope : io/sentry/IScope {
 	public fun clear ()V
 	public fun clearAttachments ()V
 	public fun clearBreadcrumbs ()V
+	public fun clearFeatureFlags ()V
 	public fun clearSession ()V
 	public fun clearTransaction ()V
 	public fun clone ()Lio/sentry/IScope;
@@ -2404,6 +2407,7 @@ public final class io/sentry/Scope : io/sentry/IScope {
 	public fun clear ()V
 	public fun clearAttachments ()V
 	public fun clearBreadcrumbs ()V
+	public fun clearFeatureFlags ()V
 	public fun clearSession ()V
 	public fun clearTransaction ()V
 	public fun clone ()Lio/sentry/IScope;
@@ -5042,6 +5046,7 @@ public final class io/sentry/exception/SentryHttpClientException : java/lang/Exc
 
 public final class io/sentry/featureflags/FeatureFlagBuffer : io/sentry/featureflags/IFeatureFlagBuffer {
 	public fun add (Ljava/lang/String;Ljava/lang/Boolean;)V
+	public fun clear ()V
 	public fun clone ()Lio/sentry/featureflags/IFeatureFlagBuffer;
 	public synthetic fun clone ()Ljava/lang/Object;
 	public static fun create (Lio/sentry/SentryOptions;)Lio/sentry/featureflags/IFeatureFlagBuffer;
@@ -5051,13 +5056,15 @@ public final class io/sentry/featureflags/FeatureFlagBuffer : io/sentry/featuref
 
 public abstract interface class io/sentry/featureflags/IFeatureFlagBuffer {
 	public abstract fun add (Ljava/lang/String;Ljava/lang/Boolean;)V
+	public abstract fun clear ()V
 	public abstract fun clone ()Lio/sentry/featureflags/IFeatureFlagBuffer;
 	public abstract fun getFeatureFlags ()Lio/sentry/protocol/FeatureFlags;
 }
 
 public final class io/sentry/featureflags/NoOpFeatureFlagBuffer : io/sentry/featureflags/IFeatureFlagBuffer {
 	public fun <init> ()V
 	public fun add (Ljava/lang/String;Ljava/lang/Boolean;)V
+	public fun clear ()V
 	public fun clone ()Lio/sentry/featureflags/IFeatureFlagBuffer;
 	public synthetic fun clone ()Ljava/lang/Object;
 	public fun getFeatureFlags ()Lio/sentry/protocol/FeatureFlags;
@@ -5066,6 +5073,7 @@ public final class io/sentry/featureflags/NoOpFeatureFlagBuffer : io/sentry/feat
 
 public final class io/sentry/featureflags/SpanFeatureFlagBuffer : io/sentry/featureflags/IFeatureFlagBuffer {
 	public fun add (Ljava/lang/String;Ljava/lang/Boolean;)V
+	public fun clear ()V
 	public fun clone ()Lio/sentry/featureflags/IFeatureFlagBuffer;
 	public synthetic fun clone ()Ljava/lang/Object;
 	public static fun create ()Lio/sentry/featureflags/IFeatureFlagBuffer;
diff --git a/sentry/src/main/java/io/sentry/CombinedScopeView.java b/sentry/src/main/java/io/sentry/CombinedScopeView.java
@@ -549,6 +549,11 @@ public void addFeatureFlag(final @Nullable String flag, final @Nullable Boolean
     }
   }
 
+  @Override
+  public void clearFeatureFlags() {
+    getDefaultWriteScope().clearFeatureFlags();
+  }
+
   @Override
   public @Nullable FeatureFlags getFeatureFlags() {
     return getFeatureFlagBuffer().getFeatureFlags();
diff --git a/sentry/src/main/java/io/sentry/IScope.java b/sentry/src/main/java/io/sentry/IScope.java
@@ -465,6 +465,8 @@ void setSpanContext(
 
   void addFeatureFlag(final @Nullable String flag, final @Nullable Boolean result);
 
+  void clearFeatureFlags();
+
   @ApiStatus.Internal
   @Nullable
   FeatureFlags getFeatureFlags();
diff --git a/sentry/src/main/java/io/sentry/NoOpScope.java b/sentry/src/main/java/io/sentry/NoOpScope.java
@@ -321,6 +321,9 @@ public void removeAttribute(@Nullable String key) {}
   @Override
   public void addFeatureFlag(final @Nullable String flag, final @Nullable Boolean result) {}
 
+  @Override
+  public void clearFeatureFlags() {}
+
   @Override
   public @Nullable FeatureFlags getFeatureFlags() {
     return null;
diff --git a/sentry/src/main/java/io/sentry/Scope.java b/sentry/src/main/java/io/sentry/Scope.java
@@ -574,6 +574,7 @@ public void clear() {
     eventProcessors.clear();
     clearTransaction();
     clearAttachments();
+    clearFeatureFlags();
   }
 
   /**
@@ -1211,6 +1212,11 @@ public void addFeatureFlag(final @Nullable String flag, final @Nullable Boolean
     featureFlags.add(flag, result);
   }
 
+  @Override
+  public void clearFeatureFlags() {
+    featureFlags.clear();
+  }
+
   @Override
   public @Nullable FeatureFlags getFeatureFlags() {
     return featureFlags.getFeatureFlags();
diff --git a/sentry/src/main/java/io/sentry/featureflags/FeatureFlagBuffer.java b/sentry/src/main/java/io/sentry/featureflags/FeatureFlagBuffer.java
@@ -69,6 +69,13 @@ public void add(final @Nullable String flag, final @Nullable Boolean result) {
     }
   }
 
+  @Override
+  public void clear() {
+    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+      flags.clear();
+    }
+  }
+
   @Override
   public @Nullable FeatureFlags getFeatureFlags() {
     List<FeatureFlag> featureFlags = new ArrayList<>();
diff --git a/sentry/src/main/java/io/sentry/featureflags/IFeatureFlagBuffer.java b/sentry/src/main/java/io/sentry/featureflags/IFeatureFlagBuffer.java
@@ -9,6 +9,8 @@
 public interface IFeatureFlagBuffer {
   void add(final @Nullable String flag, final @Nullable Boolean result);
 
+  void clear();
+
   @Nullable
   FeatureFlags getFeatureFlags();
 
diff --git a/sentry/src/main/java/io/sentry/featureflags/NoOpFeatureFlagBuffer.java b/sentry/src/main/java/io/sentry/featureflags/NoOpFeatureFlagBuffer.java
@@ -16,6 +16,9 @@ public static NoOpFeatureFlagBuffer getInstance() {
   @Override
   public void add(final @Nullable String flag, final @Nullable Boolean result) {}
 
+  @Override
+  public void clear() {}
+
   @Override
   public @Nullable FeatureFlags getFeatureFlags() {
     return null;
diff --git a/sentry/src/main/java/io/sentry/featureflags/SpanFeatureFlagBuffer.java b/sentry/src/main/java/io/sentry/featureflags/SpanFeatureFlagBuffer.java
@@ -48,6 +48,13 @@ public void add(final @Nullable String flag, final @Nullable Boolean result) {
     }
   }
 
+  @Override
+  public void clear() {
+    try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
+      flags = null;
+    }
+  }
+
   @Override
   public @Nullable FeatureFlags getFeatureFlags() {
     try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
diff --git a/sentry/src/test/java/io/sentry/ScopeTest.kt b/sentry/src/test/java/io/sentry/ScopeTest.kt
@@ -294,6 +294,7 @@ class ScopeTest {
     scope.setAttribute("some", "attribute")
     scope.addEventProcessor(eventProcessor())
     scope.addAttachment(Attachment("path"))
+    scope.addFeatureFlag("flag", true)
 
     scope.clear()
 
@@ -309,6 +310,7 @@ class ScopeTest {
     assertEquals(0, scope.extras.size)
     assertEquals(0, scope.eventProcessors.size)
     assertEquals(0, scope.attachments.size)
+    assertEquals(0, scope.featureFlags!!.values.size)
   }
 
   @Test
@@ -1155,6 +1157,18 @@ class ScopeTest {
     assertEquals(0, flags.values.size)
   }
 
+  @Test
+  fun `feature flags can be cleared`() {
+    val scope = Scope(SentryOptions.empty())
+
+    scope.addFeatureFlag("flag1", true)
+    scope.clearFeatureFlags()
+
+    val flags = scope.featureFlags
+    assertNotNull(flags)
+    assertEquals(0, flags.values.size)
+  }
+
   @Test
   fun `setAttribute stores attribute on scope`() {
     val scope = Scope(SentryOptions())
diff --git a/sentry/src/test/java/io/sentry/featureflags/FeatureFlagBufferTest.kt b/sentry/src/test/java/io/sentry/featureflags/FeatureFlagBufferTest.kt
@@ -33,6 +33,19 @@ class FeatureFlagBufferTest {
     assertFalse(featureFlagValues[1]!!.result)
   }
 
+  @Test
+  fun `clears values`() {
+    val buffer = FeatureFlagBuffer.create(SentryOptions().also { it.maxFeatureFlags = 2 })
+    buffer.add("a", true)
+    buffer.add("b", false)
+
+    buffer.clear()
+
+    val featureFlags = buffer.featureFlags
+    assertNotNull(featureFlags)
+    assertEquals(0, featureFlags.values.size)
+  }
+
   @Test
   fun `drops oldest entry when limit is reached`() {
     val buffer = FeatureFlagBuffer.create(SentryOptions().also { it.maxFeatureFlags = 2 })
diff --git a/sentry/src/test/java/io/sentry/featureflags/SpanFeatureFlagBufferTest.kt b/sentry/src/test/java/io/sentry/featureflags/SpanFeatureFlagBufferTest.kt
@@ -4,6 +4,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
 class SpanFeatureFlagBufferTest {
@@ -26,6 +27,17 @@ class SpanFeatureFlagBufferTest {
     assertFalse(featureFlagValues[1]!!.result)
   }
 
+  @Test
+  fun `clears values`() {
+    val buffer = SpanFeatureFlagBuffer.create()
+    buffer.add("a", true)
+    buffer.add("b", false)
+
+    buffer.clear()
+
+    assertNull(buffer.featureFlags)
+  }
+
   @Test
   fun `rejects new entries when limit is reached`() {
     val buffer = SpanFeatureFlagBuffer.create()

Original file line number	Diff line number	Diff line change
`@@ -549,6 +549,11 @@ public void addFeatureFlag(final @Nullable String flag, final @Nullable Boolean`
`549`	`549`	`}`
`550`	`550`	`}`
`551`	`551`
	`552`	`+ @Override`
	`553`	`+ public void clearFeatureFlags() {`
	`554`	`+ getDefaultWriteScope().clearFeatureFlags();`
	`555`	`+ }`
	`556`	`+`
`552`	`557`	`@Override`
`553`	`558`	`public @Nullable FeatureFlags getFeatureFlags() {`
`554`	`559`	`return getFeatureFlagBuffer().getFeatureFlags();`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,13 @@ public void add(final @Nullable String flag, final @Nullable Boolean result) {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ @Override`
	`73`	`+ public void clear() {`
	`74`	`+ try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {`
	`75`	`+ flags.clear();`
	`76`	`+ }`
	`77`	`+ }`
	`78`	`+`
`72`	`79`	`@Override`
`73`	`80`	`public @Nullable FeatureFlags getFeatureFlags() {`
`74`	`81`	`List<FeatureFlag> featureFlags = new ArrayList<>();`