Merge branch '8.x.x' into feat/update-otel-sample-readme

getsentry · Jan 7, 2025 · c7c68dd · c7c68dd
2 parents b1a5b9e + a509828
commit c7c68dd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Enable `ThreadLocalAccessor` for Spring Boot 3 WebFlux by default ([#4023](https://github.com/getsentry/sentry-java/pull/4023))
+
 ## 8.0.0-rc.3
 
 ### Features

diff --git a/...t-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryWebfluxAutoConfiguration.java b/...t-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryWebfluxAutoConfiguration.java
@@ -91,8 +91,7 @@ public SentryLegacyFilterConfigurationCondition() {
 
     @ConditionalOnProperty(
         name = "sentry.reactive.thread-local-accessor-enabled",
-        havingValue = "false",
-        matchIfMissing = true)
+        havingValue = "false")
     @SuppressWarnings("UnusedNestedClass")
     private static class SentryDisableThreadLocalAccessorCondition {}
 
@@ -109,7 +108,8 @@ public SentryThreadLocalAccessorCondition() {
 
     @ConditionalOnProperty(
         name = "sentry.reactive.thread-local-accessor-enabled",
-        havingValue = "true")
+        havingValue = "true",
+        matchIfMissing = true)
     @SuppressWarnings("UnusedNestedClass")
     private static class SentryEnableThreadLocalAccessorCondition {}
 

diff --git a/...karta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryWebfluxAutoConfigurationTest.kt b/...karta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryWebfluxAutoConfigurationTest.kt
@@ -21,8 +21,8 @@ class SentryWebfluxAutoConfigurationTest {
     fun `configures sentryWebFilter`() {
         contextRunner.withPropertyValues("sentry.dsn=http://key@localhost/proj")
             .run {
-                assertThat(it).hasSingleBean(SentryWebFilter::class.java)
-                assertThat(it).doesNotHaveBean(SentryWebFilterWithThreadLocalAccessor::class.java)
+                assertThat(it).hasSingleBean(SentryWebFilterWithThreadLocalAccessor::class.java)
+                assertThat(it).doesNotHaveBean(SentryWebFilter::class.java)
             }
     }
 
@@ -63,6 +63,7 @@ class SentryWebfluxAutoConfigurationTest {
             )
             .run {
                 assertThat(it).hasSingleBean(SentryWebFilterWithThreadLocalAccessor::class.java)
+                assertThat(it).doesNotHaveBean(SentryWebFilter::class.java)
             }
     }
 
@@ -75,6 +76,7 @@ class SentryWebfluxAutoConfigurationTest {
             )
             .run {
                 assertThat(it).doesNotHaveBean(SentryWebFilterWithThreadLocalAccessor::class.java)
+                assertThat(it).hasSingleBean(SentryWebFilter::class.java)
             }
     }