test(spring-boot): Move the Boot 2 GraphQL and Kafka tests into the module

Ports the Boot 2 sample's GraphQL and Kafka tests to the
integrationTest suite. Both need Spring Boot 2.7, while the Spring
Boot 2 matrix also covers 2.4 to 2.6, so below 2.7 the suite leaves out
their dependencies and sources.

That also keeps the broker off the shared base class: the Kafka test
runs its own application context under a kafka profile with
@embeddedkafka, and each context gets its own in-memory database. The
second context re-initializes the global SDK; the app reaches Sentry
through ScopesAdapter, so the other tests pass in either order.

The Boot 2 sample has no system tests left, so it comes off the
system-test runner, the backend workflow and the Spring Boot 2 matrix.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

Author: runningcode

.github/workflows/spring-boot-2-matrix.yml

@@ -75,8 +75,6 @@ jobs:
       - name: Build sample artifacts
         run: |
           ./gradlew \
-            :sentry-samples:sentry-samples-spring-boot:shadowJar \
-            :sentry-samples:sentry-samples-spring-boot:testClasses \
             :sentry-samples:sentry-samples-spring-boot-webflux:shadowJar \
             :sentry-samples:sentry-samples-spring-boot-webflux:testClasses \
             :sentry-samples:sentry-samples-spring-boot-opentelemetry:shadowJar \
@@ -90,13 +88,6 @@ jobs:
       - name: Test sentry-spring-boot integration suite
         run: ./gradlew :sentry-spring-boot:integrationTest
 
-      - name: Test sentry-samples-spring-boot
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot" \
-            --agent false \
-            --auto-init "true"
-
       - name: Test sentry-samples-spring-boot-webflux
         run: |
           python3 test/system-test-runner.py test \

.github/workflows/system-tests-backend.yml

@@ -24,13 +24,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sample: [ "sentry-samples-spring-boot" ]
+        sample: [ "sentry-samples-spring-boot-opentelemetry-noagent" ]
         agent: [ "false" ]
         agent-auto-init: [ "true" ]
         include:
-          - sample: "sentry-samples-spring-boot-opentelemetry-noagent"
-            agent: "false"
-            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-opentelemetry"
             agent: "true"
             agent-auto-init: "true"

gradle/libs.versions.toml

@@ -45,6 +45,7 @@ spotless = "8.8.0"
 springboot2 = "2.7.18"
 springboot3 = "3.5.0"
 springboot4 = "4.1.0"
+springKafka2 = "2.8.11"
 springKafka3 = "3.3.5"
 sqldelight = "2.3.2"
 
@@ -214,7 +215,8 @@ springboot3-starter-security = { module = "org.springframework.boot:spring-boot-
 springboot3-starter-jdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springboot3" }
 springboot3-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springboot3" }
 springboot3-starter-cache = { module = "org.springframework.boot:spring-boot-starter-cache", version.ref = "springboot3" }
-spring-kafka2 = { module = "org.springframework.kafka:spring-kafka", version = "2.8.11" }
+spring-kafka2 = { module = "org.springframework.kafka:spring-kafka", version.ref = "springKafka2" }
+spring-kafka2-test = { module = "org.springframework.kafka:spring-kafka-test", version.ref = "springKafka2" }
 spring-kafka3 = { module = "org.springframework.kafka:spring-kafka", version.ref = "springKafka3" }
 spring-kafka3-test = { module = "org.springframework.kafka:spring-kafka-test", version.ref = "springKafka3" }
 spring-kafka4 = { module = "org.springframework.kafka:spring-kafka" }

sentry-samples/sentry-samples-spring-boot/build.gradle.kts

@@ -8,7 +8,6 @@ plugins {
   alias(libs.plugins.shadow)
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.kotlin.spring)
-  id("io.sentry.systemtest")
 }
 
 application { mainClass.set("io.sentry.samples.spring.boot.SentryDemoApplication") }
@@ -84,18 +83,6 @@ dependencies {
   // database query tracing
   implementation(projects.sentryJdbc)
   runtimeOnly(libs.hsqldb)
-
-  testImplementation(projects.sentrySystemTestSupport)
-  testImplementation(kotlin(Config.kotlinStdLib))
-  testImplementation(libs.apollo3.kotlin)
-  testImplementation(libs.kotlin.test.junit)
-  testImplementation(libs.slf4j2.api)
-  testImplementation(libs.springboot.starter.test) {
-    exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
-  }
-  testImplementation("ch.qos.logback:logback-classic:1.5.16")
-  testImplementation("ch.qos.logback:logback-core:1.5.16")
-  testImplementation("org.apache.httpcomponents:httpclient")
 }
 
 val runtimeClasspath = configurations.named("runtimeClasspath")
@@ -135,32 +122,3 @@ configure<SourceSetContainer> {
     }
   }
 }
-
-tasks.register<Test>("systemTest").configure {
-  group = "verification"
-  description = "Runs the System tests"
-
-  val test = project.extensions.getByType<SourceSetContainer>()["test"]
-  testClassesDirs = test.output.classesDirs
-  classpath = test.runtimeClasspath
-
-  maxParallelForks = 1
-
-  filter {
-    includeTestsMatching("io.sentry.systemtest*")
-    if (!includeGraphql) {
-      excludeTestsMatching("io.sentry.systemtest.Graphql*")
-    }
-    if (!includeKafka) {
-      excludeTestsMatching("io.sentry.systemtest.Kafka*")
-    }
-    // The other tests moved into sentry-spring-boot, so without GraphQL and Kafka none are left.
-    isFailOnNoMatchingTests = includeGraphql || includeKafka
-  }
-}
-
-tasks.named("test").configure {
-  require(this is Test)
-
-  filter { excludeTestsMatching("io.sentry.systemtest.*") }
-}