test(spring-boot): [Sample Tests 18] Move the Boot 4 WebFlux sample's tests into the module (#6310)

* test(spring-boot): Move the Boot 4 WebFlux sample's tests into the module

Adds an integrationTestWebflux suite to sentry-spring-boot-4 that
mirrors the Boot 3 one, adjusted for Spring Boot 4: the webclient
starter for WebClient.Builder, the restclient starter that
TestRestTemplate needs, Jackson 3, and @AutoConfigureTestRestTemplate.
The Todo test reads the port with @LocalServerPort because
TestRestTemplate's root URI doesn't hold the port on Boot 4.0.

The Boot 4 WebFlux sample has no system tests left, so it comes off the
system-test runner, the backend workflow and the Spring Boot 4 matrix,
which now runs the new suite.

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

* test: Port the audit fixes to Boot 4 WebFlux

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

* test(spring-boot): Return a Mono from the Boot 4 WebFlux GraphQL resolver

The sample's resolver returned a Mono, so its test covered Sentry
finishing the field's span when the Mono completes. The port returned a
String, which only covers the synchronous path.

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

* test(spring-boot): [Sample Tests 19] Move the Boot 2 WebFlux sample's tests into the module (#6311)

* test(spring-boot): Move the Boot 2 WebFlux sample's tests into the module

Adds an integrationTestWebflux suite to sentry-spring-boot that mirrors
the Boot 3 one, without the Reactor thread-local accessor that Spring
Boot 2's Reactor lacks. The GraphQL greeting lives in its own file so
the suite can leave it out below Spring Boot 2.7, like the servlet
suite's GraphQL.

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

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

* test(spring-boot): Tighten the Boot 2 WebFlux tracing checks and restore Metrics

Ports the tracing checks and the plain test client from the servlet
suite, and runs the WebFlux sample's Metrics tests in the reactive app
too, rather than only in the servlet suite.

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

* test(spring-boot): Return a Mono from the Boot 2 WebFlux GraphQL resolver

The sample's resolver returned a Mono, so its test covered Sentry
finishing the field's span when the Mono completes. The port returned a
String, which only covers the synchronous path.

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

* test(spring-boot): [Sample Tests 20] Move the Boot 3 OTel no-agent sample's tests (#6312)

* test(spring-boot): Move the Boot 3 OTel no-agent sample's tests into the module

Adds an integrationTestOtelNoAgent suite to sentry-spring-boot-jakarta.
The app traces through the OpenTelemetry SDK in its own JVM, set up by
sentry-opentelemetry-agentless-spring, and the suite ports the no-agent
sample's tests: spans from the OTel annotation, the OTel API and the
Sentry API with their feature flags, the OTel database span, trace
continuation, client spans, cache spans, GraphQL, and Kafka traced by
OTel instead of Sentry's Spring Kafka integration. The sample's Metrics
tests were copies of the servlet ones and don't depend on tracing.

The suite needs a TestRestTemplate built outside the context: the one
Spring Boot provides is instrumented by the OTel starter, which replaced
the trace headers the tests send and started a new trace.

Sentry exports OTel spans in batches every 5 seconds, so every test
waited that long. MockSentryServer gets a hook that runs before each
check while waiting, which the suite uses to flush the tracer provider,
taking the suite from about 112s to 8s of test time.

The sample has no system tests left, so it comes off the system-test
runner, the backend workflow and the Spring Boot 3 matrix, which now
runs the new suite.

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

* test(spring-boot): Rejoin a wrapped comment in the Boot 3 OTel no-agent suite

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

* test: Port the audit fixes to Boot 3 no-agent

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

* test(spring-boot): [Sample Tests 21] Move the Boot 4 OTel no-agent sample's tests (#6313)

* test(spring-boot): Move the Boot 4 OTel no-agent sample's tests into the module

