diff --git a/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/WebConfig.java b/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/WebConfig.java
index e8dce9b35c4..8da3f75822d 100644
--- a/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/WebConfig.java
+++ b/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/WebConfig.java
@@ -24,6 +24,7 @@ public class WebConfig {
    * @return RestTemplate
    */
   @Bean
+  @SuppressWarnings("removal")
   RestTemplate restTemplate(IScopes scopes) {
     RestTemplate restTemplate = new RestTemplate();
     SentrySpanClientHttpRequestInterceptor sentryRestTemplateInterceptor =
diff --git a/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/PersonService.java b/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/PersonService.java
index fbe5b67ba4c..753d6eab482 100644
--- a/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/PersonService.java
+++ b/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/PersonService.java
@@ -7,8 +7,10 @@
 
 @Service
 public class PersonService {
+  @SuppressWarnings("removal")
   private final RestTemplate restTemplate;
 
+  @SuppressWarnings("removal")
   public PersonService(RestTemplate restTemplate) {
     this.restTemplate = restTemplate;
   }
diff --git a/sentry-samples/sentry-samples-spring-boot-4-log4j2/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java b/sentry-samples/sentry-samples-spring-boot-4-log4j2/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
index 13d97fa8442..904c60b0eb4 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-log4j2/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
+++ b/sentry-samples/sentry-samples-spring-boot-4-log4j2/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
@@ -22,6 +22,7 @@
 @SpringBootApplication
 @EnableCaching
 @EnableScheduling
+@SuppressWarnings("removal")
 public class SentryDemoApplication {
   public static void main(String[] args) {
     SpringApplication.run(SentryDemoApplication.class, args);
diff --git a/sentry-samples/sentry-samples-spring-boot-4-log4j2/src/main/java/io/sentry/samples/spring/boot4/TodoController.java b/sentry-samples/sentry-samples-spring-boot-4-log4j2/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
index 0f71cca0419..e5f395ec2b5 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-log4j2/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
+++ b/sentry-samples/sentry-samples-spring-boot-4-log4j2/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
@@ -12,6 +12,7 @@
 import reactor.core.scheduler.Schedulers;
 
 @RestController
+@SuppressWarnings("removal")
 public class TodoController {
   private final RestTemplate restTemplate;
   private final WebClient webClient;
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
index 61e726defcb..80a550e7ef7 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
+++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
@@ -22,6 +22,7 @@
 
 @SpringBootApplication
 @EnableScheduling
+@SuppressWarnings("removal")
 public class SentryDemoApplication {
   public static void main(String[] args) {
     SpringApplication.run(SentryDemoApplication.class, args);
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/TodoController.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
index d4fda10d0bd..c5093bc9cf5 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
+++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
@@ -18,6 +18,7 @@
 import reactor.core.scheduler.Schedulers;
 
 @RestController
+@SuppressWarnings("removal")
 public class TodoController {
   private final RestTemplate restTemplate;
   private final WebClient webClient;
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
index b00609ad9ac..77049f70a56 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
+++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
@@ -24,6 +24,7 @@
 @SpringBootApplication
 @EnableCaching
 @EnableScheduling
+@SuppressWarnings("removal")
 public class SentryDemoApplication {
   public static void main(String[] args) {
     SpringApplication.run(SentryDemoApplication.class, args);
diff --git a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/TodoController.java b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
index d4fda10d0bd..c5093bc9cf5 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
+++ b/sentry-samples/sentry-samples-spring-boot-4-opentelemetry/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
@@ -18,6 +18,7 @@
 import reactor.core.scheduler.Schedulers;
 
 @RestController
+@SuppressWarnings("removal")
 public class TodoController {
   private final RestTemplate restTemplate;
   private final WebClient webClient;
diff --git a/sentry-samples/sentry-samples-spring-boot-4-otlp/src/main/java/io/sentry/samples/spring/boot4/otlp/SentryDemoApplication.java b/sentry-samples/sentry-samples-spring-boot-4-otlp/src/main/java/io/sentry/samples/spring/boot4/otlp/SentryDemoApplication.java
index 1bf622154d0..d0a958c536e 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-otlp/src/main/java/io/sentry/samples/spring/boot4/otlp/SentryDemoApplication.java
+++ b/sentry-samples/sentry-samples-spring-boot-4-otlp/src/main/java/io/sentry/samples/spring/boot4/otlp/SentryDemoApplication.java
@@ -25,6 +25,7 @@
 @SpringBootApplication
 @EnableCaching
 @EnableScheduling
+@SuppressWarnings("removal")
 public class SentryDemoApplication {
   public static void main(String[] args) {
     SpringApplication.run(SentryDemoApplication.class, args);
diff --git a/sentry-samples/sentry-samples-spring-boot-4-otlp/src/main/java/io/sentry/samples/spring/boot4/otlp/TodoController.java b/sentry-samples/sentry-samples-spring-boot-4-otlp/src/main/java/io/sentry/samples/spring/boot4/otlp/TodoController.java
index b083e6c1f88..9a4dd98c90b 100644
--- a/sentry-samples/sentry-samples-spring-boot-4-otlp/src/main/java/io/sentry/samples/spring/boot4/otlp/TodoController.java
+++ b/sentry-samples/sentry-samples-spring-boot-4-otlp/src/main/java/io/sentry/samples/spring/boot4/otlp/TodoController.java
@@ -12,6 +12,7 @@
 import reactor.core.scheduler.Schedulers;
 
 @RestController
+@SuppressWarnings("removal")
 public class TodoController {
   private final RestTemplate restTemplate;
   private final WebClient webClient;
diff --git a/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java b/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
index 03688f1a84c..a8437db87c3 100644
--- a/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
+++ b/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java
@@ -23,6 +23,7 @@
 @SpringBootApplication
 @EnableCaching
 @EnableScheduling
+@SuppressWarnings("removal")
 public class SentryDemoApplication {
   public static void main(String[] args) {
     SpringApplication.run(SentryDemoApplication.class, args);
diff --git a/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/TodoController.java b/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
index a24cf2bb3cc..0bbe0643495 100644
--- a/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
+++ b/sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/TodoController.java
@@ -19,6 +19,7 @@
 import tools.jackson.databind.ObjectMapper;
 
 @RestController
+@SuppressWarnings("removal")
 public class TodoController {
   private final RestTemplate restTemplate;
   private final WebClient webClient;
diff --git a/sentry-spring-7/src/test/kotlin/io/sentry/spring7/graphql/SentrySpringSubscriptionHandlerTest.kt b/sentry-spring-7/src/test/kotlin/io/sentry/spring7/graphql/SentrySpringSubscriptionHandlerTest.kt
index 1ed217037a2..24f32e77f88 100644
--- a/sentry-spring-7/src/test/kotlin/io/sentry/spring7/graphql/SentrySpringSubscriptionHandlerTest.kt
+++ b/sentry-spring-7/src/test/kotlin/io/sentry/spring7/graphql/SentrySpringSubscriptionHandlerTest.kt
@@ -2,7 +2,9 @@ package io.sentry.spring7.graphql
 
 import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters
 import graphql.language.Document
+import graphql.language.Field
 import graphql.language.OperationDefinition
+import graphql.language.SelectionSet
 import graphql.schema.DataFetchingEnvironment
 import io.sentry.IScopes
 import io.sentry.graphql.ExceptionReporter
@@ -20,6 +22,19 @@ import org.springframework.graphql.execution.SubscriptionPublisherException
 import reactor.core.publisher.Flux
 
 class SentrySpringSubscriptionHandlerTest {
+  private val document =
+    Document.newDocument()
+      .definition(
+        OperationDefinition.newOperationDefinition()
+          .operation(OperationDefinition.Operation.QUERY)
+          .name("testQuery")
+          .selectionSet(
+            SelectionSet.newSelectionSet().selection(Field.newField("test").build()).build()
+          )
+          .build()
+      )
+      .build()
+
   @Test
   fun `reports exception`() {
     val exception = IllegalStateException("some exception")
@@ -27,15 +42,6 @@ class SentrySpringSubscriptionHandlerTest {
     val exceptionReporter = mock<ExceptionReporter>()
     val parameters = mock<InstrumentationFieldFetchParameters>()
     val dataFetchingEnvironment = mock<DataFetchingEnvironment>()
-    val document =
-      Document.newDocument()
-        .definition(
-          OperationDefinition.newOperationDefinition()
-            .operation(OperationDefinition.Operation.QUERY)
-            .name("testQuery")
-            .build()
-        )
-        .build()
     whenever(dataFetchingEnvironment.document).thenReturn(document)
     whenever(parameters.environment).thenReturn(dataFetchingEnvironment)
     val resultObject =
@@ -49,7 +55,7 @@ class SentrySpringSubscriptionHandlerTest {
         check {
           assertEquals(true, it.isSubscription)
           assertSame(scopes, it.scopes)
-          assertEquals("query testQuery \n", it.query)
+          assertEquals("query testQuery {\n  test\n}\n", it.query)
         },
         anyOrNull(),
       )
@@ -63,15 +69,6 @@ class SentrySpringSubscriptionHandlerTest {
     val exceptionReporter = mock<ExceptionReporter>()
     val parameters = mock<InstrumentationFieldFetchParameters>()
     val dataFetchingEnvironment = mock<DataFetchingEnvironment>()
-    val document =
-      Document.newDocument()
-        .definition(
-          OperationDefinition.newOperationDefinition()
-            .operation(OperationDefinition.Operation.QUERY)
-            .name("testQuery")
-            .build()
-        )
-        .build()
     whenever(dataFetchingEnvironment.document).thenReturn(document)
     whenever(parameters.environment).thenReturn(dataFetchingEnvironment)
     val resultObject =
@@ -90,7 +87,7 @@ class SentrySpringSubscriptionHandlerTest {
         check {
           assertEquals(true, it.isSubscription)
           assertSame(scopes, it.scopes)
-          assertEquals("query testQuery \n", it.query)
+          assertEquals("query testQuery {\n  test\n}\n", it.query)
         },
         anyOrNull(),
       )
diff --git a/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentryAutoConfiguration.java b/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentryAutoConfiguration.java
index 8562d14f160..734bd5d8a5c 100644
--- a/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentryAutoConfiguration.java
+++ b/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentryAutoConfiguration.java
@@ -512,6 +512,7 @@ static class SentrySpanPointcutAutoConfiguration {}
     @Configuration(proxyBeanMethods = false)
     @ConditionalOnClass({RestTemplate.class, RestTemplateAutoConfiguration.class})
     @Open
+    @SuppressWarnings("removal")
     static class SentryPerformanceRestTemplateConfigurationWrapper {
       @Configuration(proxyBeanMethods = false)
       @AutoConfigureBefore(RestTemplateAutoConfiguration.class)
diff --git a/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentrySpanRestTemplateCustomizer.java b/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentrySpanRestTemplateCustomizer.java
index 11a0b5e095a..7e2a56ba521 100644
--- a/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentrySpanRestTemplateCustomizer.java
+++ b/sentry-spring-boot-4/src/main/java/io/sentry/spring/boot4/SentrySpanRestTemplateCustomizer.java
@@ -11,6 +11,7 @@
 import org.springframework.web.client.RestTemplate;
 
 @Open
+@SuppressWarnings("removal")
 class SentrySpanRestTemplateCustomizer implements RestTemplateCustomizer {
   private final @NotNull SentrySpanClientHttpRequestInterceptor interceptor;