Merge branch 'main' into lcian/ref-root

lcian · web-flow · commit cdf064addfae · 2025-09-05T15:24:58.000+02:00
diff --git a/.github/workflows/agp-matrix.yml b/.github/workflows/agp-matrix.yml
@@ -33,7 +33,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Setup Java Version
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Setup Java Version
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -25,7 +25,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Setup Java Version
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/enforce-license-compliance.yml b/.github/workflows/enforce-license-compliance.yml
@@ -14,7 +14,7 @@ jobs:
         uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3
 
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/format-code.yml b/.github/workflows/format-code.yml
@@ -13,7 +13,7 @@ jobs:
           submodules: 'recursive'
 
       - name: set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/generate-javadocs.yml b/.github/workflows/generate-javadocs.yml
@@ -14,7 +14,7 @@ jobs:
           submodules: 'recursive'
 
       - name: set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/integration-tests-benchmarks.yml b/.github/workflows/integration-tests-benchmarks.yml
@@ -32,7 +32,7 @@ jobs:
           submodules: 'recursive'
 
       - name: 'Set up Java: 17'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -82,7 +82,7 @@ jobs:
           submodules: 'recursive'
 
       - name: 'Set up Java: 17'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/integration-tests-ui-critical.yml b/.github/workflows/integration-tests-ui-critical.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Java 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/integration-tests-ui.yml b/.github/workflows/integration-tests-ui.yml
@@ -27,7 +27,7 @@ jobs:
           submodules: 'recursive'
 
       - name: 'Set up Java: 17'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -20,7 +20,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Setup Java Version
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.github/workflows/system-tests-backend.yml b/.github/workflows/system-tests-backend.yml
@@ -96,7 +96,7 @@ jobs:
           python3 -m pip install -r requirements.txt
 
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
diff --git a/.sauce/sentry-uitest-android-ui.yml b/.sauce/sentry-uitest-android-ui.yml
@@ -26,22 +26,6 @@ suites:
       - name: ".*"
         platformVersion: "15"
 
