Skip to content

Commit

Permalink
Merge d26ed75 into 94a1eb0
Browse files Browse the repository at this point in the history
  • Loading branch information
adinauer authored Jan 7, 2025
2 parents 94a1eb0 + d26ed75 commit 4281f14
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

Expand All @@ -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 {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down Expand Up @@ -63,6 +63,7 @@ class SentryWebfluxAutoConfigurationTest {
)
.run {
assertThat(it).hasSingleBean(SentryWebFilterWithThreadLocalAccessor::class.java)
assertThat(it).doesNotHaveBean(SentryWebFilter::class.java)
}
}

Expand All @@ -75,6 +76,7 @@ class SentryWebfluxAutoConfigurationTest {
)
.run {
assertThat(it).doesNotHaveBean(SentryWebFilterWithThreadLocalAccessor::class.java)
assertThat(it).hasSingleBean(SentryWebFilter::class.java)
}
}

Expand Down

0 comments on commit 4281f14

Please sign in to comment.