ref: Limit scope attributes sample to base Spring Boot 4 variant

adinauer · claude · adinauer · commit 12d88f203435 · 2026-02-26T13:36:06.000+01:00
Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/MetricController.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/MetricController.java
@@ -16,8 +16,6 @@ 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";
   }
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/PersonController.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/PersonController.java
@@ -34,10 +34,6 @@ 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!");
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
@@ -21,9 +21,7 @@ class MetricsSystemTest {
     assertEquals(200, restClient.lastKnownStatusCode)
 
     testHelper.ensureMetricsReceived { event, header ->
-      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0) &&
-        testHelper.doesMetricHaveAttribute(event, "countMetric", "user.type", "admin") &&
-        testHelper.doesMetricHaveAttribute(event, "countMetric", "feature.version", 2)
+      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
     }
   }
 
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt
@@ -56,20 +56,7 @@ 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.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)
+        testHelper.doesContainLogWithBody(logs, "hello there world!")
     }
   }
 
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/MetricController.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/MetricController.java
@@ -16,8 +16,6 @@ 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";
   }
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/PersonController.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/PersonController.java
@@ -32,10 +32,6 @@ 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!");
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
@@ -21,9 +21,7 @@ class MetricsSystemTest {
     assertEquals(200, restClient.lastKnownStatusCode)
 
     testHelper.ensureMetricsReceived { event, header ->
-      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0) &&
-        testHelper.doesMetricHaveAttribute(event, "countMetric", "user.type", "admin") &&
-        testHelper.doesMetricHaveAttribute(event, "countMetric", "feature.version", 2)
+      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
     }
   }
 
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt
@@ -51,20 +51,7 @@ 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.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)
+        testHelper.doesContainLogWithBody(logs, "hello there world!")
     }
   }
 
diff --git a/sentry-samples/sentry-samples-spring-boot-4-webflux/src/main/java/io/sentry/samples/spring/boot4/MetricController.java b/sentry-samples/sentry-samples-spring-boot-4-webflux/src/main/java/io/sentry/samples/spring/boot4/MetricController.java
@@ -16,8 +16,6 @@ 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";
   }
diff --git a/sentry-samples/sentry-samples-spring-boot-4-webflux/src/main/java/io/sentry/samples/spring/boot4/PersonController.java b/sentry-samples/sentry-samples-spring-boot-4-webflux/src/main/java/io/sentry/samples/spring/boot4/PersonController.java
@@ -23,10 +23,6 @@ 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!");
diff --git a/sentry-samples/sentry-samples-spring-boot-4-webflux/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt b/sentry-samples/sentry-samples-spring-boot-4-webflux/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt
@@ -21,9 +21,7 @@ class MetricsSystemTest {
     assertEquals(200, restClient.lastKnownStatusCode)
 
     testHelper.ensureMetricsReceived { event, header ->
-      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0) &&
-        testHelper.doesMetricHaveAttribute(event, "countMetric", "user.type", "admin") &&
-        testHelper.doesMetricHaveAttribute(event, "countMetric", "feature.version", 2)
+      testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)
     }
   }
 
diff --git a/sentry-samples/sentry-samples-spring-boot-4-webflux/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt b/sentry-samples/sentry-samples-spring-boot-4-webflux/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt
@@ -35,20 +35,7 @@ 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.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)
+        testHelper.doesContainLogWithBody(logs, "hello there world!")
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ public class MetricController {`
`16`	`16`
`17`	`17`	`@GetMapping("count")`
`18`	`18`	`String count() {`
`19`		`- Sentry.setAttribute("user.type", "admin");`
`20`		`- Sentry.setAttribute("feature.version", 2);`
`21`	`19`	`Sentry.metrics().count("countMetric");`
`22`	`20`	`return "count metric increased";`
`23`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,7 @@ class MetricsSystemTest {`
`21`	`21`	`assertEquals(200, restClient.lastKnownStatusCode)`
`22`	`22`
`23`	`23`	`testHelper.ensureMetricsReceived { event, header ->`
`24`		`- testHelper.doesContainMetric(event, "countMetric", "counter", 1.0) &&`
`25`		`- testHelper.doesMetricHaveAttribute(event, "countMetric", "user.type", "admin") &&`
`26`		`- testHelper.doesMetricHaveAttribute(event, "countMetric", "feature.version", 2)`
	`24`	`+ testHelper.doesContainMetric(event, "countMetric", "counter", 1.0)`
`27`	`25`	`}`
`28`	`26`	`}`
`29`	`27`