Fix properly reset application/content-provider timespans (#4244)

* Fix properly reset application/content-provider timespans

* Update Changelog

Author: markushi

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixes
 
 - Fix Ensure app start type is set, even when ActivityLifecycleIntegration is not running ([#4216](https://github.com/getsentry/sentry-java/pull/4216))
+- Fix properly reset application/content-provider timespans for warm app starts ([#4244](https://github.com/getsentry/sentry-java/pull/4244))
 
 ## 7.22.0
 

sentry-android-core/src/main/java/io/sentry/android/core/performance/AppStartMetrics.java

@@ -318,6 +318,8 @@ public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle saved
         appStartSpan.start();
         appStartSpan.setStartedAt(nowUptimeMs);
         CLASS_LOADED_UPTIME_MS = nowUptimeMs;
+        contentProviderOnCreates.clear();
+        applicationOnCreate.reset();
       } else {
         appStartType = savedInstanceState == null ? AppStartType.COLD : AppStartType.WARM;
       }

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

@@ -154,6 +154,19 @@ class AppStartMetricsTest {
         val metrics = AppStartMetrics.getInstance()
         metrics.registerLifecycleCallbacks(mock<Application>())
 
+        metrics.contentProviderOnCreateTimeSpans.add(
+            TimeSpan().apply {
+                description = "ExampleContentProvider"
+                setStartedAt(1)
+                setStoppedAt(2)
+            }
+        )
+
+        metrics.applicationOnCreateTimeSpan.apply {
+            setStartedAt(3)
+            setStoppedAt(4)
+        }
+
         // when the looper runs
         Shadows.shadowOf(Looper.getMainLooper()).idle()
 
@@ -173,6 +186,8 @@ class AppStartMetricsTest {
         assertTrue(metrics.shouldSendStartMeasurements())
         assertTrue(metrics.appStartTimeSpan.hasStarted())
         assertEquals(now, metrics.appStartTimeSpan.startUptimeMs)
+        assertFalse(metrics.applicationOnCreateTimeSpan.hasStarted())
+        assertTrue(metrics.contentProviderOnCreateTimeSpans.isEmpty())
     }
 
     @Test