Release 6.0.0

.craft.yml

@@ -24,6 +24,7 @@ targets:
       maven:io.sentry:sentry-spring:
       maven:io.sentry:sentry-spring-boot-starter:
       maven:io.sentry:sentry-servlet:
+      maven:io.sentry:sentry-servlet-jakarta:
       maven:io.sentry:sentry-logback:
       maven:io.sentry:sentry-log4j2:
       maven:io.sentry:sentry-jul:

.github/ISSUE_TEMPLATE/bug_report_java.yml

@@ -14,6 +14,7 @@ body:
         - sentry-apollo
         - sentry-kotlin-extensions
         - sentry-servlet
+        - sentry-servlet-jakarta
         - sentry-spring-boot-starter
         - sentry-spring
         - sentry-logback

.github/workflows/release.yml

@@ -8,6 +8,10 @@ on:
       force:
         description: Force a release even when there are release-blockers (optional)
         required: false
+      merge_target:
+        description: Target branch to merge into. Uses the default branch as a fallback (optional)
+        required: false
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -24,3 +28,4 @@ jobs:
         with:
           version: ${{ github.event.inputs.version }}
           force: ${{ github.event.inputs.force }}
+          merge_target: ${{ github.event.inputs.merge_target }}

.gitignore

@@ -2,6 +2,7 @@
 .idea/
 .gradle/
 build/
+artifacts/
 out/
 local.properties
 **.iml
@@ -15,3 +16,4 @@ target/
 bin/
 distributions/
 /Sentry/A1F16C4F5D23B2A1D281EE471D6F836BDEA23CB4/
+*.vscode/

.sauce/sentry-uitest-android-benchmark.yml

@@ -0,0 +1,29 @@
+apiVersion: v1alpha
+kind: espresso
+sauce:
+  region: us-west-1
+  # Controls how many suites are executed at the same time (sauce test env only).
+  concurrency: 1
+  metadata:
+    name: Android benchmarks with Espresso
+    tags:
+      - benchmarks
+      - android
+espresso:
+  app: ./sentry-android-integration-tests/sentry-uitest-android-benchmark/build/outputs/apk/release/sentry-uitest-android-benchmark-release.apk
+  testApp: ./sentry-android-integration-tests/sentry-uitest-android-benchmark/build/outputs/apk/androidTest/release/sentry-uitest-android-benchmark-release-androidTest.apk
+suites:
+  name: "Android Benchmarks"
+  devices:
+    - name: "Google Pixel 2"
+      platformVersion: 11
+    - id: Google_Pixel_2_real_us
+  testOptions:
+    useTestOrchestrator: true
+# Controls what artifacts to fetch when the suite on Sauce Cloud has finished.
+artifacts:
+  download:
+    when: always
+    match:
+      - junit.xml
+    directory: ./artifacts/

.sauce/sentry-uitest-android-end2end.yml

@@ -0,0 +1,31 @@
+apiVersion: v1alpha
+kind: espresso
+sauce:
+  region: us-west-1
+  # Controls how many suites are executed at the same time (sauce test env only).
+  concurrency: 1
+  metadata:
+    name: Android end2end tests with Espresso
+    tags:
+      - e2e
+      - android
+espresso:
+  app: ./sentry-android-integration-tests/sentry-uitest-android/build/outputs/apk/release/sentry-uitest-android-release.apk
+  testApp: ./sentry-android-integration-tests/sentry-uitest-android/build/outputs/apk/androidTest/release/sentry-uitest-android-release-androidTest.apk
+suites:
+  name: "Android End2end"
+  emulators:
+    - name: "Android GoogleApi Emulator"
+      orientation: portrait
+      platformVersions:
+        - "11.0"
+        - "10.0"
+  testOptions:
+    useTestOrchestrator: true
+# Controls what artifacts to fetch when the suite on Sauce Cloud has finished.
+artifacts:
+  download:
+    when: always
+    match:
+      - junit.xml
+    directory: ./artifacts/

CONTRIBUTING.md

@@ -1,13 +1,13 @@
 # Contributing to sentry-java
 
