Merge branch 'main' into feat/speed-up-tests

adinauer · web-flow · commit 9f086cd3126e · 2025-08-26T12:37:14.000+02:00
diff --git a/.craft.yml b/.craft.yml
@@ -62,3 +62,4 @@ targets:
       maven:io.sentry:sentry-android-replay:
       maven:io.sentry:sentry-apollo-4:
       maven:io.sentry:sentry-reactor:
+      maven:io.sentry:sentry-ktor-client:
diff --git a/.github/workflows/integration-tests-ui-critical.yml b/.github/workflows/integration-tests-ui-critical.yml
@@ -59,10 +59,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - api-level: 30 # Android 11
-            target: aosp_atd
-            channel: canary # Necessary for ATDs
-            arch: x86_64
           - api-level: 31 # Android 12
             target: aosp_atd
             channel: canary # Necessary for ATDs
@@ -75,6 +71,10 @@ jobs:
             target: aosp_atd
             channel: canary # Necessary for ATDs
             arch: x86_64
+          - api-level: 35 # Android 15
+            target: aosp_atd
+            channel: canary # Necessary for ATDs
+            arch: x86_64
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
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-jakarta"
+            agent: "false"
+            agent-auto-init: "true"
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,9 @@ distributions/
 sentry-spring-boot-starter-jakarta/src/main/resources/META-INF/spring.factories
 sentry-samples/sentry-samples-spring-boot-jakarta/spy.log
 sentry-mock-server.txt
+tomcat-server.txt
 spring-server.txt
+*.pid
 spy.log
 .kotlin
+**/tomcat.8080/webapps/
diff --git a/.sauce/sentry-uitest-android-benchmark-lite.yml b/.sauce/sentry-uitest-android-benchmark-lite.yml
@@ -18,12 +18,13 @@ espresso:
 
 suites:
 
-  - name: "Android 11 (api 30)"
+  - name: "Android 15 Benchmark lite (api 35)"
     testOptions:
       clearPackageData: true
       useTestOrchestrator: true
     devices:
-      - id: Google_Pixel_3a_real # Google Pixel 3a - api 30 (11)
+      - name: ".*"
+        platformVersion: "15"
 
 artifacts:
   download:
diff --git a/.sauce/sentry-uitest-android-benchmark.yml b/.sauce/sentry-uitest-android-benchmark.yml
@@ -19,49 +19,34 @@ espresso:
 suites:
 
   # Devices are chosen so that there is a high-end and a low-end device for each api level
-  - name: "Android 12 (api 31)"
+  - name: "Android 15 (api 35)"
     testOptions:
       clearPackageData: true
       useTestOrchestrator: true
     devices:
-      - id: Google_Pixel_6_Pro_real_us # Google Pixel 6 Pro - api 31 (12) - high end
-      - id: Google_Pixel_5_12_real_us # Google Pixel 5 - api 31 (12) - low end
+      - id: Google_Pixel_9_Pro_XL_15_real_sjc1 # Google Pixel 9 Pro XL - api 35 (15) - high end
+      - id: Samsung_Galaxy_S23_15_real_sjc1 # Samsung Galaxy S23 - api 35 (15) - mid end
+      - id: Google_Pixel_6a_15_real_sjc1 # Google Pixel 6a - api 35 (15) - low end
 
-  - name: "Android 11 (api 30)"
+  - name: "Android 14 (api 34)"
     testOptions:
       clearPackageData: true
       useTestOrchestrator: true
     devices:
-      - id: Samsung_Galaxy_S10_Plus_11_real_us # Samsung Galaxy S10+ - api 30 (11) - high end
-      - id: Google_Pixel_4a_real_us # Google Pixel 4a - api 30 (11) - mid end
-      - id: Google_Pixel_3a_real # Google Pixel 3a - api 30 (11) - low end
+      - id: Google_Pixel_9_Pro_XL_real_sjc1 # Google Pixel 9 Pro XL - api 34 (14) - high end
+      - id: Samsung_Galaxy_A54_real_sjc1 # Samsung Galaxy A54 - api 34 (14) - low end
 
-  - name: "Android 10 (api 29)"
+  - name: "Android 13 (api 33)"
     testOptions:
       clearPackageData: true
       useTestOrchestrator: true
     devices:
-      - id: Google_Pixel_3a_XL_real # Google Pixel 3a XL - api 29 (10)
-      - id: OnePlus_6T_real # OnePlus 6T - api 29 (10)
+      - id: Google_Pixel_7_Pro_real_us # Google Pixel 7 Pro - api 33 (13) - high end
+      - id: Samsung_Galaxy_A32_5G_real_sjc1 # Samsung Galaxy A32 5G - api 33 (13) - low end
 
