Merge branch 'main' into ref/catch-throwable

CHANGELOG.md

@@ -2,9 +2,13 @@
 
 ## Unreleased
 
+* Ref: catch Throwable instead of Exception to suppress internal SDK errors (#1812)
+
+## 5.4.1
+
 * Feat: Refactor OkHttp and Apollo to Kotlin functional interfaces (#1797)
 * Feat: Add secondary constructor to SentryInstrumentation (#1804)
-* Ref: catch Throwable instead of Exception to suppress internal SDK errors (#1812)
+* Fix: Do not start fragment span if not added to the Activity (#1813)
 
 ## 5.4.0
 

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:MaxMetaspaceSize=1536m -XX:+H
 android.useAndroidX=true
 
 # Release information
-versionName=5.4.1-SNAPSHOT
+versionName=5.4.2-SNAPSHOT
 
 # disable renderscript, it's enabled by default
 android.defaults.buildfeatures.renderscript=false

sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt

@@ -57,7 +57,11 @@ class SentryFragmentLifecycleCallbacks(
     ) {
         addBreadcrumb(fragment, "created")
 
-        startTracing(fragment)
+        // we only start the tracing for the fragment if the fragment has been added to its activity
+        // and not only to the backstack
+        if (fragment.isAdded) {
+            startTracing(fragment)
+        }
     }
 
     override fun onFragmentViewCreated(

sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt

@@ -36,7 +36,8 @@ class SentryFragmentLifecycleCallbacksTest {
         fun getSut(
             enableFragmentLifecycleBreadcrumbs: Boolean = true,
             enableAutoFragmentLifecycleTracing: Boolean = false,
-            tracesSampleRate: Double? = 1.0
+            tracesSampleRate: Double? = 1.0,
+            isAdded: Boolean = true
         ): SentryFragmentLifecycleCallbacks {
             whenever(hub.options).thenReturn(
                 SentryOptions().apply {
@@ -48,6 +49,7 @@ class SentryFragmentLifecycleCallbacksTest {
             whenever(hub.configureScope(any())).thenAnswer {
                 (it.arguments[0] as ScopeCallback).run(scope)
             }
+            whenever(fragment.isAdded).thenReturn(isAdded)
             return SentryFragmentLifecycleCallbacks(
                 hub = hub,
                 enableFragmentLifecycleBreadcrumbs = enableFragmentLifecycleBreadcrumbs,
@@ -196,6 +198,15 @@ class SentryFragmentLifecycleCallbacksTest {
         )
     }
 
+    @Test
+    fun `When fragment is created but not added to activity, it should not start tracing`() {
+        val sut = fixture.getSut(enableAutoFragmentLifecycleTracing = true, isAdded = false)
+
+        sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
+
+        verify(fixture.transaction, never()).startChild(any(), any())
+    }
+
     @Test
     fun `When tracing is already running, do not start again`() {
         val sut = fixture.getSut(enableAutoFragmentLifecycleTracing = true)