Merge branch 'main' into feat/spring-boot-test-matrix

adinauer · web-flow · commit 81a34126714c · 2025-09-26T12:08:38.000+02:00
diff --git a/.craft.yml b/.craft.yml
@@ -19,13 +19,13 @@ targets:
       maven:io.sentry:sentry:
       maven:io.sentry:sentry-spring:
       maven:io.sentry:sentry-spring-jakarta:
-#      maven:io.sentry:sentry-spring-7:
+      maven:io.sentry:sentry-spring-7:
       maven:io.sentry:sentry-spring-boot:
       maven:io.sentry:sentry-spring-boot-jakarta:
       maven:io.sentry:sentry-spring-boot-starter:
       maven:io.sentry:sentry-spring-boot-starter-jakarta:
-#      maven:io.sentry:sentry-spring-boot-4:
-#      maven:io.sentry:sentry-spring-boot-4-starter:
+      maven:io.sentry:sentry-spring-boot-4:
+      maven:io.sentry:sentry-spring-boot-4-starter:
       maven:io.sentry:sentry-servlet:
       maven:io.sentry:sentry-servlet-jakarta:
       maven:io.sentry:sentry-logback:
diff --git a/.github/workflows/system-tests-backend.yml b/.github/workflows/system-tests-backend.yml
@@ -78,6 +78,9 @@ jobs:
           - sample: "sentry-samples-spring-boot-4-opentelemetry"
             agent: "true"
             agent-auto-init: "false"
+          - sample: "sentry-samples-spring-7"
+            agent: "false"
+            agent-auto-init: "true"
           - sample: "sentry-samples-spring-jakarta"
             agent: "false"
             agent-auto-init: "true"
diff --git a/README.md b/README.md
@@ -42,10 +42,13 @@ Sentry SDK for Java and Android
 | sentry-servlet-jakarta                  | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet-jakarta/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet-jakarta)                                   | |
 | sentry-spring-boot                      | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot)                                           |
 | sentry-spring-boot-jakarta              | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-jakarta/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-jakarta)                           |
+| sentry-spring-boot-4                    | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-4/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-4)                                       |
+| sentry-spring-boot-4-starter            | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-4-starter/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-4-starter)               |
 | sentry-spring-boot-starter              | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-starter/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-starter)                           |
 | sentry-spring-boot-starter-jakarta      | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-starter-jakarta/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-boot-starter-jakarta)           |
 | sentry-spring                           | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring)                                                     |
 | sentry-spring-jakarta                   | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-jakarta/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-jakarta)                                     |
+| sentry-spring-7                         | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-7/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-spring-7)                                                 |
 | sentry-logback                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-logback/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-logback)                                                   |
 | sentry-log4j2                           | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-log4j2/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-log4j2)                                                     |
 | sentry-bom                              | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-bom/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-bom)                                                           |
@@ -58,7 +61,7 @@ Sentry SDK for Java and Android
 | sentry-opentelemetry-agentcustomization | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-agentcustomization/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-agentcustomization) |
 | sentry-opentelemetry-core               | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-core)                             |
 | sentry-okhttp                           | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-okhttp/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-okhttp)                                                     |
-| sentry-reactor                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-reactor/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-reactor)                                                    |
+| sentry-reactor                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-reactor/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-reactor)                                                   |
 
 # Releases
 
diff --git a/sentry-samples/sentry-samples-spring-7/build.gradle.kts b/sentry-samples/sentry-samples-spring-7/build.gradle.kts
@@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
+  application
   alias(libs.plugins.springboot4) apply false
   alias(libs.plugins.spring.dependency.management)
   alias(libs.plugins.kotlin.jvm)
@@ -11,6 +12,11 @@ plugins {
   alias(libs.plugins.gretty)
 }
 
+application { mainClass.set("io.sentry.samples.spring7.Main") }
+
+// Ensure WAR is up to date before run task
+tasks.named("run") { dependsOn(tasks.named("war")) }
+
 group = "io.sentry.sample.spring-7"
 
 version = "0.0.1-SNAPSHOT"
@@ -37,13 +43,17 @@ dependencies {
   implementation(libs.logback.classic)
   implementation(libs.servlet.jakarta.api)
   implementation(libs.slf4j2.api)
+
+  implementation(libs.tomcat.catalina.jakarta)
+  implementation(libs.tomcat.embed.jasper.jakarta)
+
+  testImplementation(projects.sentrySystemTestSupport)
+  testImplementation(libs.kotlin.test.junit)
   testImplementation(libs.springboot.starter.test) {
     exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
   }
 }
 