Adds an integrationTestOtelNoAgent suite to sentry-spring-boot-4, the
Boot 4 counterpart of the Boot 3 one: the app traces through the
OpenTelemetry SDK in its own JVM, set up by
sentry-opentelemetry-agentless-spring. The sample's tests were the same
as the Boot 3 sample's, minus Cache, so the suite is the Boot 3 one with
Boot 4's packages and no Cache test. Its Metrics tests were copies of
the servlet ones and don't depend on tracing.

The sample has no system tests left, so it comes off the system-test
runner, the backend workflow and the Spring Boot 4 matrix, which now
runs the new suite.

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

* test: Port the audit fixes to Boot 4 no-agent

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

* test(spring-boot): [Sample Tests 22] Move the Boot 2 OTel no-agent sample's tests (#6314)

* test(spring-boot): Move the Boot 2 OTel no-agent sample's tests into the module

Adds an integrationTestOtelNoAgent suite to sentry-spring-boot, the
Boot 2 counterpart of the Boot 3 one. The sample's tests were the Boot 3
sample's minus Cache and RestClient, which Boot 2 doesn't have.
GraphQL and Kafka are gated on Boot 2.7, as in the servlet suite, and
Kafka gets a context of its own.

Sentry is global, so a second live context re-initializes it with that
context's OpenTelemetry SDK, and the Sentry API spans of the first
context's tests went to the wrong one. Each test class therefore starts
its own context and closes it afterwards.

The sample has no system tests left, so it comes off the system-test
runner and the Spring Boot 2 matrix, which now runs the new suite, and
the backend workflow's base row moves to the console sample.

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

* test(spring-boot): Port the tracing and GraphQL checks to Boot 2 no-agent and restore Metrics

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

* test(spring-boot): [Sample Tests 23] Port the Boot 3 OTel agent sample's Person, tracing and Todo tests (#6315)

* test(spring-boot): Port the Boot 3 OTel agent sample's Person, tracing and Todo tests

The agent tests now start the fixture app once per test JVM and share
it, because it takes seconds to start. Which mode initializes Sentry is
a property of the test task, so the suite's task runs with the agent
initializing it and a new integrationTestOtelAgentWithoutAutoInit task
runs the same tests with the Spring Boot starter doing it. Gradle runs
the two in parallel.

The fixture gains the Person POST, distributed tracing and Todo
endpoints, and the suite ports the agent sample's Person,
DistributedTracing and Todo tests. Sentry exports the agent's spans in
batches every 5 seconds, which can't be configured, so each test waits
for the next batch and the negative tracing check waits past one.

ChildJvmApp now copies the app's output into the test's as it arrives
instead of printing it on close. The shared app is closed when the JVM
exits, where its whole log would otherwise land on the console.

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

* test: Port the audit fixes to the Boot 3 agent

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

* test(spring-boot): [Sample Tests 24] Port the rest of the Boot 3 OTel agent sample's tests (#6316)

* test(spring-boot): Port the rest of the Boot 3 OTel agent sample's tests

The agent fixture gains the Cache, Metrics, GraphQL and Kafka
endpoints, and the agent suite ports the sample's remaining tests in
both init modes. The agent traces each GraphQL operation as one span
named after it, so the queries are named. Kafka uses an in-JVM KRaft
broker that the test JVM starts next to the app.

The sample has no system tests left, so it comes off the system-test
runner, the backend workflow and the Spring Boot 3 matrix. The matrix
no longer builds the agent separately, because the suites build the
jar they attach.

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

* test(spring-boot): Check the Boot 3 agent GraphQL task query's assignee and creator ids

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

---------

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

---------

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

---------

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

---------

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

---------

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

---------

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

Author: runningcode

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

@@ -75,25 +75,18 @@ jobs:
       - name: Build sample artifacts
         run: |
           ./gradlew \
-            :sentry-samples:sentry-samples-spring-boot-webflux:shadowJar \
-            :sentry-samples:sentry-samples-spring-boot-webflux:testClasses \
             :sentry-samples:sentry-samples-spring-boot-opentelemetry:shadowJar \
             :sentry-samples:sentry-samples-spring-boot-opentelemetry:testClasses \
