Merge branch 'main' into rz/fix/user-interaction-tracing

Author: romtsn

.github/workflows/codeql-analysis.yml

@@ -41,7 +41,7 @@ jobs:
       - name: Initialize CodeQL
         uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # pin@v2
         with:
-          languages: ${{ matrix.language }}
+          languages: 'java'
 
       - name: Build Java
         run: |

sentry-android-core/src/test/java/io/sentry/android/core/performance/ActivityLifecycleSpanHelperTest.kt

@@ -17,6 +17,7 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
 import java.util.Date
 import java.util.concurrent.TimeUnit
+import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
@@ -48,6 +49,11 @@ class ActivityLifecycleSpanHelperTest {
     }
     private val fixture = Fixture()
 
+    @BeforeTest
+    fun setup() {
+        AppStartMetrics.getInstance().clear()
+    }
+
     @Test
     fun `createAndStopOnCreateSpan creates and finishes onCreate span`() {
         val helper = fixture.getSut()