-# At the time of writing (July, 4, 2022), the market share per android version is:
-# 12.0 = 17.54%, 11.0 = 31.65%, 10.0 = 21.92%
-# Using these 3 versions we cover 71,11% of all devices out there. Currently, this is enough for benchmarking scope
-# Leaving these devices here in case we change mind on them
-#    devices:
-#      - id: Samsung_Galaxy_S8_plus_real_us # Samsung Galaxy S8+ - api 28 (9)
-#      - id: LG_G8_ThinQ_real_us # LG G8 ThinQ - api 28 (9)
-#      - id: OnePlus_5_real_us # OnePlus 5 - api 27 (8.1.0)
-#      - id: LG_K30_real_us1 # LG K30 - api 27 (8.1.0)
-#      - id: HTC_10_real_us # HTC 10 - api 26 (8.0.0)
-#      - id: Samsung_A3_real # Samsung Galaxy A3 2017 - api 26 (8.0.0)
-#      - id: ZTE_Axon_7_real2_us # ZTE Axon 7 - api 25 (7.1.1)
-#      - id: Motorola_Moto_X_Play_real # Motorola Moto X Play - api 25 (7.1.1)
-#      - id: Samsung_note_5_real_us # Samsung Galaxy Note 5 - api 24 (7.0)
-#      - id: LG_K10_real # LG K10 - api 24 (7.0)
-#      - id: Samsung_Galaxy_S6_Edge_Plus_real # Samsung Galaxy S6 Edge+ - api 23 (6.0.1)
-#      - id: Samsung_Tab_E_real_us # Samsung Tab E - api 23 (6.0.1)
-#      - id: Amazon_Kindle_Fire_HD_8_real_us # Amazon Kindle Fire HD 8 - api 22 (5.1.1)
+# At the time of writing (August, 13, 2025), the market share per android version is:
+# 15.0 = 26.75%, 14.0 = 19.5%, 13 = 15.95%
+# Using these 3 versions we cover 62.2% of all devices out there. Currently, this is enough for benchmarking scope
 
 artifacts:
   download:
diff --git a/.sauce/sentry-uitest-android-ui.yml b/.sauce/sentry-uitest-android-ui.yml
@@ -18,29 +18,29 @@ espresso:
   testApp: ./sentry-android-integration-tests/sentry-uitest-android/build/outputs/apk/androidTest/release/sentry-uitest-android-release-androidTest.apk
 suites:
 
-  - name: "Android 14 Ui test (api 34)"
+  - name: "Android 15 Ui test (api 35)"
     testOptions:
       clearPackageData: true
       useTestOrchestrator: true
     devices:
       - name: ".*"
-        platformVersion: "14"
+        platformVersion: "15"
 
-  - name: "Android 13 Ui test (api 33)"
+  - name: "Android 14 Ui test (api 34)"
     testOptions:
       clearPackageData: true
       useTestOrchestrator: true
     devices:
       - name: ".*"
-        platformVersion: "13"
+        platformVersion: "14"
 
-  - name: "Android 11 Ui test (api 31)"
+  - name: "Android 13 Ui test (api 33)"
     testOptions:
       clearPackageData: true
       useTestOrchestrator: true
     devices:
       - name: ".*"
