feat(samples): [Global Attributes 6] Showcase scope attributes in all sample modules

CHANGELOG.md

@@ -34,6 +34,12 @@
     ```
 - The `ManifestMetaDataReader` now read the `DIST` ([#5107](https://github.com/getsentry/sentry-java/pull/5107))
 
+### Features
+
+- Support collections and arrays in log attribute type inference ([#5124](https://github.com/getsentry/sentry-java/pull/5124))
+- Add scope-level attributes API ([#5118](https://github.com/getsentry/sentry-java/pull/5118))
+- Automatically include scope attributes in logs and metrics ([#5120](https://github.com/getsentry/sentry-java/pull/5120))
+
 ### Fixes
 
 - Fix attribute type detection for `Long`, `Short`, `Byte`, `BigInteger`, `AtomicInteger`, and `AtomicLong` being incorrectly inferred as `double` instead of `integer` ([#5122](https://github.com/getsentry/sentry-java/pull/5122))

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

@@ -63,6 +63,8 @@ public static void main(String[] args) throws InterruptedException {
 
     Sentry.addFeatureFlag("my-feature-flag", true);
 
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
     captureMetrics();
 
     // Sending exception:

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

@@ -111,7 +111,9 @@ class ConsoleApplicationSystemTest {
     testHelper.ensureMetricsReceived { metricsEvents, sentryEnvelopeHeader ->
       testHelper.doesContainMetric(metricsEvents, "countMetric", "counter", 1.0) &&
         testHelper.doesContainMetric(metricsEvents, "gaugeMetric", "gauge", 5.0) &&
-        testHelper.doesContainMetric(metricsEvents, "distributionMetric", "distribution", 7.0)
+        testHelper.doesContainMetric(metricsEvents, "distributionMetric", "distribution", 7.0) &&
+        testHelper.doesMetricHaveAttribute(metricsEvents, "countMetric", "user.type", "admin") &&
+        testHelper.doesMetricHaveAttribute(metricsEvents, "countMetric", "feature.version", 2)
     }
   }
 }

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

@@ -128,6 +128,8 @@ public static void main(String[] args) throws InterruptedException {
 
     Sentry.addFeatureFlag("my-feature-flag", true);
 
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
     captureMetrics();
 
     // Sending exception:

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

@@ -106,7 +106,9 @@ class ConsoleApplicationSystemTest {
     testHelper.ensureMetricsReceived { metricsEvents, sentryEnvelopeHeader ->
       testHelper.doesContainMetric(metricsEvents, "countMetric", "counter", 1.0) &&
         testHelper.doesContainMetric(metricsEvents, "gaugeMetric", "gauge", 5.0) &&
-        testHelper.doesContainMetric(metricsEvents, "distributionMetric", "distribution", 7.0)
+        testHelper.doesContainMetric(metricsEvents, "distributionMetric", "distribution", 7.0) &&
+        testHelper.doesMetricHaveAttribute(metricsEvents, "countMetric", "user.type", "admin") &&
+        testHelper.doesMetricHaveAttribute(metricsEvents, "countMetric", "feature.version", 2)
     }
   }
 }

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

@@ -23,6 +23,9 @@ public static void main(String[] args) throws Exception {
     MDC.put("userId", UUID.randomUUID().toString());
     MDC.put("requestId", UUID.randomUUID().toString());
 
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
+    Sentry.setAttribute("debug.enabled", true);
     Sentry.addFeatureFlag("my-feature-flag", true);
 
     LOGGER.warning("important warning");

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

@@ -64,7 +64,20 @@ class ConsoleApplicationSystemTest {
 
     testHelper.ensureLogsReceived { logs, _ ->
       testHelper.doesContainLogWithBody(logs, "User has made a purchase of product: 445") &&
-        testHelper.doesContainLogWithBody(logs, "Something went wrong")
+        testHelper.doesContainLogWithBody(logs, "Something went wrong") &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "Something went wrong",
+          "user.type",
+          "admin",
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "Something went wrong",
+          "feature.version",
+          2,
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(logs, "Something went wrong", "debug.enabled", true)
     }
   }
 }

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

@@ -20,6 +20,9 @@ public static void main(String[] args) {
     // ThreadContext tag not listed in log4j2.xml
     ThreadContext.put("context-tag", "context-tag-value");
 
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
+    Sentry.setAttribute("debug.enabled", true);
     Sentry.addFeatureFlag("my-feature-flag", true);
 
     // logging arguments are converted to Sentry Event parameters

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

@@ -66,7 +66,20 @@ class ConsoleApplicationSystemTest {
 
     testHelper.ensureLogsReceived { logs, _ ->
       testHelper.doesContainLogWithBody(logs, "User has made a purchase of product: 445") &&
-        testHelper.doesContainLogWithBody(logs, "Something went wrong")
+        testHelper.doesContainLogWithBody(logs, "Something went wrong") &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "Something went wrong",
+          "user.type",
+          "admin",
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "Something went wrong",
+          "feature.version",
+          2,
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(logs, "Something went wrong", "debug.enabled", true)
     }
   }
 }

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

@@ -18,6 +18,9 @@ public static void main(String[] args) {
     // MDC tag not listed in logback.xml
     MDC.put("context-tag", "context-tag-value");
 
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
+    Sentry.setAttribute("debug.enabled", true);
     Sentry.addFeatureFlag("my-feature-flag", true);
     LOGGER.warn("important warning");
 

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

@@ -66,7 +66,20 @@ class ConsoleApplicationSystemTest {
 
     testHelper.ensureLogsReceived { logs, _ ->
       testHelper.doesContainLogWithBody(logs, "User has made a purchase of product: 445") &&
-        testHelper.doesContainLogWithBody(logs, "Something went wrong")
+        testHelper.doesContainLogWithBody(logs, "Something went wrong") &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "Something went wrong",
+          "user.type",
+          "admin",
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "Something went wrong",
+          "feature.version",
+          2,
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(logs, "Something went wrong", "debug.enabled", true)
     }
   }
 }

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

@@ -16,6 +16,8 @@ public class MetricController {
 
   @GetMapping("count")
   String count() {
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
     Sentry.metrics().count("countMetric");
     return "count metric increased";
   }

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

@@ -23,6 +23,9 @@ public PersonController(PersonService personService) {
 
   @GetMapping("{id}")
   Person person(@PathVariable("id") Long id) {
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
+    Sentry.setAttribute("debug.enabled", true);
     Sentry.logger().warn("warn Sentry logging");
     Sentry.logger().error("error Sentry logging");
     Sentry.logger().info("hello %s %s", "there", "world!");

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

@@ -21,7 +21,9 @@ class MetricsSystemTest {
     assertEquals(200, restClient.lastKnownStatusCode)
 
     testHelper.ensureMetricsReceived { event, header ->
-      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
+      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0) &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "user.type", "admin") &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "feature.version", 2)
     }
   }
 

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

@@ -35,7 +35,20 @@ class PersonSystemTest {
     testHelper.ensureLogsReceived { logs, envelopeHeader ->
       testHelper.doesContainLogWithBody(logs, "warn Sentry logging") &&
         testHelper.doesContainLogWithBody(logs, "error Sentry logging") &&
-        testHelper.doesContainLogWithBody(logs, "hello there world!")
+        testHelper.doesContainLogWithBody(logs, "hello there world!") &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "warn Sentry logging",
+          "user.type",
+          "admin",
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "warn Sentry logging",
+          "feature.version",
+          2,
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(logs, "warn Sentry logging", "debug.enabled", true)
     }
   }
 

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

@@ -16,6 +16,8 @@ public class MetricController {
 
   @GetMapping("count")
   String count() {
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
     Sentry.metrics().count("countMetric");
     return "count metric increased";
   }

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

@@ -34,6 +34,9 @@ Person person(@PathVariable Long id) {
     Sentry.addFeatureFlag("outer-feature-flag", true);
     Span span = tracer.spanBuilder("spanCreatedThroughOtelApi").startSpan();
     try (final @NotNull Scope spanScope = span.makeCurrent()) {
+      Sentry.setAttribute("user.type", "admin");
+      Sentry.setAttribute("feature.version", 2);
+      Sentry.setAttribute("debug.enabled", true);
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");

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

@@ -21,7 +21,9 @@ class MetricsSystemTest {
     assertEquals(200, restClient.lastKnownStatusCode)
 
     testHelper.ensureMetricsReceived { event, header ->
-      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
+      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0) &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "user.type", "admin") &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "feature.version", 2)
     }
   }
 

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

@@ -56,7 +56,20 @@ class PersonSystemTest {
     testHelper.ensureLogsReceived { logs, envelopeHeader ->
       testHelper.doesContainLogWithBody(logs, "warn Sentry logging") &&
         testHelper.doesContainLogWithBody(logs, "error Sentry logging") &&
-        testHelper.doesContainLogWithBody(logs, "hello there world!")
+        testHelper.doesContainLogWithBody(logs, "hello there world!") &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "warn Sentry logging",
+          "user.type",
+          "admin",
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "warn Sentry logging",
+          "feature.version",
+          2,
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(logs, "warn Sentry logging", "debug.enabled", true)
     }
   }
 

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

@@ -16,6 +16,8 @@ public class MetricController {
 
   @GetMapping("count")
   String count() {
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
     Sentry.metrics().count("countMetric");
     return "count metric increased";
   }

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

@@ -32,6 +32,9 @@ Person person(@PathVariable Long id) {
     Sentry.addFeatureFlag("transaction-feature-flag", true);
     Span span = tracer.spanBuilder("spanCreatedThroughOtelApi").startSpan();
     try (final @NotNull Scope spanScope = span.makeCurrent()) {
+      Sentry.setAttribute("user.type", "admin");
+      Sentry.setAttribute("feature.version", 2);
+      Sentry.setAttribute("debug.enabled", true);
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");

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

@@ -21,7 +21,9 @@ class MetricsSystemTest {
     assertEquals(200, restClient.lastKnownStatusCode)
 
     testHelper.ensureMetricsReceived { event, header ->
-      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
+      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0) &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "user.type", "admin") &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "feature.version", 2)
     }
   }
 

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

@@ -51,7 +51,20 @@ class PersonSystemTest {
     testHelper.ensureLogsReceived { logs, envelopeHeader ->
       testHelper.doesContainLogWithBody(logs, "warn Sentry logging") &&
         testHelper.doesContainLogWithBody(logs, "error Sentry logging") &&
-        testHelper.doesContainLogWithBody(logs, "hello there world!")
+        testHelper.doesContainLogWithBody(logs, "hello there world!") &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "warn Sentry logging",
+          "user.type",
+          "admin",
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "warn Sentry logging",
+          "feature.version",
+          2,
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(logs, "warn Sentry logging", "debug.enabled", true)
     }
   }
 

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

@@ -16,6 +16,8 @@ public class MetricController {
 
   @GetMapping("count")
   String count() {
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
     Sentry.metrics().count("countMetric");
     return "count metric increased";
   }

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

@@ -23,6 +23,9 @@ public PersonController(PersonService personService) {
 
   @GetMapping("{id}")
   Person person(@PathVariable Long id) {
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
+    Sentry.setAttribute("debug.enabled", true);
     Sentry.logger().warn("warn Sentry logging");
     Sentry.logger().error("error Sentry logging");
     Sentry.logger().info("hello %s %s", "there", "world!");

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

@@ -21,7 +21,9 @@ class MetricsSystemTest {
     assertEquals(200, restClient.lastKnownStatusCode)
 
     testHelper.ensureMetricsReceived { event, header ->
-      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
+      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0) &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "user.type", "admin") &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "feature.version", 2)
     }
   }
 

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

@@ -35,7 +35,20 @@ class PersonSystemTest {
     testHelper.ensureLogsReceived { logs, envelopeHeader ->
       testHelper.doesContainLogWithBody(logs, "warn Sentry logging") &&
         testHelper.doesContainLogWithBody(logs, "error Sentry logging") &&
-        testHelper.doesContainLogWithBody(logs, "hello there world!")
+        testHelper.doesContainLogWithBody(logs, "hello there world!") &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "warn Sentry logging",
+          "user.type",
+          "admin",
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(
+          logs,
+          "warn Sentry logging",
+          "feature.version",
+          2,
+        ) &&
+        testHelper.doesLogWithBodyHaveAttribute(logs, "warn Sentry logging", "debug.enabled", true)
     }
   }
 

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

@@ -16,6 +16,8 @@ public class MetricController {
 
   @GetMapping("count")
   String count() {
+    Sentry.setAttribute("user.type", "admin");
+    Sentry.setAttribute("feature.version", 2);
     Sentry.metrics().count("countMetric");
     return "count metric increased";
   }

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

@@ -34,6 +34,9 @@ Person person(@PathVariable Long id) {
     Sentry.addFeatureFlag("outer-feature-flag", true);
     Span span = tracer.spanBuilder("spanCreatedThroughOtelApi").startSpan();
     try (final @NotNull Scope spanScope = span.makeCurrent()) {
+      Sentry.setAttribute("user.type", "admin");
+      Sentry.setAttribute("feature.version", 2);
+      Sentry.setAttribute("debug.enabled", true);
       Sentry.logger().warn("warn Sentry logging");
       Sentry.logger().error("error Sentry logging");
       Sentry.logger().info("hello %s %s", "there", "world!");

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

@@ -21,7 +21,9 @@ class MetricsSystemTest {
     assertEquals(200, restClient.lastKnownStatusCode)
 
     testHelper.ensureMetricsReceived { event, header ->
-      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
+      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0) &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "user.type", "admin") &&
+        testHelper.doesMetricHaveAttribute(event, "countMetric", "feature.version", 2)
     }
   }