Merge 67813f7 into ad3d2a4

getsentry · Jun 27, 2023 · 9b77d44 · 9b77d44
2 parents ad3d2a4 + 67813f7
commit 9b77d44
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,10 @@
   - Enhance regex patterns for native stackframes
 - Tracing headers (`sentry-trace` and `baggage`) are now attached and passed through even if performance is disabled ([#2788](https://github.com/getsentry/sentry-java/pull/2788))
 
+### Fixes
+
+- Remove code that set `tracesSampleRate` to `0.0` for Spring Boot if not set ([#2800](https://github.com/getsentry/sentry-java/pull/2800))
+
 ## 6.23.0
 
 ### Features

diff --git a/...-starter-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryAutoConfiguration.java b/...-starter-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryAutoConfiguration.java
@@ -119,9 +119,6 @@ static class HubConfiguration {
           BuildConfig.SENTRY_SPRING_BOOT_JAKARTA_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
       options.setSdkVersion(createSdkVersion(options));
       addPackageAndIntegrationInfo();
-      if (options.getTracesSampleRate() == null && options.getEnableTracing() == null) {
-        options.setTracesSampleRate(0.0);
-      }
       // Spring Boot sets ignored exceptions in runtime using reflection - where the generic
       // information is lost
       // its technically possible to set non-throwable class to `ignoredExceptionsForType` set

diff --git a/...rter-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt b/...rter-jakarta/src/test/kotlin/io/sentry/spring/boot/jakarta/SentryAutoConfigurationTest.kt
@@ -225,7 +225,7 @@ class SentryAutoConfigurationTest {
             "sentry.dsn=http://key@localhost/proj"
         ).run {
             val options = it.getBean(SentryProperties::class.java)
-            assertThat(options.tracesSampleRate).isNotNull().isEqualTo(0.0)
+            assertThat(options.tracesSampleRate).isNull()
         }
     }
 

diff --git a/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java b/sentry-spring-boot-starter/src/main/java/io/sentry/spring/boot/SentryAutoConfiguration.java
@@ -119,9 +119,6 @@ static class HubConfiguration {
           BuildConfig.SENTRY_SPRING_BOOT_SDK_NAME + "/" + BuildConfig.VERSION_NAME);
       options.setSdkVersion(createSdkVersion(options));
       addPackageAndIntegrationInfo();
-      if (options.getTracesSampleRate() == null && options.getEnableTracing() == null) {
-        options.setTracesSampleRate(0.0);
-      }
       // Spring Boot sets ignored exceptions in runtime using reflection - where the generic
       // information is lost
       // its technically possible to set non-throwable class to `ignoredExceptionsForType` set

diff --git a/...-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt b/...-spring-boot-starter/src/test/kotlin/io/sentry/spring/boot/SentryAutoConfigurationTest.kt
@@ -225,7 +225,7 @@ class SentryAutoConfigurationTest {
             "sentry.dsn=http://key@localhost/proj"
         ).run {
             val options = it.getBean(SentryProperties::class.java)
-            assertThat(options.tracesSampleRate).isNotNull().isEqualTo(0.0)
+            assertThat(options.tracesSampleRate).isNull()
         }
     }