Merge 4dc470d into 0cc9262

.github/workflows/integration-tests-ui-critical.yml

@@ -0,0 +1,89 @@
+name: UI Tests Critical
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  BASE_PATH: "sentry-android-integration-tests/sentry-uitest-android-critical"
+  BUILD_PATH: "build/outputs/apk/release"
+  APK_NAME: "sentry-uitest-android-critical-release.apk"
+  APK_ARTIFACT_NAME: "sentry-uitest-android-critical-release"
+
+jobs:
+  build:
+    name: Build sentry-uitest-android-critical
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Java 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@bb0c460cbf5354b0cddd15bacdf0d6aaa3e5a32b # pin@v3
+        with:
+          gradle-home-cache-cleanup: true
+
+      - name: Build debug APK
+        run: make assembleUiTestCriticalRelease
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{env.APK_ARTIFACT_NAME}}
+          path: "${{env.BASE_PATH}}/${{env.BUILD_PATH}}/${{env.APK_NAME}}"
+          retention-days: 1
+
+  run-maestro-tests:
+    name: Run Maestro Tests
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup KVM
+        shell: bash
+        run: |
+          # check if virtualization is supported...
+          sudo apt install -y --no-install-recommends cpu-checker coreutils && echo "CPUs=$(nproc --all)" && kvm-ok
+          # allow access to KVM to run the emulator
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' \
+            | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Download APK artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{env.APK_ARTIFACT_NAME}}
+
+      - name: Install Maestro
+        run: |
+          brew tap mobile-dev-inc/tap
+          brew install maestro
+
+      - name: Run Maestro tests
+        run: |
+          maestro test \
+            "${{env.BASE_PATH}}/maestro" \
+            --debug-output "${{env.BASE_PATH}}/maestro-logs"
+
+      - name: Upload Maestro test results
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: maestro-logs
+          path: "${{env.BASE_PATH}}/maestro-logs"
+          retention-days: 1

Makefile

@@ -53,6 +53,14 @@ assembleUiTestRelease:
 	./gradlew :sentry-android-integration-tests:sentry-uitest-android:assembleRelease
 	./gradlew :sentry-android-integration-tests:sentry-uitest-android:assembleAndroidTest -DtestBuildType=release
 
+# Assemble release of the uitest-android-critical module
+assembleUiTestCriticalRelease:
+	./gradlew :sentry-android-integration-tests:sentry-uitest-android-critical:assembleRelease
+
+# Run Maestro tests for the uitest-android-critical module
+runUiTestCritical:
+	./scripts/test-ui-critical.sh
+
 # Create coverage reports
 #  - Jacoco for Java & Android modules
 #  - Kover for KMP modules e.g sentry-compose

build.gradle.kts

@@ -70,7 +70,8 @@ apiValidation {
             "sentry-uitest-android-benchmark",
             "test-app-plain",
             "test-app-sentry",
-            "sentry-samples-netflix-dgs"
+            "sentry-samples-netflix-dgs",
+            "sentry-uitest-android-critical"
         )
     )
 }

scripts/test-ui-critical.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -e
+
+echo "Checking if ADB is installed..."
+if ! command -v adb &> /dev/null; then
+    echo "ADB is not installed or not in PATH. Please install Android SDK platform tools and ensure ADB is in your PATH."
+    exit 1
+fi
+
+echo "Checking if an Android emulator is running..."
+if ! adb devices | grep -q "emulator"; then
+    echo "No Android emulator is currently running. Please start an emulator before running this script."
+    exit 1
+fi
+
+echo "Checking if Maestro is installed..."
+if ! command -v maestro &> /dev/null; then
+    echo "Maestro is not installed. Please install Maestro before running this script."
+    exit 1
+fi
+
+echo "Building the UI Test Critical app..."
+make assembleUiTestCriticalRelease
+
+echo "Installing the UI Test Critical app on the emulator..."
+baseDir="sentry-android-integration-tests/sentry-uitest-android-critical"
+buildDir="build/outputs/apk/release"
+apkName="sentry-uitest-android-critical-release.apk"
+appPath="${baseDir}/${buildDir}/${apkName}"
+adb install -r -d "$appPath"
+
+echo "Running the Maestro tests..."
+maestro test \
+  "${baseDir}/maestro" \
+  --debug-output "${baseDir}/maestro-logs"

sentry-android-integration-tests/sentry-uitest-android-critical/.gitignore

@@ -0,0 +1,2 @@
+/build
+/maestro-logs

sentry-android-integration-tests/sentry-uitest-android-critical/build.gradle.kts

