Add scope based feature flags

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")

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

@@ -1,5 +1,6 @@
 package io.sentry.samples.log4j2;
 
+import io.sentry.Sentry;
 import java.util.UUID;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -19,6 +20,8 @@ public static void main(String[] args) {
     // ThreadContext tag not listed in log4j2.xml
     ThreadContext.put("context-tag", "context-tag-value");
 
+    Sentry.addFeatureFlag("my-feature-flag", true);
+
     // logging arguments are converted to Sentry Event parameters
     LOGGER.info("User has made a purchase of product: {}", 445);
     // because minimumEventLevel is set to WARN this raises an event

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

@@ -47,6 +47,11 @@ class ConsoleApplicationSystemTest {
         event.level?.name == "ERROR"
     }
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.message == "Important warning" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureErrorReceived { event ->
       event.breadcrumbs?.firstOrNull {
         it.message == "Hello Sentry!" && it.level == SentryLevel.DEBUG

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

@@ -1,5 +1,6 @@
 package io.sentry.samples.logback;
 
+import io.sentry.Sentry;
 import java.util.UUID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,6 +18,9 @@ public static void main(String[] args) {
     // MDC tag not listed in logback.xml
     MDC.put("context-tag", "context-tag-value");
 
+    Sentry.addFeatureFlag("my-feature-flag", true);
+    LOGGER.warn("important warning");
+
     // logging arguments are converted to Sentry Event parameters
     LOGGER.info("User has made a purchase of product: {}", 445);
 

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

@@ -53,6 +53,11 @@ class ConsoleApplicationSystemTest {
       } != null
     }
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.message == "important warning" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureErrorReceived { event ->
       event.breadcrumbs?.firstOrNull {
         it.message == "User has made a purchase of product: 445" && it.level == SentryLevel.INFO

sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/PersonController.java

@@ -26,6 +26,7 @@ Person person(@PathVariable("id") Long id) {
     Sentry.logger().warn("warn Sentry logging");
     Sentry.logger().error("error Sentry logging");
     Sentry.logger().info("hello %s %s", "there", "world!");
+    Sentry.addFeatureFlag("my-feature-flag", true);
     LOGGER.info("Loading person with id={}", id);
     if (id > 10L) {
       throw new IllegalArgumentException("Something went wrong [id=" + id + "]");

sentry-samples/sentry-samples-spring-7/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,11 @@ class PersonSystemTest {
     restClient.getPerson(11L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=11]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionHaveOp(transaction, "http.server")
     }

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/PersonController.java

@@ -36,6 +36,7 @@ Person person(@PathVariable Long id) {
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");
+      Sentry.addFeatureFlag("my-feature-flag", true);
       ISpan currentSpan = Sentry.getSpan();
       ISpan sentrySpan = currentSpan.startChild("spanCreatedThroughSentryApi");
       try {

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,16 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.formatted == "Trying person with id=1" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
         testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi")

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/PersonController.java

@@ -34,6 +34,7 @@ Person person(@PathVariable Long id) {
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");
+      Sentry.addFeatureFlag("my-feature-flag", true);
       ISpan currentSpan = Sentry.getSpan();
       ISpan sentrySpan = currentSpan.startChild("spanCreatedThroughSentryApi");
       try {

sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,16 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.formatted == "Trying person with id=1" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
         testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi")

sentry-samples/sentry-samples-spring-boot-4-webflux/src/main/java/io/sentry/samples/spring/boot4/PersonController.java

@@ -26,6 +26,7 @@ Person person(@PathVariable Long id) {
     Sentry.logger().warn("warn Sentry logging");
     Sentry.logger().error("error Sentry logging");
     Sentry.logger().info("hello %s %s", "there", "world!");
+    Sentry.addFeatureFlag("my-feature-flag", true);
     LOGGER.info("Loading person with id={}", id);
     throw new IllegalArgumentException("Something went wrong [id=" + id + "]");
   }

sentry-samples/sentry-samples-spring-boot-4-webflux/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,11 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionHaveOp(transaction, "http.server")
     }

sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/PersonController.java

@@ -29,6 +29,7 @@ Person person(@PathVariable Long id) {
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");
+      Sentry.addFeatureFlag("my-feature-flag", true);
       LOGGER.error("Trying person with id={}", id, new RuntimeException("error while loading"));
       throw new IllegalArgumentException("Something went wrong [id=" + id + "]");
     } finally {

sentry-samples/sentry-samples-spring-boot-4/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,16 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.formatted == "Trying person with id=1" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionHaveOp(transaction, "http.server")
     }

sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonController.java

@@ -36,6 +36,7 @@ Person person(@PathVariable Long id) {
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");
+      Sentry.addFeatureFlag("my-feature-flag", true);
       ISpan currentSpan = Sentry.getSpan();
       ISpan sentrySpan = currentSpan.startChild("spanCreatedThroughSentryApi");
       try {

sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,16 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.formatted == "Trying person with id=1" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
         testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi")

sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonController.java

@@ -34,6 +34,7 @@ Person person(@PathVariable Long id) {
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");
+      Sentry.addFeatureFlag("my-feature-flag", true);
       ISpan currentSpan = Sentry.getSpan();
       ISpan sentrySpan = currentSpan.startChild("spanCreatedThroughSentryApi");
       try {

sentry-samples/sentry-samples-spring-boot-jakarta-opentelemetry/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,16 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.formatted == "Trying person with id=1" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
         testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi")

sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonController.java

@@ -29,6 +29,7 @@ Person person(@PathVariable Long id) {
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");
+      Sentry.addFeatureFlag("my-feature-flag", true);
       LOGGER.error("Trying person with id={}", id, new RuntimeException("error while loading"));
       throw new IllegalArgumentException("Something went wrong [id=" + id + "]");
     } finally {

sentry-samples/sentry-samples-spring-boot-jakarta/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,16 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.formatted == "Trying person with id=1" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionHaveOp(transaction, "http.server")
     }

sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot/PersonController.java

@@ -36,6 +36,7 @@ Person person(@PathVariable Long id) {
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");
+      Sentry.addFeatureFlag("my-feature-flag", true);
       ISpan currentSpan = Sentry.getSpan();
       ISpan sentrySpan = currentSpan.startChild("spanCreatedThroughSentryApi");
       try {

sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,16 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.formatted == "Trying person with id=1" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
         testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi")

sentry-samples/sentry-samples-spring-boot-opentelemetry/src/main/java/io/sentry/samples/spring/boot/PersonController.java

@@ -34,6 +34,7 @@ Person person(@PathVariable Long id) {
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");
+      Sentry.addFeatureFlag("my-feature-flag", true);
       ISpan currentSpan = Sentry.getSpan();
       ISpan sentrySpan = currentSpan.startChild("spanCreatedThroughSentryApi");
       try {

sentry-samples/sentry-samples-spring-boot-opentelemetry/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,16 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      event.message?.formatted == "Trying person with id=1" &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughOtelApi") &&
         testHelper.doesTransactionContainSpanWithOp(transaction, "spanCreatedThroughSentryApi")

sentry-samples/sentry-samples-spring-boot-webflux-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/PersonController.java

@@ -26,6 +26,7 @@ Person person(@PathVariable Long id) {
     Sentry.logger().warn("warn Sentry logging");
     Sentry.logger().error("error Sentry logging");
     Sentry.logger().info("hello %s %s", "there", "world!");
+    Sentry.addFeatureFlag("my-feature-flag", true);
     LOGGER.info("Loading person with id={}", id);
     throw new IllegalArgumentException("Something went wrong [id=" + id + "]");
   }

sentry-samples/sentry-samples-spring-boot-webflux-jakarta/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt

@@ -20,6 +20,11 @@ class PersonSystemTest {
     restClient.getPerson(1L)
     assertEquals(500, restClient.lastKnownStatusCode)
 
+    testHelper.ensureErrorReceived { event ->
+      testHelper.doesEventHaveExceptionMessage(event, "Something went wrong [id=1]") &&
+        testHelper.doesEventHaveFlag(event, "my-feature-flag", true)
+    }
+
     testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
       testHelper.doesTransactionHaveOp(transaction, "http.server")
     }

sentry-samples/sentry-samples-spring-boot-webflux/src/main/java/io/sentry/samples/spring/boot/PersonController.java

@@ -26,6 +26,7 @@ Person person(@PathVariable Long id) {
     Sentry.logger().warn("warn Sentry logging");
     Sentry.logger().error("error Sentry logging");
     Sentry.logger().info("hello %s %s", "there", "world!");
+    Sentry.addFeatureFlag("my-feature-flag", true);
     LOGGER.info("Loading person with id={}", id);
     throw new IllegalArgumentException("Something went wrong [id=" + id + "]");
   }