-  - name: "Android 14 Ui test (api 34)"
-    testOptions:
-      clearPackageData: true
-      useTestOrchestrator: true
-    devices:
-      - name: ".*"
-        platformVersion: "14"
-
-  - name: "Android 13 Ui test (api 33)"
-    testOptions:
-      clearPackageData: true
-      useTestOrchestrator: true
-    devices:
-      - name: ".*"
-        platformVersion: "13"
-
 # Controls what artifacts to fetch when the suite on Sauce Cloud has finished.
 artifacts:
   download:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@
   - 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.
 - Replace `UUIDGenerator` implementation with Apache licensed code ([#4662](https://github.com/getsentry/sentry-java/pull/4662))
 - Replace `Random` implementation with MIT licensed code ([#4664](https://github.com/getsentry/sentry-java/pull/4664))
+- Add support for `vars` attribute in `SentryStackFrame` ([#4686](https://github.com/getsentry/sentry-java/pull/4686))
+  - **Breaking change**: The type of the `vars` attribute has been changed from `Map<String, String>` to `Map<String, Object>`.
 
 ## 8.20.0
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,11 +2,11 @@
 apollo = "2.5.9"
 androidxLifecycle = "2.2.0"
 androidxNavigation = "2.4.2"
-androidxTestCore = "1.6.1"
+androidxTestCore = "1.7.0"
 androidxCompose = "1.6.3"
 composeCompiler = "1.5.14"
 coroutines = "1.6.1"
-espresso = "3.5.0"
+espresso = "3.7.0"
 feign = "11.6"
 jacoco = "0.8.7"
 jackson = "2.18.3"
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/SystemEventsBreadcrumbsIntegration.java
@@ -46,6 +46,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -181,26 +182,30 @@ private void registerReceiver(
     }
   }
 
-  private void unregisterReceiver() {
+  @SuppressWarnings("Convert2MethodRef") // older AGP versions do not support method references
+  private void scheduleUnregisterReceiver() {
     if (options == null) {
       return;
     }
 
-    options
-        .getExecutorService()
-        .submit(
-            () -> {
-              final @Nullable SystemEventsBroadcastReceiver receiverRef;
-              try (final @NotNull ISentryLifecycleToken ignored = receiverLock.acquire()) {
-                isStopped = true;
-                receiverRef = receiver;
-                receiver = null;
-              }
+    try {
+      options.getExecutorService().submit(() -> unregisterReceiver());
+    } catch (RejectedExecutionException e) {
+      unregisterReceiver();
+    }
+  }
 
-              if (receiverRef != null) {
-                context.unregisterReceiver(receiverRef);
-              }
-            });
+  private void unregisterReceiver() {
+    final @Nullable SystemEventsBroadcastReceiver receiverRef;
+    try (final @NotNull ISentryLifecycleToken ignored = receiverLock.acquire()) {
+      isStopped = true;
+      receiverRef = receiver;
+      receiver = null;
+    }
+
+    if (receiverRef != null) {
+      context.unregisterReceiver(receiverRef);
+    }
   }
 
   @Override
@@ -215,7 +220,7 @@ public void close() throws IOException {
     }
 
     AppState.getInstance().removeAppStateListener(this);
-    unregisterReceiver();
+    scheduleUnregisterReceiver();
 
     if (options != null) {
       options.getLogger().log(SentryLevel.DEBUG, "SystemEventsBreadcrumbsIntegration removed.");
@@ -264,7 +269,7 @@ public void onForeground() {
 
   @Override
   public void onBackground() {
-    unregisterReceiver();
+    scheduleUnregisterReceiver();
   }
 
   final class SystemEventsBroadcastReceiver extends BroadcastReceiver {
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/BaseUiTest.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/BaseUiTest.kt
@@ -8,10 +8,17 @@ import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.idling.CountingIdlingResource
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnitRunner
+import io.sentry.JsonSerializer
+import io.sentry.ProfilingTraceData
 import io.sentry.Sentry
 import io.sentry.Sentry.OptionsConfiguration
+import io.sentry.SentryEnvelope
+import io.sentry.SentryEvent
+import io.sentry.SentryItemType
+import io.sentry.SentryOptions
 import io.sentry.android.core.SentryAndroid
 import io.sentry.android.core.SentryAndroidOptions
+import io.sentry.protocol.SentryTransaction
 import io.sentry.test.applyTestOptions
 import io.sentry.test.initForTest
 import io.sentry.uitest.android.mockservers.MockRelay
@@ -43,9 +50,9 @@ abstract class BaseUiTest {
   /** Mock relay server that receives all envelopes sent during the test. */
   protected val relay = MockRelay(false, relayIdlingResource)
 
-  private fun disableDontKeepActivities() {
+  private fun runCommand(cmd: String) {
     val automation = InstrumentationRegistry.getInstrumentation().uiAutomation
-    val pfd = automation.executeShellCommand("settings put global always_finish_activities 0")
+    val pfd = automation.executeShellCommand(cmd)
     try {
       FileInputStream(pfd.fileDescriptor).readBytes()
     } catch (e: Throwable) {
@@ -54,6 +61,16 @@ abstract class BaseUiTest {
     pfd.close()
   }
 
+  private fun disableDontKeepActivities() {
+    runCommand("settings put global always_finish_activities 0")
+  }
+
+  fun disableSystemAnimations() {
+    runCommand("settings put global window_animation_scale 0")
+    runCommand("settings put global transition_animation_scale 0")
+    runCommand("settings put global animator_duration_scale 0")
+  }
+
   @BeforeTest
   fun baseSetUp() {
     runner = InstrumentationRegistry.getInstrumentation() as AndroidJUnitRunner
@@ -63,6 +80,7 @@ abstract class BaseUiTest {
     relay.start()
     mockDsn = relay.createMockDsn()
     disableDontKeepActivities()
+    disableSystemAnimations()
   }
 
   @AfterTest
@@ -126,3 +144,40 @@ fun initForTest(
     optionsConfiguration.configure(it)
   }
 }
+
+/**
+ * Function used to describe the content of the envelope to print in the logs. For debugging
+ * purposes only.
+ */
+internal fun SentryEnvelope.describeForTest(): String {
+  var descr = ""
+  items.forEach { item ->
+    when (item.header.type) {
+      SentryItemType.Event -> {
+        val deserialized =
+          JsonSerializer(SentryOptions())
+            .deserialize(item.data.inputStream().reader(), SentryEvent::class.java)!!
+        descr +=
+          "Event (${deserialized.eventId}) - message: ${deserialized.message!!.formatted} -- "
+      }
+      SentryItemType.Transaction -> {
+        val deserialized =
+          JsonSerializer(SentryOptions())
+            .deserialize(item.data.inputStream().reader(), SentryTransaction::class.java)!!
+        descr +=
+          "Transaction (${deserialized.eventId}) - transaction: ${deserialized.transaction} - spans: ${deserialized.spans.joinToString { "${it.op} ${it.description}" }} -- "
+      }
+      SentryItemType.Profile -> {
+        val deserialized =
+          JsonSerializer(SentryOptions())
+            .deserialize(item.data.inputStream().reader(), ProfilingTraceData::class.java)!!
+        descr +=
+          "Profile (${deserialized.profileId}) - transactionName: ${deserialized.transactionName} -- "
+      }
+      else -> {
+        descr += "${item.header.type} -- "
+      }
+    }
+  }
+  return "*** Envelope: $descr ***"
+}
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/EnvelopeTests.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/EnvelopeTests.kt
@@ -56,7 +56,6 @@ class EnvelopeTests : BaseUiTest() {
 
     relayIdlingResource.increment()
     IdlingRegistry.getInstance().register(ProfilingSampleActivity.scrollingIdlingResource)
-    Thread.sleep(1000)
     val transaction = Sentry.startTransaction("profiledTransaction", "test1")
     val sampleScenario = launchActivity<ProfilingSampleActivity>()
     swipeList(1)
@@ -171,15 +170,17 @@ class EnvelopeTests : BaseUiTest() {
                   values.last().relativeStartNs.toLong() <= maxTimestampAllowed,
                   "Last measurement value for '$name' is outside bounds (was: ${values.last().relativeStartNs.toLong()}ns, max: ${maxTimestampAllowed}ns",
                 )
-              }
 
-              // Timestamps of measurements should differ at least 10 milliseconds from each other
-              (1 until values.size).forEach { i ->
-                assertTrue(
-                  values[i].relativeStartNs.toLong() >=
-                    values[i - 1].relativeStartNs.toLong() + TimeUnit.MILLISECONDS.toNanos(10),
-                  "Measurement value timestamp for '$name' does not differ at least 10ms",
-                )
+                // Timestamps of measurements should differ at least 10 milliseconds from each other
+                (1 until values.size).forEach { i ->
+                  val measurementTimestampDiff =
+                    values[i].relativeStartNs.toLong() - values[i - 1].relativeStartNs.toLong()
+
+                  assertTrue(
+                    measurementTimestampDiff >= TimeUnit.MILLISECONDS.toNanos(10),
+                    "Measurement value timestamp for '$name' should differ at least 10ms, but was $measurementTimestampDiff",
+                  )
+                }
               }
             }
 
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/SdkInitTests.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/SdkInitTests.kt
@@ -56,13 +56,16 @@ class SdkInitTests : BaseUiTest() {
     }
     val transaction = Sentry.startTransaction("e2etests", "testInit")
     val sampleScenario = launchActivity<EmptyActivity>()
+
     initSentry(true) {
       it.tracesSampleRate = 1.0
       it.profilesSampleRate = 1.0
       // We use the same executorService before and after closing the SDK
       it.executorService = options.executorService
       it.isDebug = true
     }
+
+    relayIdlingResource.increment()
     relayIdlingResource.increment()
     relayIdlingResource.increment()
     transaction.finish()
@@ -79,9 +82,19 @@ class SdkInitTests : BaseUiTest() {
           it.assertNoOtherItems()
           assertEquals("e2etests", transactionItem.transaction)
         }
-    }
 
-    relay.assert {
+      findEnvelope {
+          assertEnvelopeTransaction(it.items.toList(), AndroidLogger()).transaction ==
+            "EmptyActivity"
+        }
+        .assert {
+          val transactionItem: SentryTransaction = it.assertTransaction()
+          // Transaction-based Profiling is already in e2etests transaction, so it won't run again
+          // here
+          it.assertNoOtherItems()
+          assertEquals("EmptyActivity", transactionItem.transaction)
+        }
+
       findEnvelope {
           assertEnvelopeTransaction(it.items.toList(), AndroidLogger()).transaction == "e2etests2"
         }
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/mockservers/MockRelay.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/mockservers/MockRelay.kt
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/mockservers/RelayAsserter.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/mockservers/RelayAsserter.kt
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
diff --git a/sentry/src/main/java/io/sentry/Sentry.java b/sentry/src/main/java/io/sentry/Sentry.java
diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java
diff --git a/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java b/sentry/src/main/java/io/sentry/protocol/SentryStackFrame.java
diff --git a/sentry/src/test/java/io/sentry/protocol/SentryStackFrameSerializationTest.kt b/sentry/src/test/java/io/sentry/protocol/SentryStackFrameSerializationTest.kt
diff --git a/sentry/src/test/resources/json/sentry_stack_frame.json b/sentry/src/test/resources/json/sentry_stack_frame.json