-We love pull requests from everyone. 
+We love pull requests from everyone.
 We suggest opening an issue to discuss bigger changes before investing on a big PR.
 
 # Requirements
 
-The project currently requires you run JDK version `1.8.x`.
+The project currently requires you run JDK 11.
 
-## Android 
+## Android
 
 This repository is a monorepo which includes Java and Android libraries.
 If you'd like to contribute to Java and don't have an Android SDK with NDK installed,

build.gradle.kts

@@ -56,6 +56,8 @@ apiValidation {
             "sentry-samples-spring-boot",
             "sentry-samples-spring-boot-webflux",
             "sentry-samples-netflix-dgs",
+            "sentry-uitest-android",
+            "sentry-uitest-android-benchmark",
         )
     )
 }
@@ -86,7 +88,7 @@ allprojects {
 }
 
 subprojects {
-    if (!this.name.contains("sample") && this.name != "sentry-test-support") {
+    if (!this.name.contains("sample") && !this.name.contains("integration-tests") && this.name != "sentry-test-support") {
         apply<DistributionPlugin>()
 
         val sep = File.separator
@@ -137,7 +139,7 @@ spotless {
         target("**/*.java")
         removeUnusedImports()
         googleJavaFormat()
-        targetExclude("**/generated/**")
+        targetExclude("**/generated/**", "**/vendor/**")
     }
 
     kotlin {
@@ -165,7 +167,7 @@ gradle.projectsEvaluated {
             "https://docs.spring.io/spring-boot/docs/current/api/"
         )
         subprojects
-            .filter { !it.name.contains("sample") }
+            .filter { !it.name.contains("sample") && !it.name.contains("integration-tests") }
             .forEach { proj ->
                 proj.tasks.withType<Javadoc>().forEach { javadocTask ->
                     source += javadocTask.source

buildSrc/src/main/java/Config.kt

@@ -1,15 +1,14 @@
 import java.math.BigDecimal
 
 object Config {
-    val kotlinVersion = "1.4.32"
+    val kotlinVersion = "1.5.31"
     val kotlinStdLib = "stdlib-jdk8"
 
-    val springBootVersion = "2.4.4"
-    // Spring is currently not compatible with Kotlin 1.4
-    val springKotlinCompatibleLanguageVersion = "1.3"
+    val springBootVersion = "2.6.8"
+    val kotlinCompatibleLanguageVersion = "1.4"
 
     object BuildPlugins {
-        val androidGradle = "com.android.tools.build:gradle:7.1.2"
+        val androidGradle = "com.android.tools.build:gradle:7.2.0"
         val kotlinGradlePlugin = "gradle-plugin"
         val buildConfig = "com.github.gmazzo.buildconfig"
         val buildConfigVersion = "3.0.3"
@@ -40,15 +39,12 @@ object Config {
 
     object Libs {
         val okHttpVersion = "4.9.2"
-        val appCompat = "androidx.appcompat:appcompat:1.2.0"
+        val appCompat = "androidx.appcompat:appcompat:1.3.0"
         val timber = "com.jakewharton.timber:timber:4.7.1"
         val okhttpBom = "com.squareup.okhttp3:okhttp-bom:$okHttpVersion"
         val okhttp = "com.squareup.okhttp3:okhttp"
-        // only bump gson if https://github.com/google/gson/issues/1597 is fixed
-        private val gsonVersion = "2.8.5"
-        val gsonDep = "com.google.code.gson:gson"
-        val gson = "$gsonDep:$gsonVersion"
         val leakCanary = "com.squareup.leakcanary:leakcanary-android:2.8.1"
+        val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.3"
 
         private val lifecycleVersion = "2.2.0"
         val lifecycleProcess = "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
@@ -57,6 +53,7 @@ object Config {
         val androidxRecylerView = "androidx.recyclerview:recyclerview:1.2.1"
 
         val slf4jApi = "org.slf4j:slf4j-api:1.7.30"
+        val slf4jJdk14 = "org.slf4j:slf4j-jdk14:1.7.30"
         val logbackVersion = "1.2.9"
         val logbackClassic = "ch.qos.logback:logback-classic:$logbackVersion"
 
@@ -79,6 +76,7 @@ object Config {
         val springAop = "org.springframework:spring-aop"
         val aspectj = "org.aspectj:aspectjweaver"
         val servletApi = "javax.servlet:javax.servlet-api:3.1.0"
+        val servletApiJakarta = "jakarta.servlet:jakarta.servlet-api:5.0.0"
 
         val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:5.0.4"
 
@@ -114,12 +112,19 @@ object Config {
     }
 
     object TestLibs {
-        private val androidxTestVersion = "1.4.0-rc01"
+        private val androidxTestVersion = "1.4.0"
+        private val espressoVersion = "3.4.0"
 
+        val androidJUnitRunner = "androidx.test.runner.AndroidJUnitRunner"
         val kotlinTestJunit = "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
         val androidxCore = "androidx.test:core:$androidxTestVersion"
         val androidxRunner = "androidx.test:runner:$androidxTestVersion"
-        val androidxJunit = "androidx.test.ext:junit:1.1.3-rc01"
+        val androidxTestCoreKtx = "androidx.test:core-ktx:$androidxTestVersion"
+        val androidxTestRules = "androidx.test:rules:$androidxTestVersion"
+        val espressoCore = "androidx.test.espresso:espresso-core:$espressoVersion"
+        val espressoIdlingResource = "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
+        val androidxTestOrchestrator = "androidx.test:orchestrator:1.4.1"
+        val androidxJunit = "androidx.test.ext:junit:1.1.3"
         val androidxCoreKtx = "androidx.core:core-ktx:1.7.0"
         val robolectric = "org.robolectric:robolectric:4.7.3"
         val mockitoKotlin = "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"

gradle.properties

@@ -7,7 +7,10 @@ org.gradle.parallel=true
 android.useAndroidX=true
 
 # Release information
-versionName=5.7.5-SNAPSHOT
+versionName=6.0.0-rc.1
+
+# Override the SDK name on native crashes on Android
+sentryAndroidSdkName=sentry.native.android
 
 # disable renderscript, it's enabled by default
 android.defaults.buildfeatures.renderscript=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sentry-android-core/api/sentry-android-core.api

@@ -8,7 +8,7 @@ public final class io/sentry/android/core/ActivityFramesTracker {
 }
 
 public final class io/sentry/android/core/ActivityLifecycleIntegration : android/app/Application$ActivityLifecycleCallbacks, io/sentry/Integration, java/io/Closeable {
-	public fun <init> (Landroid/app/Application;Lio/sentry/android/core/IBuildInfoProvider;Lio/sentry/android/core/ActivityFramesTracker;)V
+	public fun <init> (Landroid/app/Application;Lio/sentry/android/core/BuildInfoProvider;Lio/sentry/android/core/ActivityFramesTracker;)V
 	public fun close ()V
 	public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
 	public fun onActivityDestroyed (Landroid/app/Activity;)V
@@ -58,10 +58,14 @@ public final class io/sentry/android/core/BuildConfig {
 	public fun <init> ()V
 }
 
-public final class io/sentry/android/core/BuildInfoProvider : io/sentry/android/core/IBuildInfoProvider {
-	public fun <init> ()V
+public final class io/sentry/android/core/BuildInfoProvider {
+	public fun <init> (Lio/sentry/ILogger;)V
 	public fun getBuildTags ()Ljava/lang/String;
+	public fun getManufacturer ()Ljava/lang/String;
+	public fun getModel ()Ljava/lang/String;
 	public fun getSdkInfoVersion ()I
+	public fun getVersionRelease ()Ljava/lang/String;
+	public fun isEmulator ()Ljava/lang/Boolean;
 }
 
 public abstract class io/sentry/android/core/EnvelopeFileObserverIntegration : io/sentry/Integration, java/io/Closeable {
@@ -71,11 +75,6 @@ public abstract class io/sentry/android/core/EnvelopeFileObserverIntegration : i
 	public final fun register (Lio/sentry/IHub;Lio/sentry/SentryOptions;)V
 }
 
-public abstract interface class io/sentry/android/core/IBuildInfoProvider {
-	public abstract fun getBuildTags ()Ljava/lang/String;
-	public abstract fun getSdkInfoVersion ()I
-}
-
 public abstract interface class io/sentry/android/core/IDebugImagesLoader {
 	public abstract fun clearDebugImages ()V
 	public abstract fun loadDebugImages ()Ljava/util/List;
@@ -101,6 +100,19 @@ public final class io/sentry/android/core/PhoneStateBreadcrumbsIntegration : io/
 	public fun register (Lio/sentry/IHub;Lio/sentry/SentryOptions;)V
 }
 
+public final class io/sentry/android/core/ScreenshotEventProcessor : android/app/Application$ActivityLifecycleCallbacks, io/sentry/EventProcessor, java/io/Closeable {
+	public fun <init> (Landroid/app/Application;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/android/core/BuildInfoProvider;)V
+	public fun close ()V
+	public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
+	public fun onActivityDestroyed (Landroid/app/Activity;)V
+	public fun onActivityPaused (Landroid/app/Activity;)V
+	public fun onActivityResumed (Landroid/app/Activity;)V
+	public fun onActivitySaveInstanceState (Landroid/app/Activity;Landroid/os/Bundle;)V
+	public fun onActivityStarted (Landroid/app/Activity;)V
+	public fun onActivityStopped (Landroid/app/Activity;)V
+	public fun process (Lio/sentry/SentryEvent;Lio/sentry/Hint;)Lio/sentry/SentryEvent;
+}
+
 public final class io/sentry/android/core/SentryAndroid {
 	public static fun init (Landroid/content/Context;)V
 	public static fun init (Landroid/content/Context;Lio/sentry/ILogger;)V
@@ -113,18 +125,22 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun enableAllAutoBreadcrumbs (Z)V
 	public fun getAnrTimeoutIntervalMillis ()J
 	public fun getDebugImagesLoader ()Lio/sentry/android/core/IDebugImagesLoader;
+	public fun getProfilingTracesIntervalMillis ()I
 	public fun isAnrEnabled ()Z
 	public fun isAnrReportInDebug ()Z
+	public fun isAttachScreenshot ()Z
 	public fun isEnableActivityLifecycleBreadcrumbs ()Z
 	public fun isEnableActivityLifecycleTracingAutoFinish ()Z
 	public fun isEnableAppComponentBreadcrumbs ()Z
 	public fun isEnableAppLifecycleBreadcrumbs ()Z
 	public fun isEnableAutoActivityLifecycleTracing ()Z
 	public fun isEnableSystemEventBreadcrumbs ()Z
 	public fun isEnableUserInteractionBreadcrumbs ()Z
+	public fun isEnableUserInteractionTracing ()Z
 	public fun setAnrEnabled (Z)V
 	public fun setAnrReportInDebug (Z)V
 	public fun setAnrTimeoutIntervalMillis (J)V
+	public fun setAttachScreenshot (Z)V
 	public fun setDebugImagesLoader (Lio/sentry/android/core/IDebugImagesLoader;)V
 	public fun setEnableActivityLifecycleBreadcrumbs (Z)V
 	public fun setEnableActivityLifecycleTracingAutoFinish (Z)V
@@ -133,6 +149,8 @@ public final class io/sentry/android/core/SentryAndroidOptions : io/sentry/Sentr
 	public fun setEnableAutoActivityLifecycleTracing (Z)V
 	public fun setEnableSystemEventBreadcrumbs (Z)V
 	public fun setEnableUserInteractionBreadcrumbs (Z)V
+	public fun setEnableUserInteractionTracing (Z)V
+	public fun setProfilingTracesIntervalMillis (I)V
 }
 
 public final class io/sentry/android/core/SentryInitProvider : android/content/ContentProvider {

sentry-android-core/build.gradle.kts

@@ -16,7 +16,7 @@ android {
         targetSdk = Config.Android.targetSdkVersion
         minSdk = Config.Android.minSdkVersion
 
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner = Config.TestLibs.androidJUnitRunner
 
         buildConfigField("String", "SENTRY_ANDROID_SDK_NAME", "\"${Config.Sentry.SENTRY_ANDROID_SDK_NAME}\"")