Merge branch 'main' into feat/profiling-remove-vendored-code

# Conflicts:
#	CHANGELOG.md

Author: lbloder

.craft.yml

@@ -64,3 +64,4 @@ targets:
       maven:io.sentry:sentry-apollo-4:
       maven:io.sentry:sentry-reactor:
       maven:io.sentry:sentry-ktor-client:
+      maven:io.sentry:sentry-async-profiler:

.cursor/rules/feature_flags.mdc

@@ -0,0 +1,24 @@
+---
+alwaysApply: false
+description: Feature Flags
+---
+# Java SDK Feature Flags
+
+There is a scope based and a span based API for tracking feature flag evaluations.
+
+## Scope Based API
+
+The `addFeatureFlag` method can be used to track feature flag evaluations. It exists on `Sentry` static API as well as `IScopes` and `IScope`.
+
+The `maxFeatureFlags` option controls how many flags are tracked per scope and also how many are sent to Sentry as part of events.
+Scope based feature flags can also be disabled by setting the value to 0. Defaults to 100 feature flag evaluations.
+
+Order of feature flag evaluations is important as we only keep track of the last {maxFeatureFlag} items.
+
+When a feature flag evluation with the same name is added, the previous one is removed and the new one is stored so that it'll be dropped last.
+
+When sending out an error event, feature flag buffers from all three scope types (global, isolation and current scope) are merged, chosing the newest {maxFeatureFlag} entries across all scope types. Feature flags are sent as part of the `flags` context.
+
+## Span Based API
+
+tbd

.cursor/rules/overview_dev.mdc

@@ -34,6 +34,14 @@ Use the `fetch_rules` tool to include these rules when working on specific areas
   - Rate limiting, cache rotation
   - Android vs JVM caching differences
 
+- **`feature_flags`**: Use when working with:
+  - Feature flag tracking and evaluation
+  - `addFeatureFlag()`, `getFeatureFlags()` methods
+  - `FeatureFlagBuffer`, `FeatureFlag` protocol
+  - `maxFeatureFlags` option and buffer management
+  - Feature flag merging across scope types
+  - Scope-based vs span-based feature flag APIs
+
 ### Integration & Infrastructure
 - **`opentelemetry`**: Use when working with:
   - OpenTelemetry modules (`sentry-opentelemetry-*`)
@@ -63,3 +71,4 @@ Use the `fetch_rules` tool to include these rules when working on specific areas
    - new module/integration/sample → `new_module`
    - Cache/offline/network → `offline`
    - System test/e2e/sample → `e2e_tests`
+   - Feature flag/addFeatureFlag/flag evaluation → `feature_flags`

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ### Features
 
+- Add feature flags API ([#4812](https://github.com/getsentry/sentry-java/pull/4812))
+  - You may now keep track of your feature flag evaluations and have them show up in Sentry.
+  - You may use top level API (`Sentry.addFeatureFlag("my-feature-flag", true);`) or `IScope` and `IScopes` API
+  - Feature flag evaluations tracked on scope(s) will be added to any errors reported to Sentry.
+  - The SDK keeps the latest 100 evaluations from scope(s), replacing old entries as new evaluations are added.
 - Remove vendored code and upgrade to async profiler 4.2 ([#4856](https://github.com/getsentry/sentry-java/pull/4856))
   - This adds support for JDK 23+
 

sentry-samples/sentry-samples-console-opentelemetry-noagent/src/main/java/io/sentry/samples/console/Main.java

@@ -61,6 +61,8 @@ public static void main(String[] args) throws InterruptedException {
     // Only data added to the scope on `configureScope` above is included.
     Sentry.captureMessage("Some warning!", SentryLevel.WARNING);
 
+    Sentry.addFeatureFlag("my-feature-flag", true);
+
     // Sending exception:
     Exception exception = new RuntimeException("Some error!");
     Sentry.captureException(exception);

sentry-samples/sentry-samples-console-opentelemetry-noagent/src/test/kotlin/sentry/systemtest/ConsoleApplicationSystemTest.kt

@@ -55,7 +55,7 @@ class ConsoleApplicationSystemTest {
     // Verify we received the RuntimeException
     testHelper.ensureErrorReceived { event ->
       event.exceptions?.any { ex -> ex.type == "RuntimeException" && ex.value == "Some error!" } ==
-        true
+        true && testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
     }
 
     // Verify we received the detailed event with fingerprint

sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java

@@ -126,6 +126,8 @@ public static void main(String[] args) throws InterruptedException {
     // Only data added to the scope on `configureScope` above is included.
     Sentry.captureMessage("Some warning!", SentryLevel.WARNING);
 
+    Sentry.addFeatureFlag("my-feature-flag", true);
+
     // Sending exception:
     Exception exception = new RuntimeException("Some error!");
     Sentry.captureException(exception);

sentry-samples/sentry-samples-console/src/test/kotlin/io/sentry/systemtest/ConsoleApplicationSystemTest.kt

@@ -51,7 +51,7 @@ class ConsoleApplicationSystemTest {
     // Verify we received the RuntimeException
     testHelper.ensureErrorReceived { event ->
       event.exceptions?.any { ex -> ex.type == "RuntimeException" && ex.value == "Some error!" } ==
-        true
+        true && testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
     }
 
     // Verify we received the detailed event with fingerprint

sentry-samples/sentry-samples-jul/src/main/java/io/sentry/samples/jul/Main.java

@@ -1,5 +1,6 @@
 package io.sentry.samples.jul;
 
+import io.sentry.Sentry;
 import java.util.UUID;
 import java.util.logging.Level;
 import java.util.logging.LogManager;
@@ -22,6 +23,10 @@ public static void main(String[] args) throws Exception {
     MDC.put("userId", UUID.randomUUID().toString());
     MDC.put("requestId", UUID.randomUUID().toString());
 
+    Sentry.addFeatureFlag("my-feature-flag", true);
+
+    LOGGER.warning("important warning");
+
     // logging arguments are converted to Sentry Event parameters
     LOGGER.log(Level.INFO, "User has made a purchase of product: %d", 445);
 

sentry-samples/sentry-samples-jul/src/test/kotlin/io/sentry/systemtest/ConsoleApplicationSystemTest.kt

@@ -57,6 +57,11 @@ class ConsoleApplicationSystemTest {
       } != null
     }
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.message == "important warning" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureLogsReceived { logs, _ ->
       testHelper.doesContainLogWithBody(logs, "User has made a purchase of product: 445") &&
         testHelper.doesContainLogWithBody(logs, "Something went wrong")