-tasks.withType<Test>().configureEach { useJUnitPlatform() }
-
 tasks.withType<KotlinCompile>().configureEach {
   kotlin {
     explicitApi()
@@ -55,3 +65,26 @@ tasks.withType<KotlinCompile>().configureEach {
     compilerOptions.apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_1_9
   }
 }
+
+configure<SourceSetContainer> { test { java.srcDir("src/test/java") } }
+
+tasks.register<Test>("systemTest").configure {
+  group = "verification"
+  description = "Runs the System tests"
+
+  outputs.upToDateWhen { false }
+
+  maxParallelForks = 1
+
+  // Cap JVM args per test
+  minHeapSize = "128m"
+  maxHeapSize = "1g"
+
+  filter { includeTestsMatching("io.sentry.systemtest*") }
+}
+
+tasks.named("test").configure {
+  require(this is Test)
+
+  filter { excludeTestsMatching("io.sentry.systemtest.*") }
+}
diff --git a/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/Main.java b/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/Main.java
@@ -0,0 +1,32 @@
+package io.sentry.samples.spring7;
+
+import java.io.File;
+import java.io.IOException;
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.startup.Tomcat;
+
+public class Main {
+
+  public static void main(String[] args) throws LifecycleException, IOException {
+    File webappsDirectory = new File("./tomcat.8080/webapps");
+    if (!webappsDirectory.exists()) {
+      boolean didCreateDirectories = webappsDirectory.mkdirs();
+      if (!didCreateDirectories) {
+        throw new RuntimeException(
+            "Failed to create directory required by Tomcat: " + webappsDirectory.getAbsolutePath());
+      }
+    }
+
+    String pathToWar = "./build/libs";
+    String warName = "sentry-samples-spring-7-0.0.1-SNAPSHOT";
+    File war = new File(pathToWar + "/" + warName + ".war");
+
+    Tomcat tomcat = new Tomcat();
+    tomcat.setPort(8080);
+    tomcat.getConnector();
+
+    tomcat.addWebapp("/" + warName, war.getCanonicalPath());
+    tomcat.start();
+    tomcat.getServer().await();
+  }
+}
diff --git a/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/Person.java b/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/Person.java
@@ -1,10 +1,15 @@
 package io.sentry.samples.spring7.web;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class Person {
   private final String firstName;
   private final String lastName;
 
-  public Person(String firstName, String lastName) {
+  @JsonCreator
+  public Person(
+      @JsonProperty("firstName") String firstName, @JsonProperty("lastName") String lastName) {
     this.firstName = firstName;
     this.lastName = lastName;
   }
diff --git a/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/PersonController.java b/sentry-samples/sentry-samples-spring-7/src/main/java/io/sentry/samples/spring7/web/PersonController.java
@@ -22,7 +22,7 @@ public PersonController(PersonService personService) {
   }
 
   @GetMapping("{id}")
-  Person person(@PathVariable Long id) {
+  Person person(@PathVariable("id") Long id) {
     Sentry.logger().warn("warn Sentry logging");
     Sentry.logger().error("error Sentry logging");
     Sentry.logger().info("hello %s %s", "there", "world!");
diff --git a/sentry-samples/sentry-samples-spring-7/src/test/kotlin/io/sentry/DummyTest.kt b/sentry-samples/sentry-samples-spring-7/src/test/kotlin/io/sentry/DummyTest.kt
@@ -0,0 +1,12 @@
+package io.sentry
+
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+class DummyTest {
+  @Test
+  fun `the only test`() {
+    // only needed to have more than 0 tests and not fail the build
+    assertTrue(true)
+  }
+}
diff --git a/sentry-samples/sentry-samples-spring-7/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt b/sentry-samples/sentry-samples-spring-7/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt
@@ -0,0 +1,46 @@
+package io.sentry.systemtest
+
+import io.sentry.systemtest.util.TestHelper
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import org.junit.Before
+
+class PersonSystemTest {
+  lateinit var testHelper: TestHelper
+
+  @Before
+  fun setup() {
+    testHelper = TestHelper("http://localhost:8080/sentry-samples-spring-7-0.0.1-SNAPSHOT")
+    testHelper.reset()
+  }
+
+  @Test
+  fun `get person fails`() {
+    val restClient = testHelper.restClient
+    restClient.getPerson(11L)
+    assertEquals(500, restClient.lastKnownStatusCode)
+
+    testHelper.ensureTransactionReceived { transaction, envelopeHeader ->
+      testHelper.doesTransactionHaveOp(transaction, "http.server")
+    }
+
+    Thread.sleep(10000)
+
+    testHelper.ensureLogsReceived { logs, envelopeHeader ->
+      testHelper.doesContainLogWithBody(logs, "warn Sentry logging") &&
+        testHelper.doesContainLogWithBody(logs, "error Sentry logging") &&
+        testHelper.doesContainLogWithBody(logs, "hello there world!")
+    }
+  }
+
+  @Test
+  fun `create person works`() {
+    val restClient = testHelper.restClient
+    val person = Person("firstA", "lastB")
+    val returnedPerson = restClient.createPerson(person)
+    assertEquals(200, restClient.lastKnownStatusCode)
+
+    assertEquals(person.firstName, returnedPerson!!.firstName)
+    assertEquals(person.lastName, returnedPerson!!.lastName)
+  }
+}
diff --git a/test/system-test-runner.py b/test/system-test-runner.py
@@ -713,6 +713,7 @@ def get_available_modules(self) -> List[ModuleConfig]:
         """Get list of all available test modules."""
         return [
             ModuleConfig("sentry-samples-spring", "false", "true", "false"),
+            ModuleConfig("sentry-samples-spring-7", "false", "true", "false"),
             ModuleConfig("sentry-samples-spring-jakarta", "false", "true", "false"),
             ModuleConfig("sentry-samples-spring-boot", "false", "true", "false"),
             ModuleConfig("sentry-samples-spring-boot-opentelemetry-noagent", "false", "true", "false"),

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public PersonController(PersonService personService) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@GetMapping("{id}")`
`25`		`- Person person(@PathVariable Long id) {`
	`25`	`+ Person person(@PathVariable("id") Long id) {`
`26`	`26`	`Sentry.logger().warn("warn Sentry logging");`
`27`	`27`	`Sentry.logger().error("error Sentry logging");`
`28`	`28`	`Sentry.logger().info("hello %s %s", "there", "world!");`