-            :sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:shadowJar \
-            :sentry-samples:sentry-samples-spring-boot-opentelemetry-noagent:testClasses \
             :sentry-samples:sentry-samples-spring:war \
             :sentry-samples:sentry-samples-spring:testClasses \
             :sentry-opentelemetry:sentry-opentelemetry-agent:assemble
 
-      - name: Test sentry-spring-boot integration suite
-        run: ./gradlew :sentry-spring-boot:integrationTest
-
-      - name: Test sentry-samples-spring-boot-webflux
+      - name: Test sentry-spring-boot integration suites
         run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-webflux" \
-            --agent false \
-            --auto-init "true"
+          ./gradlew \
+            :sentry-spring-boot:integrationTest \
+            :sentry-spring-boot:integrationTestWebflux \
+            :sentry-spring-boot:integrationTestOtelNoAgent
 
       - name: Test sentry-samples-spring-boot-opentelemetry agent init true
         run: |
@@ -109,13 +102,6 @@ jobs:
             --agent true \
             --auto-init "false"
 
-      - name: Test sentry-samples-spring-boot-opentelemetry-noagent
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-opentelemetry-noagent" \
-            --agent false \
-            --auto-init "true"
-
       - name: Test sentry-samples-spring
         run: |
           python3 test/system-test-runner.py test \

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

@@ -71,42 +71,18 @@ jobs:
       - name: Build sample artifacts
         run: |
           ./gradlew \
-            :sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:bootJar \
-            :sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry:testClasses \
-            :sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry-noagent:bootJar \
-            :sentry-samples:sentry-samples-spring-boot-jakarta-opentelemetry-noagent:testClasses \
             :sentry-samples:sentry-samples-spring-jakarta:war \
-            :sentry-samples:sentry-samples-spring-jakarta:testClasses \
-            :sentry-opentelemetry:sentry-opentelemetry-agent:assemble
+            :sentry-samples:sentry-samples-spring-jakarta:testClasses
 
       - name: Test sentry-spring-boot-jakarta integration suites
         run: |
           ./gradlew \
             :sentry-spring-boot-jakarta:integrationTest \
             :sentry-spring-boot-jakarta:integrationTestWebflux \
+            :sentry-spring-boot-jakarta:integrationTestOtelNoAgent \
             :sentry-spring-boot-jakarta:integrationTestLog4j2 \
-            :sentry-spring-boot-jakarta:integrationTestOtelAgent
-
-      - name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init true
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-jakarta-opentelemetry" \
-            --agent true \
-            --auto-init "true"
-
-      - name: Test sentry-samples-spring-boot-jakarta-opentelemetry agent init false
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-jakarta-opentelemetry" \
-            --agent true \
-            --auto-init "false"
-
-      - name: Test sentry-samples-spring-boot-jakarta-opentelemetry-noagent
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-jakarta-opentelemetry-noagent" \
-            --agent false \
-            --auto-init "true"
+            :sentry-spring-boot-jakarta:integrationTestOtelAgent \
+            :sentry-spring-boot-jakarta:integrationTestOtelAgentWithoutAutoInit
 
       - name: Test sentry-samples-spring-jakarta
         run: |

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

@@ -71,25 +71,19 @@ jobs:
       - name: Build sample artifacts
         run: |
           ./gradlew \
-            :sentry-samples:sentry-samples-spring-boot-4-webflux:bootJar \
-            :sentry-samples:sentry-samples-spring-boot-4-webflux:testClasses \
             :sentry-samples:sentry-samples-spring-boot-4-opentelemetry:bootJar \
             :sentry-samples:sentry-samples-spring-boot-4-opentelemetry:testClasses \
-            :sentry-samples:sentry-samples-spring-boot-4-opentelemetry-noagent:bootJar \
-            :sentry-samples:sentry-samples-spring-boot-4-opentelemetry-noagent:testClasses \
             :sentry-samples:sentry-samples-spring-7:war \
             :sentry-samples:sentry-samples-spring-7:testClasses \
             :sentry-opentelemetry:sentry-opentelemetry-agent:assemble
 
