test(spring): Move the Spring WAR sample's tests into the module

Adds sentry-spring-jakarta's embedded-Tomcat integrationTest suite to
sentry-spring, with the module's packages and javax.servlet. The
sample's tests were the jakarta WAR sample's, so the suite is too.
Spring Boot 2's BOM picks Spring 5.3 and Tomcat 9.

The sample has no system tests left, so it comes off the system-test
runner, the backend workflow and the Spring Boot 2 matrix. That was the
matrix's last runner step, so it drops the Python setup, the runner's
logs and the exclude properties only the samples and the runner read.

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

Author: runningcode

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

@@ -25,7 +25,6 @@ jobs:
 
     name: Spring Boot ${{ matrix.springboot-version }}
     env:
-      SENTRY_URL: http://127.0.0.1:8000
       GRADLE_ENCRYPTION_KEY: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
     steps:
@@ -34,16 +33,6 @@ jobs:
         with:
           submodules: 'recursive'
 
-      - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
-        with:
-          python-version: '3.10'
-
-      - name: Install Python dependencies
-        run: |
-          python3 -m pip install --upgrade pip
-          python3 -m pip install -r requirements.txt
-
       - name: Set up Java
         uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0
         with:
@@ -65,35 +54,19 @@ jobs:
       - name: Update Spring Boot 2.x version
         run: |
           springboot_version="${{ matrix.springboot-version }}"
-          if [[ ! "$springboot_version" =~ ^2\.7\. ]]; then
-            echo "ORG_GRADLE_PROJECT_excludeGraphql=true" >> "$GITHUB_ENV"
-            echo "ORG_GRADLE_PROJECT_excludeKafka=true" >> "$GITHUB_ENV"
-          fi
           perl -0pi -e 'BEGIN { $v = shift } s/^springboot2[[:space:]]*=[[:space:]]*"\K[^"]*/$v/m or die "::error::springboot2 version entry not found in gradle/libs.versions.toml\n"' "$springboot_version" gradle/libs.versions.toml
           echo "Updated Spring Boot 2.x version to $springboot_version"
 
-      - name: Build sample artifacts
-        run: |
-          ./gradlew \
-            :sentry-samples:sentry-samples-spring:war \
-            :sentry-samples:sentry-samples-spring:testClasses
-
-      - name: Test sentry-spring-boot integration suites
+      - name: Test integration suites
         run: |
           ./gradlew \
+            :sentry-spring:integrationTest \
             :sentry-spring-boot:integrationTest \
             :sentry-spring-boot:integrationTestWebflux \
             :sentry-spring-boot:integrationTestOtelNoAgent \
             :sentry-spring-boot:integrationTestOtelAgent \
             :sentry-spring-boot:integrationTestOtelAgentWithoutAutoInit
 
-      - name: Test sentry-samples-spring
-        run: |
-          python3 test/system-test-runner.py test \
-            --module "sentry-samples-spring" \
-            --agent false \
-            --auto-init "true"
-
       - name: Upload test results
         if: always()
         uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7
@@ -102,8 +75,6 @@ jobs:
           path: |
             **/build/reports/*
             **/build/test-results/**/*.xml
-            sentry-mock-server.txt
-            spring-server.txt
 
       - name: Test Report
         uses: phoenix-actions/test-reporting@7317eea6e13c47348dd0bb318669485157c518d6 # pin@v16

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

@@ -40,9 +40,6 @@ jobs:
           - sample: "sentry-samples-spring-boot-4-otlp"
             agent: "false"
             agent-auto-init: "true"
-          - sample: "sentry-samples-spring"
-            agent: "false"
-            agent-auto-init: "true"
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:

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

@@ -7,7 +7,6 @@ plugins {
   alias(libs.plugins.kotlin.spring)
   id("war")
   alias(libs.plugins.gretty)
-  id("io.sentry.systemtest")
 }
 
 // Spring scans this app's own bytecode with its repackaged ASM at startup, and the oldest version
@@ -29,9 +28,6 @@ group = "io.sentry.sample.spring"
 
 version = "0.0.1-SNAPSHOT"
 