-        platformVersion: "11"
+        platformVersion: "13"
 
 # Controls what artifacts to fetch when the suite on Sauce Cloud has finished.
 artifacts:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,16 @@
 
 - Add support for Spring Boot 4 and Spring 7 ([#4601](https://github.com/getsentry/sentry-java/pull/4601))
   - NOTE: Our `sentry-opentelemetry-agentless-spring` is not working yet for Spring Boot 4. Please use `sentry-opentelemetry-agent` until OpenTelemetry has support for Spring Boot 4.
+
+## 8.20.0
+
+### Fixes
+
+- Do not use named capturing groups for regular expressions ([#4652](https://github.com/getsentry/sentry-java/pull/4652))
+  - This fixes a crash on Android versions below 8.0 (API level 26)
+
+### Features
+
 - Add onDiscard to enable users to track the type and amount of data discarded before reaching Sentry ([#4612](https://github.com/getsentry/sentry-java/pull/4612))
   - Stub for setting the callback on `Sentry.init`:
      ```java
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 android.useAndroidX=true
 
 # Release information
-versionName=8.19.1
+versionName=8.20.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -100,6 +100,7 @@ graphql-java24 = { module = "com.graphql-java:graphql-java", version = "24.0" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
 jackson-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" }
 jetbrains-annotations = { module = "org.jetbrains:annotations", version = "23.0.0" }
+kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
 kotlin-test-junit-spring7 = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinSpring7" }
 kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
@@ -130,7 +131,7 @@ retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit
 retrofit-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
 sentry-native-ndk = { module = "io.sentry:sentry-native-ndk", version = "0.10.0" }
 servlet-api = { module = "javax.servlet:javax.servlet-api", version = "3.1.0" }
-servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "5.0.0" }
+servlet-jakarta-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
 slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.5" }
@@ -174,6 +175,10 @@ springboot4-starter-jdbc = { module = "org.springframework.boot:spring-boot-star
 springboot4-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "springboot4" }
 timber = { module = "com.jakewharton.timber:timber", version = "4.7.1" }
 
+# tomcat libraries
+tomcat-catalina-jakarta = { module = "org.apache.tomcat:tomcat-catalina", version = "11.0.10" }
+tomcat-embed-jasper-jakarta = { module = "org.apache.tomcat.embed:tomcat-embed-jasper", version = "11.0.10" }
+
 # test libraries
 androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.8" }
 androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" }
diff --git a/sentry-android-integration-tests/sentry-uitest-android-benchmark/src/androidTest/java/io/sentry/uitest/android/benchmark/SentryBenchmarkTest.kt b/sentry-android-integration-tests/sentry-uitest-android-benchmark/src/androidTest/java/io/sentry/uitest/android/benchmark/SentryBenchmarkTest.kt
@@ -101,15 +101,16 @@ class SentryBenchmarkTest : BaseBenchmarkTest() {
         benchmarkOperationProfiled,
         "ProfiledTransaction",
         refreshRate,
+        measuredIterations = 40,
       )
     comparisonResults.printAllRuns("Profiling Benchmark")
     val comparisonResult = comparisonResults.getSummaryResult()
     comparisonResult.printResults()
 
     // Currently we just want to assert the cpu overhead
     assertTrue(
-      comparisonResult.cpuTimeIncreasePercentage in 0F..5F,
-      "Expected ${comparisonResult.cpuTimeIncreasePercentage} to be in range 0 < x < 5",
+      comparisonResult.cpuTimeIncreasePercentage in 0F..5.5F,
+      "Expected ${comparisonResult.cpuTimeIncreasePercentage} to be in range 0 < x < 5.5",
     )
   }
 
diff --git a/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts b/sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts
@@ -1,8 +1,8 @@
-import org.jetbrains.kotlin.config.KotlinCompilerVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
+  application
   alias(libs.plugins.springboot3) apply false
   alias(libs.plugins.spring.dependency.management)
   alias(libs.plugins.kotlin.jvm)
@@ -11,6 +11,11 @@ plugins {
   alias(libs.plugins.gretty)
 }
 
+application { mainClass.set("io.sentry.samples.spring.jakarta.Main") }
+
+// Ensure WAR is up to date before run task
+tasks.named("run") { dependsOn(tasks.named("war")) }
+
 group = "io.sentry.sample.spring-jakarta"
 
 version = "0.0.1-SNAPSHOT"
@@ -21,7 +26,12 @@ java.targetCompatibility = JavaVersion.VERSION_17
 
 repositories { mavenCentral() }
 
-dependencyManagement { imports { mavenBom(SpringBootPlugin.BOM_COORDINATES) } }
+dependencyManagement {
+  imports {
+    mavenBom(SpringBootPlugin.BOM_COORDINATES)
+    mavenBom(libs.kotlin.bom.get().toString())
+  }
+}
 
 dependencies {
   implementation(Config.Libs.springWeb)
@@ -30,23 +40,50 @@ dependencies {
   implementation(Config.Libs.springSecurityWeb)
   implementation(Config.Libs.springSecurityConfig)
   implementation(Config.Libs.kotlinReflect)
-  implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
+  implementation(kotlin(Config.kotlinStdLib))
   implementation(projects.sentrySpringJakarta)
   implementation(projects.sentryLogback)
   implementation(libs.jackson.databind)
   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 {
     compilerOptions.freeCompilerArgs = listOf("-Xjsr305=strict")
     compilerOptions.jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
   }
 }
+
+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-jakarta/src/main/java/io/sentry/samples/spring/jakarta/Main.java b/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/Main.java
@@ -0,0 +1,32 @@
+package io.sentry.samples.spring.jakarta;
+
+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-jakarta-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-jakarta/src/main/java/io/sentry/samples/spring/jakarta/web/Person.java b/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/web/Person.java
@@ -1,10 +1,15 @@
 package io.sentry.samples.spring.jakarta.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-jakarta/src/main/java/io/sentry/samples/spring/jakarta/web/PersonController.java b/sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/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-jakarta/src/test/kotlin/io/sentry/DummyTest.kt b/sentry-samples/sentry-samples-spring-jakarta/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-jakarta/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt b/sentry-samples/sentry-samples-spring-jakarta/src/test/kotlin/io/sentry/systemtest/PersonSystemTest.kt
diff --git a/sentry/src/main/java/io/sentry/SentryTraceHeader.java b/sentry/src/main/java/io/sentry/SentryTraceHeader.java
diff --git a/sentry/src/main/java/io/sentry/util/SpanUtils.java b/sentry/src/main/java/io/sentry/util/SpanUtils.java
diff --git a/sentry/src/test/java/io/sentry/SentryTraceHeaderTest.kt b/sentry/src/test/java/io/sentry/SentryTraceHeaderTest.kt
diff --git a/test/system-test-runner.py b/test/system-test-runner.py
