Merge branch '8.x.x' into feat/extend-backend-e2e-tests

Author: adinauer

.github/workflows/codeql-analysis.yml

@@ -20,8 +20,6 @@ jobs:
 
     strategy:
       fail-fast: false
-      matrix:
-        language: ['cpp', 'java']
 
     steps:
       - name: Checkout Repo
@@ -45,12 +43,7 @@ jobs:
         with:
           languages: ${{ matrix.language }}
 
-      - if: matrix.language == 'cpp'
-        name: Build Cpp
-        run: |
-          ./gradlew sentry-android-ndk:buildCMakeRelWithDebInfo
-      - if: matrix.language == 'java'
-        name: Build Java
+      - name: Build Java
         run: |
           ./gradlew buildForCodeQL
 

CHANGELOG.md

@@ -13,6 +13,11 @@
 - Add `auto.graphql.graphql22` to ignored span origins when using OpenTelemetry
 - The Spring Boot 3 WebFlux sample now uses our GraphQL v22 integration
 
+### Behavioural Changes
+
+- (Android) Enable Performance V2 by default ([#3824](https://github.com/getsentry/sentry-java/pull/3824))
+  - With this change cold app start spans will include spans for ContentProviders, Application and Activity load.
+
 ## 8.0.0-beta.1
 
 ### Breaking Changes

sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroidOptions.java

@@ -206,7 +206,7 @@ public interface BeforeCaptureCallback {
    */
   private boolean attachAnrThreadDump = false;
 
-  private boolean enablePerformanceV2 = false;
+  private boolean enablePerformanceV2 = true;
 
   private @Nullable SentryFrameMetricsCollector frameMetricsCollector;
 
@@ -555,20 +555,18 @@ public void setAttachAnrThreadDump(final boolean attachAnrThreadDump) {
    * @return true if performance-v2 is enabled. See {@link #setEnablePerformanceV2(boolean)} for
    *     more details.
    */
-  @ApiStatus.Experimental
   public boolean isEnablePerformanceV2() {
     return enablePerformanceV2;
   }
 
   /**
-   * Experimental: Enables or disables the Performance V2 SDK features.
+   * Enables or disables the Performance V2 SDK features.
    *
    * <p>With this change - Cold app start spans will provide more accurate timings - Cold app start
    * spans will be enriched with detailed ContentProvider, Application and Activity startup times
    *
    * @param enablePerformanceV2 true if enabled or false otherwise
    */
-  @ApiStatus.Experimental
   public void setEnablePerformanceV2(final boolean enablePerformanceV2) {
     this.enablePerformanceV2 = enablePerformanceV2;
   }

sentry-android-core/src/test/java/io/sentry/android/core/ManifestMetadataReaderTest.kt

@@ -1185,14 +1185,14 @@ class ManifestMetadataReaderTest {
     @Test
     fun `applyMetadata reads performance-v2 flag to options`() {
         // Arrange
-        val bundle = bundleOf(ManifestMetadataReader.ENABLE_PERFORMANCE_V2 to true)
+        val bundle = bundleOf(ManifestMetadataReader.ENABLE_PERFORMANCE_V2 to false)
         val context = fixture.getContext(metaData = bundle)
 
         // Act
         ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
 
         // Assert
-        assertTrue(fixture.options.isEnablePerformanceV2)
+        assertFalse(fixture.options.isEnablePerformanceV2)
     }
 
     @Test
@@ -1204,7 +1204,7 @@ class ManifestMetadataReaderTest {
         ManifestMetadataReader.applyMetadata(context, fixture.options, fixture.buildInfoProvider)
 
         // Assert
-        assertFalse(fixture.options.isEnablePerformanceV2)
+        assertTrue(fixture.options.isEnablePerformanceV2)
     }
 
     @Test

sentry-android-core/src/test/java/io/sentry/android/core/SentryAndroidOptionsTest.kt

@@ -151,16 +151,16 @@ class SentryAndroidOptionsTest {
     }
 
     @Test
-    fun `performance v2 is disabled by default`() {
+    fun `performance v2 is enabled by default`() {
         val sentryOptions = SentryAndroidOptions()
-        assertFalse(sentryOptions.isEnablePerformanceV2)
+        assertTrue(sentryOptions.isEnablePerformanceV2)
     }
 
     @Test
-    fun `performance v2 can be enabled`() {
+    fun `performance v2 can be disabled`() {
         val sentryOptions = SentryAndroidOptions()
-        sentryOptions.isEnablePerformanceV2 = true
-        assertTrue(sentryOptions.isEnablePerformanceV2)
+        sentryOptions.isEnablePerformanceV2 = false
+        assertFalse(sentryOptions.isEnablePerformanceV2)
     }
 
     fun `when options is initialized, enableScopeSync is enabled by default`() {

sentry-android-core/src/test/java/io/sentry/android/core/cache/AndroidEnvelopeCacheTest.kt

@@ -51,6 +51,7 @@ class AndroidEnvelopeCacheTest {
                 AppStartMetrics.getInstance().apply {
                     if (options.isEnablePerformanceV2) {
                         appStartTimeSpan.setStartedAt(appStartMillis)
+                        sdkInitTimeSpan.setStartedAt(appStartMillis)
                     } else {
                         sdkInitTimeSpan.setStartedAt(appStartMillis)
                     }