-// Apollo 4.x requires coroutines 1.9.0+, override Spring Boot's managed version
-extra["kotlin-coroutines.version"] = "1.9.0"
-
 dependencyManagement {
   imports {
     mavenBom(libs.springboot2.bom.get().toString())
@@ -58,35 +54,10 @@ dependencies {
 
   implementation(libs.tomcat.catalina)
   implementation(libs.tomcat.embed.jasper)
-
-  testImplementation(projects.sentrySystemTestSupport)
-  testImplementation(libs.kotlin.test.junit)
-  testImplementation(libs.springboot.starter.test) {
-    exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
-  }
 }
 
 tasks.withType<KotlinCompile>().configureEach {
   kotlin {
     compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
   }
 }
-
-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.*") }
-}

sentry-samples/sentry-samples-spring/src/test/kotlin/io/sentry/DummyTest.kt

@@ -95,3 +95,25 @@ tasks.jar {
     )
   }
 }
+
+testing {
+  suites {
+    // Runs a plain Spring MVC app in an embedded Tomcat against MockSentryServer, the way a servlet
+    // container runs a WAR. Spring Boot isn't on its classpath, because Sentry behaves differently
+    // with it.
+    register<JvmTestSuite>("integrationTest") {
+      useJUnit()
+      dependencies {
+        implementation(platform(libs.springboot2.bom))
+        implementation(project())
+        implementation(projects.sentryAsyncProfiler)
+        implementation(projects.sentryTestSupport)
+        implementation(Config.Libs.springWeb)
+        implementation(libs.jackson.databind)
+        implementation(libs.kotlin.test.junit)
+        implementation(libs.google.truth)
+        implementation(libs.tomcat.embed.core)
+      }
+    }
+  }
+}

sentry-samples/sentry-samples-spring/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt

@@ -0,0 +1,72 @@
+package io.sentry.spring.integrationtest
+
+import io.sentry.test.MockSentryServer
+import java.nio.file.Files
+import java.util.ServiceLoader
+import javax.servlet.ServletContainerInitializer
+import org.apache.catalina.startup.Tomcat
+import org.junit.Before
+import org.springframework.http.client.ClientHttpResponse
+import org.springframework.web.client.DefaultResponseErrorHandler
+import org.springframework.web.client.RestTemplate
+import org.springframework.web.util.DefaultUriBuilderFactory
+
+/**
+ * Drives [AppInitializer]'s app over HTTP and asserts what reaches [server].
+ *
+ * Subclasses share one app and one server. Envelopes that arrive late can outlive [server]'s reset,
+ * so tests match on values only they produce.
+ */
+abstract class IntegrationTest {
+  val server = TomcatApp.server
+  val restTemplate = TomcatApp.restTemplate
+
+  @Before
+  fun resetServer() {
+    server.reset()
+  }
+}
+
+/**
+ * The app in an embedded Tomcat, with no Spring Boot on the classpath, so Sentry takes the same
+ * path as in a WAR. Tomcat starts once per test JVM.
+ */
+object TomcatApp {
+  val server = MockSentryServer()
+
+  init {
+    System.setProperty("sentry.dsn", server.dsn)
+    // The profiler rejects a traces path with a dot anywhere in it, which the module's absolute
+    // path can have.
+    System.setProperty(
+      "sentry.profiling-traces-dir-path",
+      "${System.getProperty("java.io.tmpdir")}/sentry-integration-test/profiling-traces",
+    )
+  }
+
+  private val tomcat =
+    Tomcat().apply {
+      setBaseDir(Files.createTempDirectory("tomcat").toString())
+      setPort(0)
+      // Creates the default connector.
+      connector
+      val context = addContext("", Files.createTempDirectory("docbase").toString())
+      // As Tomcat does for a WAR, runs each initializer the classpath registers: Spring's starts
+      // AppInitializer's app, and Sentry's adds SentrySpringFilter. Only Spring's uses the set.
+      ServiceLoader.load(ServletContainerInitializer::class.java).forEach {
+        context.addServletContainerInitializer(it, setOf(AppInitializer::class.java))
+      }
+      start()
+    }
+
+  val restTemplate =
+    RestTemplate().apply {
+      uriTemplateHandler =
+        DefaultUriBuilderFactory("http://localhost:${tomcat.connector.localPort}")
+      // Returns error responses rather than throwing them, so tests can check a failed request.
+      errorHandler =
+        object : DefaultResponseErrorHandler() {
+          override fun hasError(response: ClientHttpResponse): Boolean = false
+        }
+    }
+}