-      - name: Test sentry-spring-boot-4 integration suite
-        run: ./gradlew :sentry-spring-boot-4:integrationTest :sentry-spring-boot-4:integrationTestLog4j2
-
-      - name: Run sentry-samples-spring-boot-4-webflux
+      - name: Test sentry-spring-boot-4 integration suites
         run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-4-webflux" \
-            --agent false \
-            --auto-init "true"
+          ./gradlew \
+            :sentry-spring-boot-4:integrationTest \
+            :sentry-spring-boot-4:integrationTestWebflux \
+            :sentry-spring-boot-4:integrationTestOtelNoAgent \
+            :sentry-spring-boot-4:integrationTestLog4j2
 
       - name: Run sentry-samples-spring-boot-4-opentelemetry agent init true
         run: |
@@ -105,13 +99,6 @@ jobs:
             --agent true \
             --auto-init "false"
 
-      - name: Run sentry-samples-spring-boot-4-opentelemetry-noagent
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring-boot-4-opentelemetry-noagent" \
-            --agent false \
-            --auto-init "true"
-
       - name: Run sentry-samples-spring-7
         run: |
           python3 test/system-test-runner.py test \

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

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sample: [ "sentry-samples-spring-boot-opentelemetry-noagent" ]
+        sample: [ "sentry-samples-console" ]
         agent: [ "false" ]
         agent-auto-init: [ "true" ]
         include:
@@ -34,21 +34,6 @@ jobs:
           - sample: "sentry-samples-spring-boot-opentelemetry"
             agent: "true"
             agent-auto-init: "false"
-          - sample: "sentry-samples-spring-boot-webflux"
-            agent: "false"
-            agent-auto-init: "true"
-          - sample: "sentry-samples-spring-boot-jakarta-opentelemetry-noagent"
-            agent: "false"
-            agent-auto-init: "true"
-          - sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
-            agent: "true"
-            agent-auto-init: "true"
-          - sample: "sentry-samples-spring-boot-jakarta-opentelemetry"
-            agent: "true"
-            agent-auto-init: "false"
-          - sample: "sentry-samples-console"
-            agent: "false"
-            agent-auto-init: "true"
           - sample: "sentry-samples-console-otlp"
             agent: "false"
             agent-auto-init: "true"
@@ -58,12 +43,6 @@ jobs:
           - sample: "sentry-samples-jul"
             agent: "false"
             agent-auto-init: "true"
-          - sample: "sentry-samples-spring-boot-4-webflux"
-            agent: "false"
-            agent-auto-init: "true"
-          - sample: "sentry-samples-spring-boot-4-opentelemetry-noagent"
-            agent: "false"
-            agent-auto-init: "true"
           - sample: "sentry-samples-spring-boot-4-opentelemetry"
             agent: "true"
             agent-auto-init: "true"

sentry-samples/sentry-samples-spring-boot-4-opentelemetry-noagent/build.gradle.kts

@@ -6,7 +6,6 @@ plugins {
   alias(libs.plugins.spring.dependency.management)
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.kotlin.spring)
-  id("io.sentry.systemtest")
 }
 
 group = "io.sentry.sample.spring-boot-4"
@@ -54,36 +53,6 @@ dependencies {
   // database query tracing
   implementation(projects.sentryJdbc)
   runtimeOnly(libs.hsqldb)
-
-  testImplementation(kotlin(Config.kotlinStdLib))
-  testImplementation(projects.sentrySystemTestSupport)
-  testImplementation(libs.apollo3.kotlin)
-  testImplementation(libs.kotlin.test.junit)
-  testImplementation(libs.slf4j2.api)
-  testImplementation(libs.springboot4.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")
 }
 
 dependencyManagement { imports { mavenBom(libs.otel.instrumentation.bom.get().toString()) } }
-
-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*") }
-}
-
-tasks.named("test").configure {
-  require(this is Test)
-
-  filter { excludeTestsMatching("io.sentry.systemtest.*") }
-}