@@ -0,0 +1,64 @@
+import io.gitlab.arturbosch.detekt.Detekt
+
+plugins {
+    id("com.android.application")
+    kotlin("android")
+}
+
+android {
+    compileSdk = Config.Android.compileSdkVersion
+    namespace = "io.sentry.uitest.android.critical"
+
+    signingConfigs {
+        getByName("debug") {
+            // Debug config remains unchanged
+        }
+    }
+
+    defaultConfig {
+        applicationId = "io.sentry.uitest.android.critical"
+        minSdk = 21
+        targetSdk = Config.Android.targetSdkVersion
+        versionCode = 1
+        versionName = "1.0"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            signingConfig = signingConfigs.getByName("debug")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion
+    }
+}
+
+dependencies {
+    implementation(kotlin(Config.kotlinStdLib, org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION))
+    implementation(Config.Libs.androidxCore)
+    implementation(Config.Libs.composeActivity)
+    implementation(Config.Libs.composeFoundation)
+    implementation(Config.Libs.composeMaterial)
+    implementation(Config.Libs.constraintLayout)
+    implementation(projects.sentryAndroidCore)
+}
+
+tasks.withType<Detekt> {
+    // Target version of the generated JVM bytecode. It is used for type resolution.
+    jvmTarget = JavaVersion.VERSION_1_8.toString()
+}
+
+kotlin {
+    explicitApi()
+}

sentry-android-integration-tests/sentry-uitest-android-critical/maestro/corruptEnvelope.yaml

@@ -0,0 +1,11 @@
+appId: io.sentry.uitest.android.critical
+---
+- launchApp
+- tapOn: "Write Corrupted Envelope"
+# The close here ensures the next corrupted envelope
+# will be present on the next app launch
+- tapOn: "Close SDK"
+- tapOn: "Write Corrupted Envelope"
+- stopApp
+- launchApp
+- assertVisible: "Welcome!"

sentry-android-integration-tests/sentry-uitest-android-critical/maestro/crash.yaml

@@ -0,0 +1,6 @@
+appId: io.sentry.uitest.android.critical
+---
+- launchApp
+- tapOn: "Crash"
+- launchApp
+- assertVisible: "Welcome!"

sentry-android-integration-tests/sentry-uitest-android-critical/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

sentry-android-integration-tests/sentry-uitest-android-critical/src/main/AndroidManifest.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:label="Sentry UI Tests Critical"
+        android:supportsRtl="true"
+        tools:targetApi="31">
+        <meta-data android:name="io.sentry.dsn" android:value="https://5b38df1abca1468bac6d7517530f6802@o447951.ingest.us.sentry.io/5428559" />
+        <meta-data android:name="io.sentry.debug" android:value="true" />
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

sentry-android-integration-tests/sentry-uitest-android-critical/src/main/java/io/sentry/uitest/android/critical/MainActivity.kt

@@ -0,0 +1,51 @@
+package io.sentry.uitest.android.critical
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import io.sentry.Sentry
+import java.io.File
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val outboxPath = Sentry.getCurrentHub().options.outboxPath
+            ?: throw RuntimeException("Outbox path is not set.")
+
+        setContent {
+            MaterialTheme {
+                Surface() {
+                    Column() {
+                        Text(text = "Welcome!")
+                        Button(onClick = {
+                            throw RuntimeException("Crash the test app.")
+                        }) {
+                            Text("Crash")
+                        }
+                        Button(onClick = {
+                            Sentry.close()
+                        }) {
+                            Text("Close SDK")
+                        }
+                        Button(onClick = {
+                            val file = File(outboxPath, "corrupted.envelope")
+                            val corruptedEnvelopeContent = """
+                              {"event_id":"1990b5bc31904b7395fd07feb72daf1c","sdk":{"name":"sentry.java.android","version":"7.21.0"}}
+                              {"type":"test","length":50}
+                            """.trimIndent()
+                            file.writeText(corruptedEnvelopeContent)
+                            println("Wrote corrupted envelope to: ${file.absolutePath}")
+                        }) {
+                            Text("Write Corrupted Envelope")
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

settings.gradle.kts

@@ -61,6 +61,7 @@ include(
     "sentry-samples:sentry-samples-spring-boot-webflux",
     "sentry-samples:sentry-samples-spring-boot-webflux-jakarta",
     "sentry-samples:sentry-samples-netflix-dgs",
+    "sentry-android-integration-tests:sentry-uitest-android-critical",
     "sentry-android-integration-tests:sentry-uitest-android-benchmark",
     "sentry-android-integration-tests:sentry-uitest-android",
     "sentry-android-integration-tests:test-app-plain",