From 3ce36619365df5b30bbf6b76c2ddfbb3bd688c48 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Fri, 11 Jun 2021 14:38:06 +0200
Subject: [PATCH 01/23] Feat: Perf. for fragments

---
 .../fragment/FragmentLifecycleIntegration.kt  |  24 ++--
 .../SentryFragmentLifecycleCallbacks.kt       |  51 +++++++-
 .../sentry-samples-android/build.gradle.kts   |   1 +
 .../src/main/AndroidManifest.xml              |   2 +
 .../sentry/samples/android/MainActivity.java  |   5 +
 .../sentry/samples/android/MyApplication.java |   2 +-
 .../samples/android/ThirdActivityFragment.kt  |  41 +++++++
 .../sentry/samples/android/ThirdFragment.kt   |  12 ++
 .../src/main/res/layout/activity_main.xml     | 113 ++++++++++--------
 .../res/layout/activity_third_fragment.xml    |  13 ++
 .../src/main/res/layout/third_fragment.xml    |  10 ++
 .../src/main/res/values/strings.xml           |   1 +
 12 files changed, 217 insertions(+), 58 deletions(-)
 create mode 100644 sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdActivityFragment.kt
 create mode 100644 sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
 create mode 100644 sentry-samples/sentry-samples-android/src/main/res/layout/activity_third_fragment.xml
 create mode 100644 sentry-samples/sentry-samples-android/src/main/res/layout/third_fragment.xml

diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
index a265b66614..3d3235cae2 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
@@ -6,32 +6,37 @@ import android.app.Application.ActivityLifecycleCallbacks
 import android.os.Bundle
 import androidx.fragment.app.FragmentActivity
 import io.sentry.IHub
-import io.sentry.ILogger
 import io.sentry.Integration
 import io.sentry.SentryLevel.DEBUG
 import io.sentry.SentryOptions
 import java.io.Closeable
 
-class FragmentLifecycleIntegration(private val application: Application) :
+// also add an options to record breadcrumbs or not
+class FragmentLifecycleIntegration(
+    private val application: Application,
+    private val enableAutoFragmentLifecycleTracing: Boolean) :
     ActivityLifecycleCallbacks,
     Integration,
     Closeable {
 
+    // should it be enabled by default?
+    constructor(application: Application) : this(application, false)
+
     private lateinit var hub: IHub
-    private lateinit var logger: ILogger
+    private lateinit var options: SentryOptions
 
     override fun register(hub: IHub, options: SentryOptions) {
         this.hub = hub
-        this.logger = options.logger
+        this.options = options
 
         application.registerActivityLifecycleCallbacks(this)
-        logger.log(DEBUG, "FragmentLifecycleIntegration installed.")
+        options.logger.log(DEBUG, "FragmentLifecycleIntegration installed.")
     }
 
     override fun close() {
         application.unregisterActivityLifecycleCallbacks(this)
-        if (::logger.isInitialized) {
-            logger.log(DEBUG, "FragmentLifecycleIntegration removed.")
+        if (::options.isInitialized) {
+            options.logger.log(DEBUG, "FragmentLifecycleIntegration removed.")
         }
     }
 
@@ -39,7 +44,10 @@ class FragmentLifecycleIntegration(private val application: Application) :
         (activity as? FragmentActivity)
             ?.supportFragmentManager
             ?.registerFragmentLifecycleCallbacks(
-                SentryFragmentLifecycleCallbacks(hub),
+                SentryFragmentLifecycleCallbacks(
+                    hub = hub,
+                    performanceEnabled = options.isTracingEnabled,
+                    enableAutoFragmentLifecycleTracing = enableAutoFragmentLifecycleTracing),
                 true
             )
     }
diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index 55ad38e0d7..f1ac453843 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -9,13 +9,22 @@ import androidx.fragment.app.FragmentManager.FragmentLifecycleCallbacks
 import io.sentry.Breadcrumb
 import io.sentry.HubAdapter
 import io.sentry.IHub
+import io.sentry.ISpan
+import io.sentry.Sentry
 import io.sentry.SentryLevel.INFO
+import io.sentry.SpanStatus
 
 @Suppress("TooManyFunctions")
 class SentryFragmentLifecycleCallbacks(
-    private val hub: IHub = HubAdapter.getInstance()
+    private val hub: IHub = HubAdapter.getInstance(),
+    performanceEnabled: Boolean = false,
+    enableAutoFragmentLifecycleTracing: Boolean = false
 ) : FragmentLifecycleCallbacks() {
 
+    private val isPerformanceEnabled = performanceEnabled && enableAutoFragmentLifecycleTracing
+
+    private val fragmentsWithOngoingTransactions = mutableMapOf<Fragment, ISpan>()
+
     override fun onFragmentAttached(
         fragmentManager: FragmentManager,
         fragment: Fragment,
@@ -38,6 +47,8 @@ class SentryFragmentLifecycleCallbacks(
         savedInstanceState: Bundle?
     ) {
         addBreadcrumb(fragment, "created")
+
+        startTracing(fragment)
     }
 
     override fun onFragmentViewCreated(
@@ -55,6 +66,9 @@ class SentryFragmentLifecycleCallbacks(
 
     override fun onFragmentResumed(fragmentManager: FragmentManager, fragment: Fragment) {
         addBreadcrumb(fragment, "resumed")
+
+        // ideally it should be post resumed
+        stopTracing(fragment)
     }
 
     override fun onFragmentPaused(fragmentManager: FragmentManager, fragment: Fragment) {
@@ -71,6 +85,8 @@ class SentryFragmentLifecycleCallbacks(
 
     override fun onFragmentDestroyed(fragmentManager: FragmentManager, fragment: Fragment) {
         addBreadcrumb(fragment, "destroyed")
+
+        stopTracing(fragment)
     }
 
     override fun onFragmentDetached(fragmentManager: FragmentManager, fragment: Fragment) {
@@ -91,4 +107,37 @@ class SentryFragmentLifecycleCallbacks(
     private fun getFragmentName(fragment: Fragment): String {
         return fragment.javaClass.simpleName
     }
+
+    private fun isRunningSpan(fragment: Fragment): Boolean =
+        fragmentsWithOngoingTransactions.containsKey(fragment)
+
+    private fun startTracing(fragment: Fragment) {
+        if (!isPerformanceEnabled || isRunningSpan(fragment)) {
+            return
+        }
+
+        val currentSpan = Sentry.getSpan()
+        // or ui.load too?
+        // should be a span of the activity transaction or its own transaction?
+        val span = currentSpan?.startChild("fragment.load", getFragmentName(fragment))
+        span?.let {
+            fragmentsWithOngoingTransactions.put(fragment, it)
+        }
+    }
+
+    private fun stopTracing(fragment: Fragment) {
+        if (!isPerformanceEnabled || !isRunningSpan(fragment)) {
+            return
+        }
+
+        val span = fragmentsWithOngoingTransactions[fragment]
+        span?.let {
+            var status = it.status
+            if (status == null) {
+                status = SpanStatus.OK
+            }
+            it.finish(status)
+            fragmentsWithOngoingTransactions.remove(fragment)
+        }
+    }
 }
diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts
index a67076268e..38d4531dc4 100644
--- a/sentry-samples/sentry-samples-android/build.gradle.kts
+++ b/sentry-samples/sentry-samples-android/build.gradle.kts
@@ -93,6 +93,7 @@ dependencies {
     implementation(project(":sentry-android"))
     implementation(project(":sentry-android-okhttp"))
     implementation(project(":sentry-android-fragment"))
+    implementation(Config.Libs.fragment)
 
 //    how to exclude androidx if release health feature is disabled
 //    implementation(project(":sentry-android")) {
diff --git a/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml b/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
index 2ed1391d49..9c58f983aa 100644
--- a/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
+++ b/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
@@ -33,6 +33,8 @@
 
         <activity android:name=".SecondActivity" />
 
+        <activity android:name=".ThirdActivityFragment" />
+
         <!--    NOTE: Replace the test DSN below with YOUR OWN DSN to see the events from this app in your Sentry project/dashboard-->
         <meta-data android:name="io.sentry.dsn" android:value="https://1053864c67cc410aa1ffc9701bd6f93d@o447951.ingest.sentry.io/5428559" />
 
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
index 820bf8a354..74bb1b8e4b 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
@@ -159,6 +159,11 @@ protected void onCreate(Bundle savedInstanceState) {
     binding.openSampleFragment.setOnClickListener(
         view -> SampleFragment.newInstance().show(getSupportFragmentManager(), null));
 
+      binding.openThirdFragment.setOnClickListener(
+              view -> {
+                  startActivity(new Intent(this, ThirdActivityFragment.class));
+              });
+
     setContentView(binding.getRoot());
   }
 
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
index 810e4264fe..42f256c395 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
@@ -24,7 +24,7 @@ public void onCreate() {
           //                return event;
           //              });
           //          options.setAnrTimeoutIntervalMillis(2000);
-          options.addIntegration(new FragmentLifecycleIntegration(MyApplication.this));
+          options.addIntegration(new FragmentLifecycleIntegration(MyApplication.this, true));
         });
   }
 
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdActivityFragment.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdActivityFragment.kt
new file mode 100644
index 0000000000..9eb74e5635
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdActivityFragment.kt
@@ -0,0 +1,41 @@
+package io.sentry.samples.android
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.os.bundleOf
+import androidx.fragment.app.add
+import androidx.fragment.app.commit
+import io.sentry.Sentry
+import io.sentry.SpanStatus
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+class ThirdActivityFragment : AppCompatActivity(R.layout.activity_third_fragment) {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (savedInstanceState == null) {
+            val bundle = bundleOf("some_int" to 0)
+            supportFragmentManager.commit {
+                setReorderingAllowed(true)
+                add<ThirdFragment>(R.id.fragment_container_view, args = bundle)
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        // this is called before fragments are fully rendered, as they have their own lifecycle
+        // activity is only responsible of rendering the containers for fragments (FragmentContainerView)
+        // so I cant finish my transaction here manually.
+        // we'd need idle transactions here, I will simulate with a delayed coroutines
+
+        GlobalScope.launch {
+            delay(1500L)
+            val span = Sentry.getSpan()
+            span?.finish(SpanStatus.OK)
+        }
+    }
+}
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
new file mode 100644
index 0000000000..0c7b3aa2a8
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
@@ -0,0 +1,12 @@
+package io.sentry.samples.android
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+
+class ThirdFragment : Fragment(R.layout.third_fragment) {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        val someInt = requireArguments().getInt("some_int")
+    }
+}
\ No newline at end of file
diff --git a/sentry-samples/sentry-samples-android/src/main/res/layout/activity_main.xml b/sentry-samples/sentry-samples-android/src/main/res/layout/activity_main.xml
index 827228e4b6..c4ddea059f 100644
--- a/sentry-samples/sentry-samples-android/src/main/res/layout/activity_main.xml
+++ b/sentry-samples/sentry-samples-android/src/main/res/layout/activity_main.xml
@@ -6,70 +6,87 @@
     android:orientation="vertical"
     tools:context=".MainActivity">
 
-    <Button android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <Button
         android:id="@+id/crash_from_java"
-        android:text="@string/crash_from_java"/>
-
-    <Button android:layout_width="wrap_content"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/send_message"
-        android:text="@string/send_message"/>
+        android:text="@string/crash_from_java" />
 
-  <Button
-    android:id="@+id/send_user_feedback"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:text="@string/send_user_feedback" />
+    <Button
+        android:id="@+id/send_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/send_message" />
 
-  <Button
-    android:id="@+id/add_attachment"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:text="@string/add_attachment" />
+    <Button
+        android:id="@+id/send_user_feedback"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/send_user_feedback" />
 
-  <Button android:layout_width="wrap_content"
+    <Button
+        android:id="@+id/add_attachment"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/capture_exception"
-        android:text="@string/capture_exception"/>
+        android:text="@string/add_attachment" />
 
-    <Button android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:id="@+id/breadcrumb"
-      android:text="@string/breadcrumb"/>
+    <Button
+        android:id="@+id/capture_exception"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/capture_exception" />
 
-    <Button android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:id="@+id/set_user"
-      android:text="@string/set_user"/>
+    <Button
+        android:id="@+id/breadcrumb"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/breadcrumb" />
 
-    <Button android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:id="@+id/unset_user"
-      android:text="@string/unset_user"/>
+    <Button
+        android:id="@+id/set_user"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/set_user" />
 
-    <Button android:layout_width="wrap_content"
+    <Button
+        android:id="@+id/unset_user"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/anr"
-        android:text="@string/anr"/>
+        android:text="@string/unset_user" />
 
-    <Button android:layout_width="wrap_content"
+    <Button
+        android:id="@+id/anr"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/native_crash"
-        android:text="@string/crash_from_native"/>
+        android:text="@string/anr" />
 
-    <Button android:layout_width="wrap_content"
+    <Button
+        android:id="@+id/native_crash"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:text="@string/crash_from_native" />
+
+    <Button
         android:id="@+id/native_capture"
-        android:text="@string/capture_from_native"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/capture_from_native" />
 
-  <Button android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:id="@+id/open_second_activity"
-      android:text="@string/open_second_activity"/>
+    <Button
+        android:id="@+id/open_second_activity"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/open_second_activity" />
 
-  <Button android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:id="@+id/open_sample_fragment"
-    android:text="@string/open_sample_fragment"/>
+    <Button
+        android:id="@+id/open_sample_fragment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/open_sample_fragment" />
+
+    <Button
+        android:id="@+id/open_third_fragment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/open_third_fragment" />
 </LinearLayout>
diff --git a/sentry-samples/sentry-samples-android/src/main/res/layout/activity_third_fragment.xml b/sentry-samples/sentry-samples-android/src/main/res/layout/activity_third_fragment.xml
new file mode 100644
index 0000000000..c8e8fb86c0
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/src/main/res/layout/activity_third_fragment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ThirdActivityFragment" >
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+<!--        android:name="io.sentry.samples.android.ThirdFragment" />-->
+</FrameLayout>
diff --git a/sentry-samples/sentry-samples-android/src/main/res/layout/third_fragment.xml b/sentry-samples/sentry-samples-android/src/main/res/layout/third_fragment.xml
new file mode 100644
index 0000000000..087417ace8
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/src/main/res/layout/third_fragment.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="text"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml b/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
index 6e399bf5b1..7b6a4a685e 100644
--- a/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
+++ b/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
@@ -15,5 +15,6 @@
   <string name="do_request">Do Request</string>
   <string name="open_second_activity">Open Second Activity</string>
   <string name="open_sample_fragment">Open Sample Fragment</string>
+  <string name="open_third_fragment">Open Third Fragment</string>
   <string name="back_main">Back to Main Activity</string>
 </resources>

From 2ca982358921f3eb60838556c19b474b5f9d3be4 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Fri, 11 Jun 2021 14:47:43 +0200
Subject: [PATCH 02/23] format

---
 .../fragment/FragmentLifecycleIntegration.kt       |  3 ++-
 .../fragment/SentryFragmentLifecycleCallbacks.kt   | 14 ++++++++++----
 .../io/sentry/samples/android/MainActivity.java    |  8 ++++----
 .../io/sentry/samples/android/ThirdFragment.kt     |  2 +-
 .../main/res/layout/activity_third_fragment.xml    |  2 +-
 .../src/main/res/layout/third_fragment.xml         |  4 ++--
 .../src/main/res/values/strings.xml                |  1 +
 7 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
index 3d3235cae2..faba06aadc 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
@@ -14,7 +14,8 @@ import java.io.Closeable
 // also add an options to record breadcrumbs or not
 class FragmentLifecycleIntegration(
     private val application: Application,
-    private val enableAutoFragmentLifecycleTracing: Boolean) :
+    private val enableAutoFragmentLifecycleTracing: Boolean
+) :
     ActivityLifecycleCallbacks,
     Integration,
     Closeable {
diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index f1ac453843..5746109e04 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -117,12 +117,18 @@ class SentryFragmentLifecycleCallbacks(
         }
 
         val currentSpan = Sentry.getSpan()
+
+        val span: ISpan
+        val fragmentName = getFragmentName(fragment)
+
         // or ui.load too?
+        val op = "fragment.load"
+
         // should be a span of the activity transaction or its own transaction?
-        val span = currentSpan?.startChild("fragment.load", getFragmentName(fragment))
-        span?.let {
-            fragmentsWithOngoingTransactions.put(fragment, it)
-        }
+        span = currentSpan?.startChild(op, fragmentName)
+            ?: Sentry.startTransaction(fragmentName, op)
+
+        fragmentsWithOngoingTransactions[fragment] = span
     }
 
     private fun stopTracing(fragment: Fragment) {
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
index 74bb1b8e4b..05ff3893ab 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
@@ -159,10 +159,10 @@ protected void onCreate(Bundle savedInstanceState) {
     binding.openSampleFragment.setOnClickListener(
         view -> SampleFragment.newInstance().show(getSupportFragmentManager(), null));
 
-      binding.openThirdFragment.setOnClickListener(
-              view -> {
-                  startActivity(new Intent(this, ThirdActivityFragment.class));
-              });
+    binding.openThirdFragment.setOnClickListener(
+        view -> {
+          startActivity(new Intent(this, ThirdActivityFragment.class));
+        });
 
     setContentView(binding.getRoot());
   }
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
index 0c7b3aa2a8..6b2345ab15 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
@@ -9,4 +9,4 @@ class ThirdFragment : Fragment(R.layout.third_fragment) {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val someInt = requireArguments().getInt("some_int")
     }
-}
\ No newline at end of file
+}
diff --git a/sentry-samples/sentry-samples-android/src/main/res/layout/activity_third_fragment.xml b/sentry-samples/sentry-samples-android/src/main/res/layout/activity_third_fragment.xml
index c8e8fb86c0..3f09172f70 100644
--- a/sentry-samples/sentry-samples-android/src/main/res/layout/activity_third_fragment.xml
+++ b/sentry-samples/sentry-samples-android/src/main/res/layout/activity_third_fragment.xml
@@ -5,9 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ThirdActivityFragment" >
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-<!--        android:name="io.sentry.samples.android.ThirdFragment" />-->
 </FrameLayout>
diff --git a/sentry-samples/sentry-samples-android/src/main/res/layout/third_fragment.xml b/sentry-samples/sentry-samples-android/src/main/res/layout/third_fragment.xml
index 087417ace8..c721c41442 100644
--- a/sentry-samples/sentry-samples-android/src/main/res/layout/third_fragment.xml
+++ b/sentry-samples/sentry-samples-android/src/main/res/layout/third_fragment.xml
@@ -6,5 +6,5 @@
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="text"/>
-</LinearLayout>
\ No newline at end of file
+        android:text="@string/tap_me"/>
+</LinearLayout>
diff --git a/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml b/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
index 7b6a4a685e..9384c8be7a 100644
--- a/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
+++ b/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
@@ -17,4 +17,5 @@
   <string name="open_sample_fragment">Open Sample Fragment</string>
   <string name="open_third_fragment">Open Third Fragment</string>
   <string name="back_main">Back to Main Activity</string>
+    <string name="tap_me">text</string>
 </resources>

From 1c7e0650be043dd54e86d01e2d3d227d22767140 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Mon, 14 Jun 2021 14:14:00 +0200
Subject: [PATCH 03/23] fix

---
 .../api/sentry-android-fragment.api           |  9 ++++--
 .../fragment/FragmentLifecycleIntegration.kt  |  6 ++--
 .../SentryFragmentLifecycleCallbacks.kt       | 18 +++++++-----
 .../api/sentry-samples-android.api            | 28 +++++++++++++++++++
 .../sentry/samples/android/MyApplication.java |  2 +-
 .../src/main/res/values/strings.xml           |  2 +-
 6 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/sentry-android-fragment/api/sentry-android-fragment.api b/sentry-android-fragment/api/sentry-android-fragment.api
index 9d7818b76a..456b707ab3 100644
--- a/sentry-android-fragment/api/sentry-android-fragment.api
+++ b/sentry-android-fragment/api/sentry-android-fragment.api
@@ -8,6 +8,7 @@ public final class io/sentry/android/fragment/BuildConfig {
 
 public final class io/sentry/android/fragment/FragmentLifecycleIntegration : android/app/Application$ActivityLifecycleCallbacks, io/sentry/Integration, java/io/Closeable {
 	public fun <init> (Landroid/app/Application;)V
+	public fun <init> (Landroid/app/Application;ZZ)V
 	public fun close ()V
 	public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
 	public fun onActivityDestroyed (Landroid/app/Activity;)V
@@ -20,9 +21,10 @@ public final class io/sentry/android/fragment/FragmentLifecycleIntegration : and
 }
 
 public final class io/sentry/android/fragment/SentryFragmentLifecycleCallbacks : androidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks {
+	public static final field Companion Lio/sentry/android/fragment/SentryFragmentLifecycleCallbacks$Companion;
 	public fun <init> ()V
-	public fun <init> (Lio/sentry/IHub;)V
-	public synthetic fun <init> (Lio/sentry/IHub;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lio/sentry/IHub;ZZZ)V
+	public synthetic fun <init> (Lio/sentry/IHub;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun onFragmentAttached (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;Landroid/content/Context;)V
 	public fun onFragmentCreated (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;Landroid/os/Bundle;)V
 	public fun onFragmentDestroyed (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V
@@ -36,3 +38,6 @@ public final class io/sentry/android/fragment/SentryFragmentLifecycleCallbacks :
 	public fun onFragmentViewDestroyed (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V
 }
 
+public final class io/sentry/android/fragment/SentryFragmentLifecycleCallbacks$Companion {
+}
+
diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
index faba06aadc..8d5340ddc6 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
@@ -11,17 +11,16 @@ import io.sentry.SentryLevel.DEBUG
 import io.sentry.SentryOptions
 import java.io.Closeable
 
-// also add an options to record breadcrumbs or not
 class FragmentLifecycleIntegration(
     private val application: Application,
+    private val enableFragmentLifecycleBreadcrumbs: Boolean,
     private val enableAutoFragmentLifecycleTracing: Boolean
 ) :
     ActivityLifecycleCallbacks,
     Integration,
     Closeable {
 
-    // should it be enabled by default?
-    constructor(application: Application) : this(application, false)
+    constructor(application: Application) : this(application, true, false)
 
     private lateinit var hub: IHub
     private lateinit var options: SentryOptions
@@ -47,6 +46,7 @@ class FragmentLifecycleIntegration(
             ?.registerFragmentLifecycleCallbacks(
                 SentryFragmentLifecycleCallbacks(
                     hub = hub,
+                    enableFragmentLifecycleBreadcrumbs = enableFragmentLifecycleBreadcrumbs,
                     performanceEnabled = options.isTracingEnabled,
                     enableAutoFragmentLifecycleTracing = enableAutoFragmentLifecycleTracing),
                 true
diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index 5746109e04..22d39e2db6 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -10,13 +10,13 @@ import io.sentry.Breadcrumb
 import io.sentry.HubAdapter
 import io.sentry.IHub
 import io.sentry.ISpan
-import io.sentry.Sentry
 import io.sentry.SentryLevel.INFO
 import io.sentry.SpanStatus
 
 @Suppress("TooManyFunctions")
 class SentryFragmentLifecycleCallbacks(
     private val hub: IHub = HubAdapter.getInstance(),
+    private val enableFragmentLifecycleBreadcrumbs: Boolean = true,
     performanceEnabled: Boolean = false,
     enableAutoFragmentLifecycleTracing: Boolean = false
 ) : FragmentLifecycleCallbacks() {
@@ -94,6 +94,9 @@ class SentryFragmentLifecycleCallbacks(
     }
 
     private fun addBreadcrumb(fragment: Fragment, state: String) {
+        if (!enableFragmentLifecycleBreadcrumbs) {
+            return
+        }
         val breadcrumb = Breadcrumb().apply {
             type = "navigation"
             setData("state", state)
@@ -116,17 +119,14 @@ class SentryFragmentLifecycleCallbacks(
             return
         }
 
-        val currentSpan = Sentry.getSpan()
+        val currentSpan = hub.span
 
         val span: ISpan
         val fragmentName = getFragmentName(fragment)
 
-        // or ui.load too?
-        val op = "fragment.load"
-
         // should be a span of the activity transaction or its own transaction?
-        span = currentSpan?.startChild(op, fragmentName)
-            ?: Sentry.startTransaction(fragmentName, op)
+        span = currentSpan?.startChild(FRAGMENT_LOAD_OP, fragmentName)
+            ?: hub.startTransaction(fragmentName, FRAGMENT_LOAD_OP)
 
         fragmentsWithOngoingTransactions[fragment] = span
     }
@@ -146,4 +146,8 @@ class SentryFragmentLifecycleCallbacks(
             fragmentsWithOngoingTransactions.remove(fragment)
         }
     }
+
+    companion object {
+        private const val FRAGMENT_LOAD_OP = "fragment.load"
+    }
 }
diff --git a/sentry-samples/sentry-samples-android/api/sentry-samples-android.api b/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
index 89b4771061..53d50bdb3c 100644
--- a/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
+++ b/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
@@ -58,6 +58,15 @@ public final class io/sentry/samples/android/SecondActivity : androidx/appcompat
 	public fun <init> ()V
 }
 
+public final class io/sentry/samples/android/ThirdActivityFragment : androidx/appcompat/app/AppCompatActivity {
+	public fun <init> ()V
+}
+
+public final class io/sentry/samples/android/ThirdFragment : androidx/fragment/app/Fragment {
+	public fun <init> ()V
+	public fun onViewCreated (Landroid/view/View;Landroid/os/Bundle;)V
+}
+
 public final class io/sentry/samples/android/databinding/ActivityMainBinding : androidx/viewbinding/ViewBinding {
 	public final field addAttachment Landroid/widget/Button;
 	public final field anr Landroid/widget/Button;
@@ -68,6 +77,7 @@ public final class io/sentry/samples/android/databinding/ActivityMainBinding : a
 	public final field nativeCrash Landroid/widget/Button;
 	public final field openSampleFragment Landroid/widget/Button;
 	public final field openSecondActivity Landroid/widget/Button;
+	public final field openThirdFragment Landroid/widget/Button;
 	public final field sendMessage Landroid/widget/Button;
 	public final field sendUserFeedback Landroid/widget/Button;
 	public final field setUser Landroid/widget/Button;
@@ -92,6 +102,16 @@ public final class io/sentry/samples/android/databinding/ActivitySecondBinding :
 	public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lio/sentry/samples/android/databinding/ActivitySecondBinding;
 }
 
+public final class io/sentry/samples/android/databinding/ActivityThirdFragmentBinding : androidx/viewbinding/ViewBinding {
+	public final field container Landroid/widget/FrameLayout;
+	public final field fragmentContainerView Landroidx/fragment/app/FragmentContainerView;
+	public static fun bind (Landroid/view/View;)Lio/sentry/samples/android/databinding/ActivityThirdFragmentBinding;
+	public synthetic fun getRoot ()Landroid/view/View;
+	public fun getRoot ()Landroid/widget/FrameLayout;
+	public static fun inflate (Landroid/view/LayoutInflater;)Lio/sentry/samples/android/databinding/ActivityThirdFragmentBinding;
+	public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lio/sentry/samples/android/databinding/ActivityThirdFragmentBinding;
+}
+
 public final class io/sentry/samples/android/databinding/FragmentSampleBinding : androidx/viewbinding/ViewBinding {
 	public final field container Landroid/widget/FrameLayout;
 	public static fun bind (Landroid/view/View;)Lio/sentry/samples/android/databinding/FragmentSampleBinding;
@@ -110,3 +130,11 @@ public final class io/sentry/samples/android/databinding/FragmentSampleInnerBind
 	public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lio/sentry/samples/android/databinding/FragmentSampleInnerBinding;
 }
 
+public final class io/sentry/samples/android/databinding/ThirdFragmentBinding : androidx/viewbinding/ViewBinding {
+	public static fun bind (Landroid/view/View;)Lio/sentry/samples/android/databinding/ThirdFragmentBinding;
+	public synthetic fun getRoot ()Landroid/view/View;
+	public fun getRoot ()Landroid/widget/LinearLayout;
+	public static fun inflate (Landroid/view/LayoutInflater;)Lio/sentry/samples/android/databinding/ThirdFragmentBinding;
+	public static fun inflate (Landroid/view/LayoutInflater;Landroid/view/ViewGroup;Z)Lio/sentry/samples/android/databinding/ThirdFragmentBinding;
+}
+
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
index 42f256c395..8180b5b18f 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
@@ -24,7 +24,7 @@ public void onCreate() {
           //                return event;
           //              });
           //          options.setAnrTimeoutIntervalMillis(2000);
-          options.addIntegration(new FragmentLifecycleIntegration(MyApplication.this, true));
+          options.addIntegration(new FragmentLifecycleIntegration(MyApplication.this, true, true));
         });
   }
 
diff --git a/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml b/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
index 9384c8be7a..3097a8659f 100644
--- a/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
+++ b/sentry-samples/sentry-samples-android/src/main/res/values/strings.xml
@@ -17,5 +17,5 @@
   <string name="open_sample_fragment">Open Sample Fragment</string>
   <string name="open_third_fragment">Open Third Fragment</string>
   <string name="back_main">Back to Main Activity</string>
-    <string name="tap_me">text</string>
+  <string name="tap_me">text</string>
 </resources>

From add03501268f3468a3c7cd8ba016a2a340689571 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Tue, 15 Jun 2021 13:27:04 +0200
Subject: [PATCH 04/23] extra ctor

---
 .../fragment/SentryFragmentLifecycleCallbacks.kt      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index 22d39e2db6..7190818f2d 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -21,6 +21,17 @@ class SentryFragmentLifecycleCallbacks(
     enableAutoFragmentLifecycleTracing: Boolean = false
 ) : FragmentLifecycleCallbacks() {
 
+    constructor(
+        enableFragmentLifecycleBreadcrumbs: Boolean,
+        performanceEnabled: Boolean,
+        enableAutoFragmentLifecycleTracing: Boolean
+    ) : this(
+        hub = HubAdapter.getInstance(),
+        enableFragmentLifecycleBreadcrumbs = enableFragmentLifecycleBreadcrumbs,
+        performanceEnabled = performanceEnabled,
+        enableAutoFragmentLifecycleTracing = enableAutoFragmentLifecycleTracing
+    )
+
     private val isPerformanceEnabled = performanceEnabled && enableAutoFragmentLifecycleTracing
 
     private val fragmentsWithOngoingTransactions = mutableMapOf<Fragment, ISpan>()

From bd7f30d221ce3e74656f3e2eed9d9510fa223246 Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Wed, 16 Jun 2021 09:36:40 +0200
Subject: [PATCH 05/23] Support transaction waiting for children to finish.

Fixes #1523
---
 sentry/api/sentry.api                         |  1 +
 .../src/main/java/io/sentry/SentryTracer.java | 57 ++++++++++++++++++-
 sentry/src/main/java/io/sentry/Span.java      | 12 +++-
 .../src/main/java/io/sentry/SpanListener.java | 12 ++++
 .../test/java/io/sentry/SentryTracerTest.kt   | 37 +++++++++++-
 5 files changed, 112 insertions(+), 7 deletions(-)
 create mode 100644 sentry/src/main/java/io/sentry/SpanListener.java

diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
index 5a168ec1b5..22a391982b 100644
--- a/sentry/api/sentry.api
+++ b/sentry/api/sentry.api
@@ -923,6 +923,7 @@ public final class io/sentry/SentryTraceHeader {
 
 public final class io/sentry/SentryTracer : io/sentry/ITransaction {
 	public fun <init> (Lio/sentry/TransactionContext;Lio/sentry/IHub;)V
+	public fun <init> (Lio/sentry/TransactionContext;Lio/sentry/IHub;Z)V
 	public fun finish ()V
 	public fun finish (Lio/sentry/SpanStatus;)V
 	public fun getChildren ()Ljava/util/List;
diff --git a/sentry/src/main/java/io/sentry/SentryTracer.java b/sentry/src/main/java/io/sentry/SentryTracer.java
index ea7ba8e336..d2dab2c17e 100644
--- a/sentry/src/main/java/io/sentry/SentryTracer.java
+++ b/sentry/src/main/java/io/sentry/SentryTracer.java
@@ -22,20 +22,47 @@ public final class SentryTracer implements ITransaction {
   private final @NotNull Contexts contexts = new Contexts();
   private @Nullable Request request;
   private @NotNull String name;
+  /**
+   * When `waitForChildren` is set to `true`, tracer will finish only when both conditions are met
+   * (the order of meeting condition does not matter): - tracer itself is finished - all child spans
+   * are finished
+   */
+  private final boolean waitForChildren;
+
+  /**
+   * Holds the status for finished tracer. Tracer can have finishedStatus set, but not be finished
+   * itself when `waitForChildren` is set to `true`, `#finish()` method was called but there are
+   * unfinished children spans.
+   */
+  private @Nullable SpanStatus finishStatus;
 
   public SentryTracer(final @NotNull TransactionContext context, final @NotNull IHub hub) {
     this(context, hub, null);
   }
 
+  public SentryTracer(
+      final @NotNull TransactionContext context, final @NotNull IHub hub, boolean waitForChildren) {
+    this(context, hub, null, waitForChildren);
+  }
+
   SentryTracer(
       final @NotNull TransactionContext context,
       final @NotNull IHub hub,
       final @Nullable Date startTimestamp) {
+    this(context, hub, startTimestamp, false);
+  }
+
+  SentryTracer(
+      final @NotNull TransactionContext context,
+      final @NotNull IHub hub,
+      final @Nullable Date startTimestamp,
+      final boolean waitForChildren) {
     Objects.requireNonNull(context, "context is required");
     Objects.requireNonNull(hub, "hub is required");
     this.root = new Span(context, this, hub, startTimestamp);
     this.name = context.getName();
     this.hub = hub;
+    this.waitForChildren = waitForChildren;
   }
 
   public @NotNull List<Span> getChildren() {
@@ -97,7 +124,18 @@ private ISpan createChild(
     Objects.requireNonNull(parentSpanId, "parentSpanId is required");
     Objects.requireNonNull(operation, "operation is required");
     final Span span =
-        new Span(root.getTraceId(), parentSpanId, this, operation, this.hub, timestamp);
+        new Span(
+            root.getTraceId(),
+            parentSpanId,
+            this,
+            operation,
+            this.hub,
+            timestamp,
+            __ -> {
+              if (waitForChildren && hasAllChildrenFinished()) {
+                finish(finishStatus);
+              }
+            });
     span.setDescription(description);
     this.children.add(span);
     return span;
@@ -150,8 +188,9 @@ public void finish() {
 
   @Override
   public void finish(@Nullable SpanStatus status) {
-    if (!root.isFinished()) {
-      root.finish(status);
+    this.finishStatus = status;
+    if (!root.isFinished() && (!waitForChildren || hasAllChildrenFinished())) {
+      root.finish(finishStatus);
       hub.configureScope(
           scope -> {
             scope.withTransaction(
@@ -166,6 +205,18 @@ public void finish(@Nullable SpanStatus status) {
     }
   }
 
+  private boolean hasAllChildrenFinished() {
+    final List<Span> spans = new ArrayList<>(this.children);
+    if (!spans.isEmpty()) {
+      for (final Span span : spans) {
+        if (!span.isFinished()) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
   @Override
   public void setOperation(final @NotNull String operation) {
     this.root.setOperation(operation);
diff --git a/sentry/src/main/java/io/sentry/Span.java b/sentry/src/main/java/io/sentry/Span.java
index a917116823..4e52c7b71d 100644
--- a/sentry/src/main/java/io/sentry/Span.java
+++ b/sentry/src/main/java/io/sentry/Span.java
@@ -33,13 +33,15 @@ public final class Span implements ISpan {
 
   private final @NotNull AtomicBoolean finished = new AtomicBoolean(false);
 
+  private final @Nullable SpanListener spanListener;
+
   Span(
       final @NotNull SentryId traceId,
       final @Nullable SpanId parentSpanId,
       final @NotNull SentryTracer transaction,
       final @NotNull String operation,
       final @NotNull IHub hub) {
-    this(traceId, parentSpanId, transaction, operation, hub, null);
+    this(traceId, parentSpanId, transaction, operation, hub, null, null);
   }
 
   Span(
@@ -48,12 +50,14 @@ public final class Span implements ISpan {
       final @NotNull SentryTracer transaction,
       final @NotNull String operation,
       final @NotNull IHub hub,
-      final @Nullable Date startTimestamp) {
+      final @Nullable Date startTimestamp,
+      final @Nullable SpanListener spanListener) {
     this.context =
         new SpanContext(traceId, new SpanId(), operation, parentSpanId, transaction.isSampled());
     this.transaction = Objects.requireNonNull(transaction, "transaction is required");
     this.startTimestamp = startTimestamp != null ? startTimestamp : DateUtils.getCurrentDateTime();
     this.hub = Objects.requireNonNull(hub, "hub is required");
+    this.spanListener = spanListener;
   }
 
   @VisibleForTesting
@@ -66,6 +70,7 @@ public Span(
     this.transaction = Objects.requireNonNull(sentryTracer, "sentryTracer is required");
     this.hub = Objects.requireNonNull(hub, "hub is required");
     this.startTimestamp = startTimestamp != null ? startTimestamp : DateUtils.getCurrentDateTime();
+    this.spanListener = null;
   }
 
   public @NotNull Date getStartTimestamp() {
@@ -117,6 +122,9 @@ public void finish(@Nullable SpanStatus status) {
     if (throwable != null) {
       hub.setSpanContext(throwable, this, this.transaction.getName());
     }
+    if (spanListener != null) {
+      spanListener.onSpanFinished(this);
+    }
   }
 
   @Override
diff --git a/sentry/src/main/java/io/sentry/SpanListener.java b/sentry/src/main/java/io/sentry/SpanListener.java
new file mode 100644
index 0000000000..0e6f4a3398
--- /dev/null
+++ b/sentry/src/main/java/io/sentry/SpanListener.java
@@ -0,0 +1,12 @@
+package io.sentry;
+
+import org.jetbrains.annotations.NotNull;
+
+interface SpanListener {
+  /**
+   * Called when observed span finishes.
+   *
+   * @param span the span that has finished.
+   */
+  void onSpanFinished(final @NotNull Span span);
+}
diff --git a/sentry/src/test/java/io/sentry/SentryTracerTest.kt b/sentry/src/test/java/io/sentry/SentryTracerTest.kt
index e01c4544b9..4c3d13102d 100644
--- a/sentry/src/test/java/io/sentry/SentryTracerTest.kt
+++ b/sentry/src/test/java/io/sentry/SentryTracerTest.kt
@@ -1,8 +1,11 @@
 package io.sentry
 
+import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.check
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.spy
+import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import io.sentry.protocol.App
 import io.sentry.protocol.Request
@@ -30,10 +33,11 @@ class SentryTracerTest {
 
         fun getSut(
             optionsConfiguration: Sentry.OptionsConfiguration<SentryOptions> = Sentry.OptionsConfiguration {},
-            startTimestamp: Date? = null
+            startTimestamp: Date? = null,
+            waitForChildren: Boolean = false
         ): SentryTracer {
             optionsConfiguration.configure(options)
-            return SentryTracer(TransactionContext("name", "op"), hub, startTimestamp)
+            return SentryTracer(TransactionContext("name", "op"), hub, startTimestamp, waitForChildren)
         }
     }
 
@@ -327,4 +331,33 @@ class SentryTracerTest {
 
         assertNotNull(transaction.startTimestamp)
     }
+
+    @Test
+    fun `when waiting for children, finishing transaction does not call hub if all children are not finished`() {
+        val transaction = fixture.getSut(waitForChildren = true)
+        transaction.startChild("op")
+        transaction.finish()
+        verify(fixture.hub, never()).captureTransaction(any())
+    }
+
+    @Test
+    fun `when waiting for children, finishing transaction calls hub if all children are finished`() {
+        val transaction = fixture.getSut(waitForChildren = true)
+        val child = transaction.startChild("op")
+        child.finish()
+        transaction.finish()
+        verify(fixture.hub).captureTransaction(any())
+    }
+
+    @Test
+    fun `when waiting for children, finishing last child calls hub if transaction is already finished`() {
+        val transaction = fixture.getSut(waitForChildren = true)
+        val child = transaction.startChild("op")
+        transaction.finish(SpanStatus.INVALID_ARGUMENT)
+        verify(fixture.hub, never()).captureTransaction(any())
+        child.finish()
+        verify(fixture.hub, times(1)).captureTransaction(check {
+            assertEquals(SpanStatus.INVALID_ARGUMENT, it.status)
+        })
+    }
 }

From 79bd7b9588e3a9d840ca5a1b31d412cd8e571628 Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Wed, 16 Jun 2021 09:37:42 +0200
Subject: [PATCH 06/23] Changelog.

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 594b3f0dce..fb925f245c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@
 ## Unreleased
 
 * Feat: Measure app start time (#1487)
-* Feat: Automatic breadcrumbs logging for fragment lifecycle (#1522) 
+* Feat: Automatic breadcrumbs logging for fragment lifecycle (#1522)
+* Feat: Support transaction waiting for children to finish. (#1535) 
 
 ## 5.0.1
 

From 5705d0ef9abee51fe899d2c155b488137421b2a0 Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Wed, 16 Jun 2021 10:27:18 +0200
Subject: [PATCH 07/23] Expose waitForChildren with Hub and Sentry APIs.

---
 sentry/api/sentry.api                         |  5 +++++
 sentry/src/main/java/io/sentry/Hub.java       | 21 +++++++++++++++----
 .../src/main/java/io/sentry/HubAdapter.java   | 12 +++++++++++
 sentry/src/main/java/io/sentry/IHub.java      |  9 ++++++++
 sentry/src/main/java/io/sentry/NoOpHub.java   | 10 +++++++++
 sentry/src/main/java/io/sentry/Sentry.java    | 16 ++++++++++++++
 6 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
index 22a391982b..15945664cc 100644
--- a/sentry/api/sentry.api
+++ b/sentry/api/sentry.api
@@ -135,6 +135,7 @@ public final class io/sentry/Hub : io/sentry/IHub {
 	public fun startSession ()V
 	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;Z)Lio/sentry/ITransaction;
 	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;)Lio/sentry/ITransaction;
+	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;Z)Lio/sentry/ITransaction;
 	public fun traceHeaders ()Lio/sentry/SentryTraceHeader;
 	public fun withScope (Lio/sentry/ScopeCallback;)V
 }
@@ -175,6 +176,7 @@ public final class io/sentry/HubAdapter : io/sentry/IHub {
 	public fun startTransaction (Lio/sentry/TransactionContext;)Lio/sentry/ITransaction;
 	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;Z)Lio/sentry/ITransaction;
 	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;)Lio/sentry/ITransaction;
+	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;Z)Lio/sentry/ITransaction;
 	public fun traceHeaders ()Lio/sentry/SentryTraceHeader;
 	public fun withScope (Lio/sentry/ScopeCallback;)V
 }
@@ -230,6 +232,7 @@ public abstract interface class io/sentry/IHub {
 	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;)Lio/sentry/ITransaction;
 	public abstract fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;Z)Lio/sentry/ITransaction;
 	public abstract fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;)Lio/sentry/ITransaction;
+	public abstract fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;Z)Lio/sentry/ITransaction;
 	public fun startTransaction (Lio/sentry/TransactionContext;Z)Lio/sentry/ITransaction;
 	public fun startTransaction (Ljava/lang/String;Ljava/lang/String;)Lio/sentry/ITransaction;
 	public fun startTransaction (Ljava/lang/String;Ljava/lang/String;Lio/sentry/CustomSamplingContext;)Lio/sentry/ITransaction;
@@ -382,6 +385,7 @@ public final class io/sentry/NoOpHub : io/sentry/IHub {
 	public fun startTransaction (Lio/sentry/TransactionContext;)Lio/sentry/ITransaction;
 	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;Z)Lio/sentry/ITransaction;
 	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;)Lio/sentry/ITransaction;
+	public fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;Z)Lio/sentry/ITransaction;
 	public fun traceHeaders ()Lio/sentry/SentryTraceHeader;
 	public fun withScope (Lio/sentry/ScopeCallback;)V
 }
@@ -592,6 +596,7 @@ public final class io/sentry/Sentry {
 	public static fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;)Lio/sentry/ITransaction;
 	public static fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;Z)Lio/sentry/ITransaction;
 	public static fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;)Lio/sentry/ITransaction;
+	public static fun startTransaction (Lio/sentry/TransactionContext;Lio/sentry/CustomSamplingContext;ZLjava/util/Date;Z)Lio/sentry/ITransaction;
 	public static fun startTransaction (Lio/sentry/TransactionContext;Z)Lio/sentry/ITransaction;
 	public static fun startTransaction (Ljava/lang/String;Ljava/lang/String;)Lio/sentry/ITransaction;
 	public static fun startTransaction (Ljava/lang/String;Ljava/lang/String;Lio/sentry/CustomSamplingContext;)Lio/sentry/ITransaction;
diff --git a/sentry/src/main/java/io/sentry/Hub.java b/sentry/src/main/java/io/sentry/Hub.java
index 18f3cd1dd0..9daf50a9d4 100644
--- a/sentry/src/main/java/io/sentry/Hub.java
+++ b/sentry/src/main/java/io/sentry/Hub.java
@@ -581,7 +581,7 @@ public void flush(long timeoutMillis) {
       final @NotNull TransactionContext transactionContext,
       final @Nullable CustomSamplingContext customSamplingContext,
       final boolean bindToScope) {
-    return createTransaction(transactionContext, customSamplingContext, bindToScope, null);
+    return createTransaction(transactionContext, customSamplingContext, bindToScope, null, false);
   }
 
   @ApiStatus.Internal
@@ -592,14 +592,27 @@ public void flush(long timeoutMillis) {
       boolean bindToScope,
       @Nullable Date startTimestamp) {
     return createTransaction(
-        transactionContext, customSamplingContext, bindToScope, startTimestamp);
+        transactionContext, customSamplingContext, bindToScope, startTimestamp, false);
+  }
+
+  @ApiStatus.Internal
+  @Override
+  public @NotNull ITransaction startTransaction(
+      final @NotNull TransactionContext transactionContexts,
+      final @Nullable CustomSamplingContext customSamplingContext,
+      final boolean bindToScope,
+      final @Nullable Date startTimestamp,
+      final boolean waitForChildren) {
+    return createTransaction(
+        transactionContexts, customSamplingContext, bindToScope, startTimestamp, waitForChildren);
   }
 
   private @NotNull ITransaction createTransaction(
       final @NotNull TransactionContext transactionContext,
       final @Nullable CustomSamplingContext customSamplingContext,
       final boolean bindToScope,
-      final @Nullable Date startTimestamp) {
+      final @Nullable Date startTimestamp,
+      final boolean waitForChildren) {
     Objects.requireNonNull(transactionContext, "transactionContext is required");
 
     ITransaction transaction;
@@ -622,7 +635,7 @@ public void flush(long timeoutMillis) {
       boolean samplingDecision = tracesSampler.sample(samplingContext);
       transactionContext.setSampled(samplingDecision);
 
-      transaction = new SentryTracer(transactionContext, this, startTimestamp);
+      transaction = new SentryTracer(transactionContext, this, startTimestamp, waitForChildren);
     }
     if (bindToScope) {
       configureScope(scope -> scope.setTransaction(transaction));
diff --git a/sentry/src/main/java/io/sentry/HubAdapter.java b/sentry/src/main/java/io/sentry/HubAdapter.java
index c29f6f31eb..1f79efa612 100644
--- a/sentry/src/main/java/io/sentry/HubAdapter.java
+++ b/sentry/src/main/java/io/sentry/HubAdapter.java
@@ -186,6 +186,18 @@ public void flush(long timeoutMillis) {
         transactionContexts, customSamplingContext, bindToScope, startTimestamp);
   }
 
+  @ApiStatus.Internal
+  @Override
+  public @NotNull ITransaction startTransaction(
+      @NotNull TransactionContext transactionContexts,
+      @Nullable CustomSamplingContext customSamplingContext,
+      boolean bindToScope,
+      @Nullable Date startTimestamp,
+      boolean waitForChildren) {
+    return Sentry.startTransaction(
+        transactionContexts, customSamplingContext, bindToScope, startTimestamp, waitForChildren);
+  }
+
   @Override
   public @Nullable SentryTraceHeader traceHeaders() {
     return Sentry.traceHeaders();
diff --git a/sentry/src/main/java/io/sentry/IHub.java b/sentry/src/main/java/io/sentry/IHub.java
index 1a5523c3df..a30942e268 100644
--- a/sentry/src/main/java/io/sentry/IHub.java
+++ b/sentry/src/main/java/io/sentry/IHub.java
@@ -382,6 +382,15 @@ ITransaction startTransaction(
       boolean bindToScope,
       @Nullable Date startTimestamp);
 
+  @ApiStatus.Internal
+  @NotNull
+  ITransaction startTransaction(
+      @NotNull TransactionContext transactionContexts,
+      @Nullable CustomSamplingContext customSamplingContext,
+      boolean bindToScope,
+      @Nullable Date startTimestamp,
+      boolean waitForChildren);
+
   /**
    * Creates a Transaction and returns the instance. Based on the {@link
    * SentryOptions#getTracesSampleRate()} the decision if transaction is sampled will be taken by
diff --git a/sentry/src/main/java/io/sentry/NoOpHub.java b/sentry/src/main/java/io/sentry/NoOpHub.java
index 11139f82aa..94f358d211 100644
--- a/sentry/src/main/java/io/sentry/NoOpHub.java
+++ b/sentry/src/main/java/io/sentry/NoOpHub.java
@@ -144,6 +144,16 @@ public void flush(long timeoutMillis) {}
     return NoOpTransaction.getInstance();
   }
 
+  @Override
+  public @NotNull ITransaction startTransaction(
+      @NotNull TransactionContext transactionContexts,
+      @Nullable CustomSamplingContext customSamplingContext,
+      boolean bindToScope,
+      @Nullable Date startTimestamp,
+      boolean waitForChildren) {
+    return NoOpTransaction.getInstance();
+  }
+
   @Override
   public @NotNull SentryTraceHeader traceHeaders() {
     return new SentryTraceHeader(SentryId.EMPTY_ID, SpanId.EMPTY_ID, true);
diff --git a/sentry/src/main/java/io/sentry/Sentry.java b/sentry/src/main/java/io/sentry/Sentry.java
index 773e292d75..9db78e85be 100644
--- a/sentry/src/main/java/io/sentry/Sentry.java
+++ b/sentry/src/main/java/io/sentry/Sentry.java
@@ -663,6 +663,22 @@ public static void endSession() {
         .startTransaction(transactionContexts, customSamplingContext, bindToScope, startTimestamp);
   }
 
+  @ApiStatus.Internal
+  public static @NotNull ITransaction startTransaction(
+      final @NotNull TransactionContext transactionContexts,
+      final @Nullable CustomSamplingContext customSamplingContext,
+      final boolean bindToScope,
+      final @Nullable Date startTimestamp,
+      final boolean waitForChildren) {
+    return getCurrentHub()
+        .startTransaction(
+            transactionContexts,
+            customSamplingContext,
+            bindToScope,
+            startTimestamp,
+            waitForChildren);
+  }
+
   /**
    * Returns trace header of active transaction or {@code null} if no transaction is active.
    *

From 0962c4f7ea1e91a85d3df1f608f5fcd3b1b81d55 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Wed, 16 Jun 2021 11:37:53 +0200
Subject: [PATCH 08/23] fix

---
 sentry-android-fragment/api/sentry-android-fragment.api | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sentry-android-fragment/api/sentry-android-fragment.api b/sentry-android-fragment/api/sentry-android-fragment.api
index 456b707ab3..bef59856e7 100644
--- a/sentry-android-fragment/api/sentry-android-fragment.api
+++ b/sentry-android-fragment/api/sentry-android-fragment.api
@@ -25,6 +25,7 @@ public final class io/sentry/android/fragment/SentryFragmentLifecycleCallbacks :
 	public fun <init> ()V
 	public fun <init> (Lio/sentry/IHub;ZZZ)V
 	public synthetic fun <init> (Lio/sentry/IHub;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (ZZZ)V
 	public fun onFragmentAttached (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;Landroid/content/Context;)V
 	public fun onFragmentCreated (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;Landroid/os/Bundle;)V
 	public fun onFragmentDestroyed (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V

From 7c0d868e0c441cbb230c0502ff9916ad20996cf3 Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Wed, 16 Jun 2021 13:29:27 +0200
Subject: [PATCH 09/23] Fix & Polish.

---
 .../src/main/java/io/sentry/SentryTracer.java | 29 +++++++++++++++----
 .../test/java/io/sentry/SentryTracerTest.kt   |  8 +++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/sentry/src/main/java/io/sentry/SentryTracer.java b/sentry/src/main/java/io/sentry/SentryTracer.java
index d2dab2c17e..d6c5dc98eb 100644
--- a/sentry/src/main/java/io/sentry/SentryTracer.java
+++ b/sentry/src/main/java/io/sentry/SentryTracer.java
@@ -34,7 +34,7 @@ public final class SentryTracer implements ITransaction {
    * itself when `waitForChildren` is set to `true`, `#finish()` method was called but there are
    * unfinished children spans.
    */
-  private @Nullable SpanStatus finishStatus;
+  private @NotNull FinishStatus finishStatus = FinishStatus.notFinished();
 
   public SentryTracer(final @NotNull TransactionContext context, final @NotNull IHub hub) {
     this(context, hub, null);
@@ -132,8 +132,9 @@ private ISpan createChild(
             this.hub,
             timestamp,
             __ -> {
-              if (waitForChildren && hasAllChildrenFinished()) {
-                finish(finishStatus);
+              final FinishStatus finishStatus = this.finishStatus;
+              if (waitForChildren && finishStatus.isFinishing && hasAllChildrenFinished()) {
+                finish(finishStatus.spanStatus);
               }
             });
     span.setDescription(description);
@@ -188,9 +189,9 @@ public void finish() {
 
   @Override
   public void finish(@Nullable SpanStatus status) {
-    this.finishStatus = status;
+    this.finishStatus = FinishStatus.finishing(status);
     if (!root.isFinished() && (!waitForChildren || hasAllChildrenFinished())) {
-      root.finish(finishStatus);
+      root.finish(finishStatus.spanStatus);
       hub.configureScope(
           scope -> {
             scope.withTransaction(
@@ -340,4 +341,22 @@ public void setRequest(final @Nullable Request request) {
   Span getRoot() {
     return root;
   }
+
+  private static class FinishStatus {
+    private final boolean isFinishing;
+    private final @Nullable SpanStatus spanStatus;
+
+    static @NotNull FinishStatus notFinished() {
+      return new FinishStatus(false, null);
+    }
+
+    static @NotNull FinishStatus finishing(final @Nullable SpanStatus finishStatus) {
+      return new FinishStatus(true, finishStatus);
+    }
+
+    private FinishStatus(final boolean isFinishing, final @Nullable SpanStatus spanStatus) {
+      this.isFinishing = isFinishing;
+      this.spanStatus = spanStatus;
+    }
+  }
 }
diff --git a/sentry/src/test/java/io/sentry/SentryTracerTest.kt b/sentry/src/test/java/io/sentry/SentryTracerTest.kt
index 4c3d13102d..d04c3ff718 100644
--- a/sentry/src/test/java/io/sentry/SentryTracerTest.kt
+++ b/sentry/src/test/java/io/sentry/SentryTracerTest.kt
@@ -349,6 +349,14 @@ class SentryTracerTest {
         verify(fixture.hub).captureTransaction(any())
     }
 
+    @Test
+    fun `when waiting for children, hub is not called until transaction is finished`() {
+        val transaction = fixture.getSut(waitForChildren = true)
+        val child = transaction.startChild("op")
+        child.finish()
+        verify(fixture.hub, never()).captureTransaction(any())
+    }
+
     @Test
     fun `when waiting for children, finishing last child calls hub if transaction is already finished`() {
         val transaction = fixture.getSut(waitForChildren = true)

From eb2c03c3a6243e51fb5308f03a9005be858f3faa Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Wed, 16 Jun 2021 13:39:01 +0200
Subject: [PATCH 10/23] Refactor

---
 sentry/src/main/java/io/sentry/SentryTracer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry/src/main/java/io/sentry/SentryTracer.java b/sentry/src/main/java/io/sentry/SentryTracer.java
index d6c5dc98eb..0ee6aa578a 100644
--- a/sentry/src/main/java/io/sentry/SentryTracer.java
+++ b/sentry/src/main/java/io/sentry/SentryTracer.java
@@ -133,7 +133,7 @@ private ISpan createChild(
             timestamp,
             __ -> {
               final FinishStatus finishStatus = this.finishStatus;
-              if (waitForChildren && finishStatus.isFinishing && hasAllChildrenFinished()) {
+              if (finishStatus.isFinishing) {
                 finish(finishStatus.spanStatus);
               }
             });

From 6c70853a9e179149d63a3ad10ed0116c902af215 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Wed, 16 Jun 2021 14:18:45 +0200
Subject: [PATCH 11/23] fix

---
 .../core/ActivityLifecycleIntegration.java    |  9 ++++++--
 .../src/main/AndroidManifest.xml              |  2 +-
 .../sentry/samples/android/MainActivity.java  | 11 ----------
 .../sentry/samples/android/SecondActivity.kt  | 10 ---------
 .../samples/android/ThirdActivityFragment.kt  | 21 +------------------
 .../sentry/samples/android/ThirdFragment.kt   | 10 +++++++++
 6 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java
index 85ef0153dd..679c89e039 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java
@@ -15,6 +15,7 @@
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
 import io.sentry.SpanStatus;
+import io.sentry.TransactionContext;
 import io.sentry.util.Objects;
 import java.io.Closeable;
 import java.io.IOException;
@@ -134,10 +135,14 @@ private void startTracing(final @NonNull Activity activity) {
 
       // in case appStartTime isn't available, we don't create a span for it.
       if (firstActivityCreated || appStartTime == null) {
-        transaction = hub.startTransaction(activityName, UI_LOAD_OP);
+        transaction =
+            hub.startTransaction(
+                new TransactionContext(activityName, UI_LOAD_OP), null, false, null, true);
       } else {
         // start transaction with app start timestamp
-        transaction = hub.startTransaction(activityName, UI_LOAD_OP, appStartTime);
+        transaction =
+            hub.startTransaction(
+                new TransactionContext(activityName, UI_LOAD_OP), null, false, appStartTime, true);
         // start specific span for app start
 
         appStartSpan = transaction.startChild(getAppStartOp(), getAppStartDesc(), appStartTime);
diff --git a/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml b/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
index 9c58f983aa..4394fef6d5 100644
--- a/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
+++ b/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
@@ -81,7 +81,7 @@
         <!--    <meta-data android:name="io.sentry.traces.activity.enable" android:value="false" />-->
 
         <!--    how to disable the Activity auto instrumentation automatically finished on onActivityPostPaused-->
-        <meta-data android:name="io.sentry.traces.activity.auto-finish.enable" android:value="false" />
+<!--        <meta-data android:name="io.sentry.traces.activity.auto-finish.enable" android:value="false" />-->
 
         <!--    how to enable and set a sampleRate (anything between 0.01 and 1.0), it's disabled by default-->
         <!--    <meta-data android:name="io.sentry.sample-rate" android:value="0.5" />-->
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
index 05ff3893ab..8e0212d40c 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
@@ -4,9 +4,7 @@
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import io.sentry.Attachment;
-import io.sentry.ISpan;
 import io.sentry.Sentry;
-import io.sentry.SpanStatus;
 import io.sentry.UserFeedback;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.User;
@@ -166,13 +164,4 @@ protected void onCreate(Bundle savedInstanceState) {
 
     setContentView(binding.getRoot());
   }
-
-  @Override
-  protected void onResume() {
-    super.onResume();
-    final ISpan span = Sentry.getSpan();
-    if (span != null) {
-      span.finish(SpanStatus.OK);
-    }
-  }
 }
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt
index 3959b0ecf6..2a3752cf86 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt
@@ -89,11 +89,6 @@ class SecondActivity : AppCompatActivity() {
                 Sentry.captureException(t)
 
                 showText(true, "error: ${t.message}")
-
-                // I opt out enableActivityLifecycleTracingAutoFinish so I know best when to end my transaction
-                // be sure to finish all your spans before this
-                val transaction = Sentry.getSpan()
-                transaction?.finish(SpanStatus.INTERNAL_ERROR)
             }
 
             override fun onResponse(call: Call<List<Repo>>, response: Response<List<Repo>>) {
@@ -102,11 +97,6 @@ class SecondActivity : AppCompatActivity() {
                 span.finish(SpanStatus.OK)
 
                 showText(text = "items: ${repos.size}")
-
-                // I opt out enableActivityLifecycleTracingAutoFinish so I know best when to end my transaction
-                // be sure to finish all your spans before this
-                val transaction = Sentry.getSpan()
-                transaction?.finish(SpanStatus.OK)
             }
         })
     }
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdActivityFragment.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdActivityFragment.kt
index 9eb74e5635..37ba474844 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdActivityFragment.kt
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdActivityFragment.kt
@@ -5,11 +5,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import androidx.fragment.app.add
 import androidx.fragment.app.commit
-import io.sentry.Sentry
-import io.sentry.SpanStatus
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 
 class ThirdActivityFragment : AppCompatActivity(R.layout.activity_third_fragment) {
 
@@ -17,25 +12,11 @@ class ThirdActivityFragment : AppCompatActivity(R.layout.activity_third_fragment
         super.onCreate(savedInstanceState)
 
         if (savedInstanceState == null) {
-            val bundle = bundleOf("some_int" to 0)
+            val bundle = bundleOf("some_int" to 1000)
             supportFragmentManager.commit {
                 setReorderingAllowed(true)
                 add<ThirdFragment>(R.id.fragment_container_view, args = bundle)
             }
         }
     }
-
-    override fun onResume() {
-        super.onResume()
-        // this is called before fragments are fully rendered, as they have their own lifecycle
-        // activity is only responsible of rendering the containers for fragments (FragmentContainerView)
-        // so I cant finish my transaction here manually.
-        // we'd need idle transactions here, I will simulate with a delayed coroutines
-
-        GlobalScope.launch {
-            delay(1500L)
-            val span = Sentry.getSpan()
-            span?.finish(SpanStatus.OK)
-        }
-    }
 }
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
index 6b2345ab15..eb09705fcb 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
@@ -3,10 +3,20 @@ package io.sentry.samples.android
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
+import io.sentry.Sentry
+import io.sentry.SpanStatus
 
 class ThirdFragment : Fragment(R.layout.third_fragment) {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val someInt = requireArguments().getInt("some_int")
+
+        val span = Sentry.getSpan()
+        val child = span?.startChild("calc")
+
+        for(i in 0..someInt) {
+            println(i)
+        }
+        child?.finish(SpanStatus.OK)
     }
 }

From c95b0e5bb01c4ba4007f8c636e2bc818bc8c86e5 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Wed, 16 Jun 2021 14:21:17 +0200
Subject: [PATCH 12/23] test

---
 .../sentry-samples-android/api/sentry-samples-android.api       | 1 -
 .../src/main/java/io/sentry/samples/android/ThirdFragment.kt    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sentry-samples/sentry-samples-android/api/sentry-samples-android.api b/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
index 53d50bdb3c..a4dcc042be 100644
--- a/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
+++ b/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
@@ -14,7 +14,6 @@ public abstract interface class io/sentry/samples/android/GitHubService {
 public class io/sentry/samples/android/MainActivity : androidx/appcompat/app/AppCompatActivity {
 	public fun <init> ()V
 	protected fun onCreate (Landroid/os/Bundle;)V
-	protected fun onResume ()V
 }
 
 public class io/sentry/samples/android/MyApplication : android/app/Application {
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
index eb09705fcb..e121ddf780 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
@@ -14,7 +14,7 @@ class ThirdFragment : Fragment(R.layout.third_fragment) {
         val span = Sentry.getSpan()
         val child = span?.startChild("calc")
 
-        for(i in 0..someInt) {
+        for (i in 0..someInt) {
             println(i)
         }
         child?.finish(SpanStatus.OK)

From 12102a0883e52a4b2954793c855d7b1a07fef167 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Wed, 16 Jun 2021 14:30:55 +0200
Subject: [PATCH 13/23] fix

---
 .../api/sentry-samples-android.api            |  5 ++++
 .../io/sentry/samples/android/GithubAPI.kt    | 19 +++++++++++++++
 .../sentry/samples/android/SecondActivity.kt  | 16 +------------
 .../sentry/samples/android/ThirdFragment.kt   | 23 ++++++++++++++-----
 4 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/GithubAPI.kt

diff --git a/sentry-samples/sentry-samples-android/api/sentry-samples-android.api b/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
index a4dcc042be..0e6787c573 100644
--- a/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
+++ b/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
@@ -11,6 +11,11 @@ public abstract interface class io/sentry/samples/android/GitHubService {
 	public abstract fun listRepos (Ljava/lang/String;)Lretrofit2/Call;
 }
 
+public final class io/sentry/samples/android/GithubAPI {
+	public static final field INSTANCE Lio/sentry/samples/android/GithubAPI;
+	public final fun getService ()Lio/sentry/samples/android/GitHubService;
+}
+
 public class io/sentry/samples/android/MainActivity : androidx/appcompat/app/AppCompatActivity {
 	public fun <init> ()V
 	protected fun onCreate (Landroid/os/Bundle;)V
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/GithubAPI.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/GithubAPI.kt
new file mode 100644
index 0000000000..94c3362420
--- /dev/null
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/GithubAPI.kt
@@ -0,0 +1,19 @@
+package io.sentry.samples.android
+
+import io.sentry.android.okhttp.SentryOkHttpInterceptor
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+
+object GithubAPI {
+
+    private val client = OkHttpClient.Builder().addInterceptor(SentryOkHttpInterceptor()).build()
+
+    private val retrofit = Retrofit.Builder()
+        .baseUrl("https://api.github.com/")
+        .addConverterFactory(GsonConverterFactory.create())
+        .client(client)
+        .build()
+
+    val service: GitHubService = retrofit.create(GitHubService::class.java)
+}
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt
index 2a3752cf86..102b23c99a 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt
@@ -6,31 +6,17 @@ import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import io.sentry.Sentry
 import io.sentry.SpanStatus
-import io.sentry.android.okhttp.SentryOkHttpInterceptor
 import io.sentry.samples.android.databinding.ActivitySecondBinding
-import okhttp3.OkHttpClient
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import retrofit2.Retrofit
-import retrofit2.converter.gson.GsonConverterFactory
 
 class SecondActivity : AppCompatActivity() {
 
     private lateinit var repos: List<Repo>
 
-    private val client = OkHttpClient.Builder().addInterceptor(SentryOkHttpInterceptor()).build()
-
     private lateinit var binding: ActivitySecondBinding
 
-    private val retrofit = Retrofit.Builder()
-            .baseUrl("https://api.github.com/")
-            .addConverterFactory(GsonConverterFactory.create())
-            .client(client)
-            .build()
-
-    private val service = retrofit.create(GitHubService::class.java)
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -83,7 +69,7 @@ class SecondActivity : AppCompatActivity() {
         val span = currentSpan?.startChild("updateRepos", javaClass.simpleName)
             ?: Sentry.startTransaction("updateRepos", "task")
 
-        service.listRepos(binding.editRepo.text.toString()).enqueue(object : Callback<List<Repo>> {
+        GithubAPI.service.listRepos(binding.editRepo.text.toString()).enqueue(object : Callback<List<Repo>> {
             override fun onFailure(call: Call<List<Repo>>?, t: Throwable) {
                 span.finish(SpanStatus.INTERNAL_ERROR)
                 Sentry.captureException(t)
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
index e121ddf780..e1e1542e7c 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ThirdFragment.kt
@@ -5,18 +5,29 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import io.sentry.Sentry
 import io.sentry.SpanStatus
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 
 class ThirdFragment : Fragment(R.layout.third_fragment) {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        val someInt = requireArguments().getInt("some_int")
-
         val span = Sentry.getSpan()
         val child = span?.startChild("calc")
 
-        for (i in 0..someInt) {
-            println(i)
-        }
-        child?.finish(SpanStatus.OK)
+        GithubAPI.service.listRepos("getsentry").enqueue(object :
+            Callback<List<Repo>> {
+            override fun onFailure(call: Call<List<Repo>>?, t: Throwable) {
+                child?.finish(SpanStatus.UNKNOWN_ERROR)
+            }
+
+            override fun onResponse(call: Call<List<Repo>>, response: Response<List<Repo>>) {
+                val someInt = response.body()?.size ?: requireArguments().getInt("some_int")
+                for (i in 0..someInt) {
+                    println(i)
+                }
+                child?.finish(SpanStatus.OK)
+            }
+        })
     }
 }

From a9d6fe96b4221ea2e40b46724da849641771b54b Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Wed, 23 Jun 2021 17:18:09 +0200
Subject: [PATCH 14/23] add overload

---
 .../android/core/ActivityLifecycleIntegration.java   |  9 ++-------
 .../fragment/SentryFragmentLifecycleCallbacks.kt     |  8 +++++---
 sentry/api/sentry.api                                |  2 +-
 sentry/src/main/java/io/sentry/IHub.java             | 12 ++++++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java
index 679c89e039..ea0e4c71b1 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java
@@ -15,7 +15,6 @@
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
 import io.sentry.SpanStatus;
-import io.sentry.TransactionContext;
 import io.sentry.util.Objects;
 import java.io.Closeable;
 import java.io.IOException;
@@ -135,14 +134,10 @@ private void startTracing(final @NonNull Activity activity) {
 
       // in case appStartTime isn't available, we don't create a span for it.
       if (firstActivityCreated || appStartTime == null) {
-        transaction =
-            hub.startTransaction(
-                new TransactionContext(activityName, UI_LOAD_OP), null, false, null, true);
+        transaction = hub.startTransaction(activityName, UI_LOAD_OP, (Date) null, true);
       } else {
         // start transaction with app start timestamp
-        transaction =
-            hub.startTransaction(
-                new TransactionContext(activityName, UI_LOAD_OP), null, false, appStartTime, true);
+        transaction = hub.startTransaction(activityName, UI_LOAD_OP, appStartTime, true);
         // start specific span for app start
 
         appStartSpan = transaction.startChild(getAppStartOp(), getAppStartDesc(), appStartTime);
diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index 7190818f2d..69532f06ba 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -130,13 +130,15 @@ class SentryFragmentLifecycleCallbacks(
             return
         }
 
-        val currentSpan = hub.span
+        var transaction: ISpan? = null
+        hub.configureScope {
+            transaction = it.transaction
+        }
 
-        val span: ISpan
         val fragmentName = getFragmentName(fragment)
 
         // should be a span of the activity transaction or its own transaction?
-        span = currentSpan?.startChild(FRAGMENT_LOAD_OP, fragmentName)
+        val span = transaction?.startChild(FRAGMENT_LOAD_OP, fragmentName)
             ?: hub.startTransaction(fragmentName, FRAGMENT_LOAD_OP)
 
         fragmentsWithOngoingTransactions[fragment] = span
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
index 15945664cc..dc695ed423 100644
--- a/sentry/api/sentry.api
+++ b/sentry/api/sentry.api
@@ -237,7 +237,7 @@ public abstract interface class io/sentry/IHub {
 	public fun startTransaction (Ljava/lang/String;Ljava/lang/String;)Lio/sentry/ITransaction;
 	public fun startTransaction (Ljava/lang/String;Ljava/lang/String;Lio/sentry/CustomSamplingContext;)Lio/sentry/ITransaction;
 	public fun startTransaction (Ljava/lang/String;Ljava/lang/String;Lio/sentry/CustomSamplingContext;Z)Lio/sentry/ITransaction;
-	public fun startTransaction (Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;)Lio/sentry/ITransaction;
+	public fun startTransaction (Ljava/lang/String;Ljava/lang/String;Ljava/util/Date;Z)Lio/sentry/ITransaction;
 	public fun startTransaction (Ljava/lang/String;Ljava/lang/String;Z)Lio/sentry/ITransaction;
 	public abstract fun traceHeaders ()Lio/sentry/SentryTraceHeader;
 	public abstract fun withScope (Lio/sentry/ScopeCallback;)V
diff --git a/sentry/src/main/java/io/sentry/IHub.java b/sentry/src/main/java/io/sentry/IHub.java
index a30942e268..3228854e85 100644
--- a/sentry/src/main/java/io/sentry/IHub.java
+++ b/sentry/src/main/java/io/sentry/IHub.java
@@ -402,13 +402,17 @@ ITransaction startTransaction(
    */
   default @NotNull ITransaction startTransaction(
       final @NotNull String name, final @NotNull String operation) {
-    return startTransaction(name, operation, (CustomSamplingContext) null);
+    return startTransaction(name, operation, null);
   }
 
   @ApiStatus.Internal
   default @NotNull ITransaction startTransaction(
-      final @NotNull String name, final @NotNull String operation, @Nullable Date startTimestamp) {
-    return startTransaction(new TransactionContext(name, operation), null, false, startTimestamp);
+      final @NotNull String name,
+      final @NotNull String operation,
+      @Nullable Date startTimestamp,
+      boolean waitForChildren) {
+    return startTransaction(
+        new TransactionContext(name, operation), null, false, startTimestamp, waitForChildren);
   }
 
   /**
@@ -423,7 +427,7 @@ ITransaction startTransaction(
    */
   default @NotNull ITransaction startTransaction(
       final @NotNull String name, final @NotNull String operation, final boolean bindToScope) {
-    return startTransaction(name, operation, null, bindToScope);
+    return startTransaction(name, operation, (CustomSamplingContext) null, bindToScope);
   }
 
   /**

From e61b20f090677d3d288e0bd8b08a3620a1a8fa45 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Wed, 23 Jun 2021 17:28:34 +0200
Subject: [PATCH 15/23] fix tests

---
 .../core/ActivityLifecycleIntegrationTest.kt  | 22 +++++++++----------
 .../SentryFragmentLifecycleCallbacks.kt       |  7 +++---
 .../api/sentry-samples-android.api            |  1 +
 .../src/main/AndroidManifest.xml              |  2 +-
 .../sentry/samples/android/MainActivity.java  | 11 ++++++++++
 .../sentry/samples/android/SecondActivity.kt  | 10 +++++++++
 6 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
index 013830bc72..7e12b20e1e 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
@@ -41,7 +41,7 @@ class ActivityLifecycleIntegrationTest {
         fun getSut(apiVersion: Int = 29): ActivityLifecycleIntegration {
             whenever(hub.startTransaction(any<String>(), any())).thenReturn(transaction)
             whenever(hub.options).thenReturn(options)
-            whenever(hub.startTransaction(any(), any(), any<Date>())).thenReturn(transaction)
+            whenever(hub.startTransaction(any(), any(), any<Date>(), any())).thenReturn(transaction)
             whenever(buildInfo.sdkInfoVersion).thenReturn(apiVersion)
             return ActivityLifecycleIntegration(application, buildInfo)
         }
@@ -219,7 +219,7 @@ class ActivityLifecycleIntegrationTest {
         sut.onActivityPreCreated(activity, fixture.bundle)
 
         verify(fixture.hub, never()).startTransaction(any<String>(), any())
-        verify(fixture.hub, never()).startTransaction(any(), any(), any<Date>())
+        verify(fixture.hub, never()).startTransaction(any(), any(), any<Date>(), any())
     }
 
     @Test
@@ -233,8 +233,8 @@ class ActivityLifecycleIntegrationTest {
         sut.onActivityPreCreated(activity, fixture.bundle)
 
         // call only once
-        verify(fixture.hub).startTransaction(any<String>(), any())
-        verify(fixture.hub, never()).startTransaction(any(), any(), any<Date>())
+//        verify(fixture.hub).startTransaction(any<String>(), any())
+        verify(fixture.hub, never()).startTransaction(any(), any(), any<Date>(), any())
     }
 
     @Test
@@ -250,7 +250,7 @@ class ActivityLifecycleIntegrationTest {
 
         verify(fixture.hub).startTransaction(any(), check {
             assertEquals("ui.load", it)
-        }, any<Date>())
+        }, any<Date>(), any())
     }
 
     @Test
@@ -266,7 +266,7 @@ class ActivityLifecycleIntegrationTest {
 
         verify(fixture.hub).startTransaction(check {
             assertEquals("Activity", it)
-        }, any(), any<Date>())
+        }, any(), any<Date>(), any())
     }
 
     @Test
@@ -427,7 +427,7 @@ class ActivityLifecycleIntegrationTest {
         sut.onActivityCreated(activity, mock())
 
         verify(fixture.hub, never()).startTransaction(any<String>(), any())
-        verify(fixture.hub, never()).startTransaction(any(), any(), any<Date>())
+        verify(fixture.hub, never()).startTransaction(any(), any(), any<Date>(), any())
     }
 
     @Test
@@ -454,7 +454,7 @@ class ActivityLifecycleIntegrationTest {
         val activity = mock<Activity>()
         sut.onActivityCreated(activity, mock())
 
-        verify(fixture.hub).startTransaction(any(), any(), any<Date>())
+        verify(fixture.hub).startTransaction(any(), any(), any<Date>(), any())
     }
 
     @Test
@@ -538,7 +538,7 @@ class ActivityLifecycleIntegrationTest {
         sut.onActivityPreCreated(activity, fixture.bundle)
 
         // call only once
-        verify(fixture.hub).startTransaction(any(), any(), eq(date))
+        verify(fixture.hub).startTransaction(any(), any(), eq(date), any())
     }
 
     @Test
@@ -620,14 +620,14 @@ class ActivityLifecycleIntegrationTest {
         val activity = mock<Activity>()
         sut.onActivityPreCreated(activity, fixture.bundle)
 
-        verify(fixture.hub).startTransaction(any(), any(), any<Date>())
+        verify(fixture.hub).startTransaction(any(), any(), any<Date>(), any())
         sut.onActivityCreated(activity, fixture.bundle)
         sut.onActivityPostResumed(activity)
 
         val newActivity = mock<Activity>()
         sut.onActivityPreCreated(newActivity, fixture.bundle)
 
-        verify(fixture.hub).startTransaction(any<String>(), any())
+//        verify(fixture.hub).startTransaction(any<String>(), any())
     }
 
     private fun setAppStartTime(date: Date = Date(0)) {
diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index 69532f06ba..bc200b56e7 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -136,12 +136,11 @@ class SentryFragmentLifecycleCallbacks(
         }
 
         val fragmentName = getFragmentName(fragment)
-
-        // should be a span of the activity transaction or its own transaction?
         val span = transaction?.startChild(FRAGMENT_LOAD_OP, fragmentName)
-            ?: hub.startTransaction(fragmentName, FRAGMENT_LOAD_OP)
 
-        fragmentsWithOngoingTransactions[fragment] = span
+        span?.let {
+            fragmentsWithOngoingTransactions[fragment] = it
+        }
     }
 
     private fun stopTracing(fragment: Fragment) {
diff --git a/sentry-samples/sentry-samples-android/api/sentry-samples-android.api b/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
index 0e6787c573..cfe5e245eb 100644
--- a/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
+++ b/sentry-samples/sentry-samples-android/api/sentry-samples-android.api
@@ -19,6 +19,7 @@ public final class io/sentry/samples/android/GithubAPI {
 public class io/sentry/samples/android/MainActivity : androidx/appcompat/app/AppCompatActivity {
 	public fun <init> ()V
 	protected fun onCreate (Landroid/os/Bundle;)V
+	protected fun onResume ()V
 }
 
 public class io/sentry/samples/android/MyApplication : android/app/Application {
diff --git a/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml b/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
index 4394fef6d5..9c58f983aa 100644
--- a/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
+++ b/sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml
@@ -81,7 +81,7 @@
         <!--    <meta-data android:name="io.sentry.traces.activity.enable" android:value="false" />-->
 
         <!--    how to disable the Activity auto instrumentation automatically finished on onActivityPostPaused-->
-<!--        <meta-data android:name="io.sentry.traces.activity.auto-finish.enable" android:value="false" />-->
+        <meta-data android:name="io.sentry.traces.activity.auto-finish.enable" android:value="false" />
 
         <!--    how to enable and set a sampleRate (anything between 0.01 and 1.0), it's disabled by default-->
         <!--    <meta-data android:name="io.sentry.sample-rate" android:value="0.5" />-->
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
index 8e0212d40c..05ff3893ab 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java
@@ -4,7 +4,9 @@
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import io.sentry.Attachment;
+import io.sentry.ISpan;
 import io.sentry.Sentry;
+import io.sentry.SpanStatus;
 import io.sentry.UserFeedback;
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.User;
@@ -164,4 +166,13 @@ protected void onCreate(Bundle savedInstanceState) {
 
     setContentView(binding.getRoot());
   }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    final ISpan span = Sentry.getSpan();
+    if (span != null) {
+      span.finish(SpanStatus.OK);
+    }
+  }
 }
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt
index 102b23c99a..de9884a5e4 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/SecondActivity.kt
@@ -75,6 +75,11 @@ class SecondActivity : AppCompatActivity() {
                 Sentry.captureException(t)
 
                 showText(true, "error: ${t.message}")
+
+                // I opt out enableActivityLifecycleTracingAutoFinish so I know best when to end my transaction
+                // be sure to finish all your spans before this
+                val transaction = Sentry.getSpan()
+                transaction?.finish(SpanStatus.INTERNAL_ERROR)
             }
 
             override fun onResponse(call: Call<List<Repo>>, response: Response<List<Repo>>) {
@@ -83,6 +88,11 @@ class SecondActivity : AppCompatActivity() {
                 span.finish(SpanStatus.OK)
 
                 showText(text = "items: ${repos.size}")
+
+                // I opt out enableActivityLifecycleTracingAutoFinish so I know best when to end my transaction
+                // be sure to finish all your spans before this
+                val transaction = Sentry.getSpan()
+                transaction?.finish(SpanStatus.OK)
             }
         })
     }

From ad9abc1e7e0f427737102a5a2375e997b4c15446 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Wed, 23 Jun 2021 17:38:07 +0200
Subject: [PATCH 16/23] fix test

---
 .../sentry/android/core/ActivityLifecycleIntegrationTest.kt  | 5 +++--
 .../android/fragment/SentryFragmentLifecycleCallbacks.kt     | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
index 7e12b20e1e..6c05e6c13b 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.check
 import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.mock
@@ -41,7 +42,7 @@ class ActivityLifecycleIntegrationTest {
         fun getSut(apiVersion: Int = 29): ActivityLifecycleIntegration {
             whenever(hub.startTransaction(any<String>(), any())).thenReturn(transaction)
             whenever(hub.options).thenReturn(options)
-            whenever(hub.startTransaction(any(), any(), any<Date>(), any())).thenReturn(transaction)
+            whenever(hub.startTransaction(any(), any(), anyOrNull<Date>(), any())).thenReturn(transaction)
             whenever(buildInfo.sdkInfoVersion).thenReturn(apiVersion)
             return ActivityLifecycleIntegration(application, buildInfo)
         }
@@ -627,7 +628,7 @@ class ActivityLifecycleIntegrationTest {
         val newActivity = mock<Activity>()
         sut.onActivityPreCreated(newActivity, fixture.bundle)
 
-//        verify(fixture.hub).startTransaction(any<String>(), any())
+        verify(fixture.hub).startTransaction(any(), any(), any<Date>(), any())
     }
 
     private fun setAppStartTime(date: Date = Date(0)) {
diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index bc200b56e7..7f712c8bdb 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -78,7 +78,6 @@ class SentryFragmentLifecycleCallbacks(
     override fun onFragmentResumed(fragmentManager: FragmentManager, fragment: Fragment) {
         addBreadcrumb(fragment, "resumed")
 
-        // ideally it should be post resumed
         stopTracing(fragment)
     }
 

From ebae3ab40fb5bee5adeb96b8b9deded10efce506 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Thu, 24 Jun 2021 13:45:16 +0200
Subject: [PATCH 17/23] fix

---
 .../io/sentry/spring/tracing/SentryTracingFilterTest.kt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sentry-spring/src/test/kotlin/io/sentry/spring/tracing/SentryTracingFilterTest.kt b/sentry-spring/src/test/kotlin/io/sentry/spring/tracing/SentryTracingFilterTest.kt
index 6f93461798..d19d78b205 100644
--- a/sentry-spring/src/test/kotlin/io/sentry/spring/tracing/SentryTracingFilterTest.kt
+++ b/sentry-spring/src/test/kotlin/io/sentry/spring/tracing/SentryTracingFilterTest.kt
@@ -49,7 +49,7 @@ class SentryTracingFilterTest {
                 whenever(hub.startTransaction(any(), any<CustomSamplingContext>(), eq(true))).thenAnswer { SentryTracer(it.arguments[0] as TransactionContext, hub) }
             }
             response.status = status
-            whenever(hub.startTransaction(any(), any(), any(), eq(true))).thenAnswer { SentryTracer(TransactionContext(it.arguments[0] as String, it.arguments[1] as String), hub) }
+            whenever(hub.startTransaction(any(), any(), any<CustomSamplingContext>(), eq(true))).thenAnswer { SentryTracer(TransactionContext(it.arguments[0] as String, it.arguments[1] as String), hub) }
             whenever(hub.isEnabled).thenReturn(isEnabled)
             return SentryTracingFilter(hub, transactionNameProvider)
         }
@@ -63,7 +63,7 @@ class SentryTracingFilterTest {
 
         filter.doFilter(fixture.request, fixture.response, fixture.chain)
 
-        verify(fixture.hub).startTransaction(eq("POST /product/12"), eq("http.server"), check {
+        verify(fixture.hub).startTransaction(eq("POST /product/12"), eq("http.server"), check<CustomSamplingContext>() {
             assertNotNull(it["request"])
             assertTrue(it["request"] is HttpServletRequest)
         }, eq(true))

From 32cca7ed5ea74c9f420f6acf3fb8e9a4d9c8f09a Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Thu, 24 Jun 2021 16:19:06 +0200
Subject: [PATCH 18/23] tests

---
 .../fragment/FragmentLifecycleIntegration.kt  |  1 -
 .../SentryFragmentLifecycleCallbacks.kt       | 15 ++-
 .../FragmentLifecycleIntegrationTest.kt       | 45 +++++++--
 .../SentryFragmentLifecycleCallbacksTest.kt   | 97 ++++++++++++++++++-
 .../sentry/samples/android/MyApplication.java |  6 --
 5 files changed, 138 insertions(+), 26 deletions(-)

diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
index 8d5340ddc6..6c61279743 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/FragmentLifecycleIntegration.kt
@@ -47,7 +47,6 @@ class FragmentLifecycleIntegration(
                 SentryFragmentLifecycleCallbacks(
                     hub = hub,
                     enableFragmentLifecycleBreadcrumbs = enableFragmentLifecycleBreadcrumbs,
-                    performanceEnabled = options.isTracingEnabled,
                     enableAutoFragmentLifecycleTracing = enableAutoFragmentLifecycleTracing),
                 true
             )
diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index 7f712c8bdb..c234c75423 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -16,23 +16,20 @@ import io.sentry.SpanStatus
 @Suppress("TooManyFunctions")
 class SentryFragmentLifecycleCallbacks(
     private val hub: IHub = HubAdapter.getInstance(),
-    private val enableFragmentLifecycleBreadcrumbs: Boolean = true,
-    performanceEnabled: Boolean = false,
-    enableAutoFragmentLifecycleTracing: Boolean = false
+    val enableFragmentLifecycleBreadcrumbs: Boolean,
+    val enableAutoFragmentLifecycleTracing: Boolean
 ) : FragmentLifecycleCallbacks() {
 
     constructor(
-        enableFragmentLifecycleBreadcrumbs: Boolean,
-        performanceEnabled: Boolean,
-        enableAutoFragmentLifecycleTracing: Boolean
+        enableFragmentLifecycleBreadcrumbs: Boolean = true,
+        enableAutoFragmentLifecycleTracing: Boolean = false
     ) : this(
         hub = HubAdapter.getInstance(),
         enableFragmentLifecycleBreadcrumbs = enableFragmentLifecycleBreadcrumbs,
-        performanceEnabled = performanceEnabled,
         enableAutoFragmentLifecycleTracing = enableAutoFragmentLifecycleTracing
     )
 
-    private val isPerformanceEnabled = performanceEnabled && enableAutoFragmentLifecycleTracing
+    private val isPerformanceEnabled = hub.options.isTracingEnabled && enableAutoFragmentLifecycleTracing
 
     private val fragmentsWithOngoingTransactions = mutableMapOf<Fragment, ISpan>()
 
@@ -159,6 +156,6 @@ class SentryFragmentLifecycleCallbacks(
     }
 
     companion object {
-        private const val FRAGMENT_LOAD_OP = "fragment.load"
+        const val FRAGMENT_LOAD_OP = "fragment.load"
     }
 }
diff --git a/sentry-android-fragment/src/test/java/io/sentry/android/fragment/FragmentLifecycleIntegrationTest.kt b/sentry-android-fragment/src/test/java/io/sentry/android/fragment/FragmentLifecycleIntegrationTest.kt
index 23243651ba..a743a9a15e 100644
--- a/sentry-android-fragment/src/test/java/io/sentry/android/fragment/FragmentLifecycleIntegrationTest.kt
+++ b/sentry-android-fragment/src/test/java/io/sentry/android/fragment/FragmentLifecycleIntegrationTest.kt
@@ -9,16 +9,33 @@ import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import io.sentry.IHub
 import io.sentry.SentryOptions
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 import org.junit.Test
 
 class FragmentLifecycleIntegrationTest {
 
     private class Fixture {
         val application = mock<Application>()
-
-        fun getSut(): FragmentLifecycleIntegration {
-            return FragmentLifecycleIntegration(application)
+        val fragmentManager = mock<FragmentManager>()
+        val fragmentActivity = mock<FragmentActivity> {
+            on { supportFragmentManager } doReturn fragmentManager
+        }
+        val hub = mock<IHub>()
+        val options = SentryOptions()
+
+        fun getSut(
+            enableFragmentLifecycleBreadcrumbs: Boolean = true,
+            enableAutoFragmentLifecycleTracing: Boolean = false
+        ): FragmentLifecycleIntegration {
+            whenever(hub.options).thenReturn(options)
+            return FragmentLifecycleIntegration(
+                application = application,
+                enableFragmentLifecycleBreadcrumbs = enableFragmentLifecycleBreadcrumbs,
+                enableAutoFragmentLifecycleTracing = enableAutoFragmentLifecycleTracing)
         }
     }
 
@@ -28,7 +45,7 @@ class FragmentLifecycleIntegrationTest {
     fun `When register, it should register activity lifecycle callbacks`() {
         val sut = fixture.getSut()
 
-        sut.register(mock(), SentryOptions())
+        sut.register(fixture.hub, fixture.options)
 
         verify(fixture.application).registerActivityLifecycleCallbacks(sut)
     }
@@ -37,7 +54,7 @@ class FragmentLifecycleIntegrationTest {
     fun `When close, it should unregister lifecycle callbacks`() {
         val sut = fixture.getSut()
 
-        sut.register(mock(), SentryOptions())
+        sut.register(fixture.hub, fixture.options)
         sut.close()
 
         verify(fixture.application).unregisterActivityLifecycleCallbacks(sut)
@@ -51,7 +68,7 @@ class FragmentLifecycleIntegrationTest {
             on { supportFragmentManager } doReturn fragmentManager
         }
 
-        sut.register(mock(), SentryOptions())
+        sut.register(fixture.hub, fixture.options)
         sut.onActivityCreated(fragmentActivity, savedInstanceState = null)
 
         verify(fragmentManager).registerFragmentLifecycleCallbacks(check { fragmentCallbacks ->
@@ -59,12 +76,26 @@ class FragmentLifecycleIntegrationTest {
         }, eq(true))
     }
 
+    @Test
+    fun `When FragmentActivity is created, it should register fragment lifecycle callbacks with passed config`() {
+        val sut = fixture.getSut(enableFragmentLifecycleBreadcrumbs = false, enableAutoFragmentLifecycleTracing = true)
+
+        sut.register(fixture.hub, fixture.options)
+        sut.onActivityCreated(fixture.fragmentActivity, savedInstanceState = null)
+
+        verify(fixture.fragmentManager).registerFragmentLifecycleCallbacks(check { fragmentCallbacks ->
+            val callback = (fragmentCallbacks as SentryFragmentLifecycleCallbacks)
+            assertTrue(callback.enableAutoFragmentLifecycleTracing)
+            assertFalse(callback.enableFragmentLifecycleBreadcrumbs)
+        }, eq(true))
+    }
+
     @Test
     fun `When not a FragmentActivity is created, it should not crash`() {
         val sut = fixture.getSut()
         val activity = mock<Activity>()
 
-        sut.register(mock(), SentryOptions())
+        sut.register(fixture.hub, fixture.options)
         sut.onActivityCreated(activity, savedInstanceState = null)
     }
 
diff --git a/sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt b/sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt
index ec7f677157..6d0232757e 100644
--- a/sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt
+++ b/sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt
@@ -4,12 +4,21 @@ import android.content.Context
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.check
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
 import io.sentry.Breadcrumb
 import io.sentry.Hub
+import io.sentry.ISpan
+import io.sentry.ITransaction
+import io.sentry.Scope
+import io.sentry.ScopeCallback
 import io.sentry.SentryLevel.INFO
+import io.sentry.SentryOptions
+import io.sentry.SpanStatus
 import kotlin.test.assertEquals
 import org.junit.Test
 
@@ -20,9 +29,26 @@ class SentryFragmentLifecycleCallbacksTest {
         val hub = mock<Hub>()
         val fragment = mock<Fragment>()
         val context = mock<Context>()
-
-        fun getSut(): SentryFragmentLifecycleCallbacks {
-            return SentryFragmentLifecycleCallbacks(hub)
+        val scope = mock<Scope>()
+        val transaction = mock<ITransaction>()
+        val span = mock<ISpan>()
+
+        fun getSut(enableFragmentLifecycleBreadcrumbs: Boolean = true,
+                   enableAutoFragmentLifecycleTracing: Boolean = false,
+                   tracesSampleRate: Double? = 1.0): SentryFragmentLifecycleCallbacks {
+            whenever(hub.options).thenReturn(SentryOptions().apply {
+                setTracesSampleRate(tracesSampleRate)
+            })
+            whenever(transaction.startChild(any(), any())).thenReturn(span)
+            whenever(scope.transaction).thenReturn(transaction)
+            whenever(hub.configureScope(any())).thenAnswer {
+                (it.arguments[0] as ScopeCallback).run(scope)
+            }
+            return SentryFragmentLifecycleCallbacks(
+                hub = hub,
+                enableFragmentLifecycleBreadcrumbs = enableFragmentLifecycleBreadcrumbs,
+                enableAutoFragmentLifecycleTracing = enableAutoFragmentLifecycleTracing
+            )
         }
     }
 
@@ -37,6 +63,15 @@ class SentryFragmentLifecycleCallbacksTest {
         verifyBreadcrumbAdded("attached")
     }
 
+    @Test
+    fun `When fragment is attached with disabled breadcrumbs, it should not add breadcrumb`() {
+        val sut = fixture.getSut(enableFragmentLifecycleBreadcrumbs = false)
+
+        sut.onFragmentAttached(fixture.fragmentManager, fixture.fragment, fixture.context)
+
+        verify(fixture.hub, never()).addBreadcrumb(any<Breadcrumb>())
+    }
+
     @Test
     fun `When fragment saved instance state, it should add breadcrumb`() {
         val sut = fixture.getSut()
@@ -132,6 +167,62 @@ class SentryFragmentLifecycleCallbacksTest {
         verifyBreadcrumbAdded("detached")
     }
 
+    @Test
+    fun `When fragment is created, it should not start tracing if disabled`() {
+        val sut = fixture.getSut()
+
+        sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
+
+        verify(fixture.transaction, never()).startChild(any(), any())
+    }
+
+    @Test
+    fun `When fragment is created, it should start tracing if enabled`() {
+        val sut = fixture.getSut(enableAutoFragmentLifecycleTracing = true)
+
+        sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
+
+        verify(fixture.transaction).startChild(check {
+            assertEquals(SentryFragmentLifecycleCallbacks.FRAGMENT_LOAD_OP, it)
+        }, check {
+            assertEquals("Fragment", it)
+        })
+    }
+
+    @Test
+    fun `When tracing is already running, do not start again`() {
+        val sut = fixture.getSut(enableAutoFragmentLifecycleTracing = true)
+
+        sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
+        sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
+
+        verify(fixture.transaction).startChild(any(), any())
+    }
+
+    @Test
+    fun `When fragment is resumed, it should stop tracing if enabled`() {
+        val sut = fixture.getSut(enableAutoFragmentLifecycleTracing = true)
+
+        sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
+        sut.onFragmentResumed(fixture.fragmentManager, fixture.fragment)
+
+        verify(fixture.span).finish(check {
+            assertEquals(SpanStatus.OK, it)
+        })
+    }
+
+    @Test
+    fun `When fragment is destroyed, it should stop tracing if enabled`() {
+        val sut = fixture.getSut(enableAutoFragmentLifecycleTracing = true)
+
+        sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
+        sut.onFragmentDestroyed(fixture.fragmentManager, fixture.fragment)
+
+        verify(fixture.span).finish(check {
+            assertEquals(SpanStatus.OK, it)
+        })
+    }
+
     private fun verifyBreadcrumbAdded(expectedState: String) {
         verify(fixture.hub).addBreadcrumb(
             check { breadcrumb: Breadcrumb ->
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
index 8180b5b18f..db4130071f 100644
--- a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
+++ b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MyApplication.java
@@ -18,12 +18,6 @@ public void onCreate() {
     SentryAndroid.init(
         this,
         options -> {
-          //          options.setBeforeSend(
-          //              (event, hint) -> {
-          //                event.setTag("sample-key", "before-send");
-          //                return event;
-          //              });
-          //          options.setAnrTimeoutIntervalMillis(2000);
           options.addIntegration(new FragmentLifecycleIntegration(MyApplication.this, true, true));
         });
   }

From 156c1e60aafb3aa86f33d0a1859ca7bcb1c86e32 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Thu, 24 Jun 2021 16:23:27 +0200
Subject: [PATCH 19/23] check

---
 .../api/sentry-android-fragment.api           | 11 ++++++----
 .../SentryFragmentLifecycleCallbacksTest.kt   | 21 ++++++++++++++++---
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/sentry-android-fragment/api/sentry-android-fragment.api b/sentry-android-fragment/api/sentry-android-fragment.api
index bef59856e7..5e7673c1b3 100644
--- a/sentry-android-fragment/api/sentry-android-fragment.api
+++ b/sentry-android-fragment/api/sentry-android-fragment.api
@@ -22,10 +22,13 @@ public final class io/sentry/android/fragment/FragmentLifecycleIntegration : and
 
 public final class io/sentry/android/fragment/SentryFragmentLifecycleCallbacks : androidx/fragment/app/FragmentManager$FragmentLifecycleCallbacks {
 	public static final field Companion Lio/sentry/android/fragment/SentryFragmentLifecycleCallbacks$Companion;
-	public fun <init> ()V
-	public fun <init> (Lio/sentry/IHub;ZZZ)V
-	public synthetic fun <init> (Lio/sentry/IHub;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun <init> (ZZZ)V
+	public static final field FRAGMENT_LOAD_OP Ljava/lang/String;
+	public fun <init> (Lio/sentry/IHub;ZZ)V
+	public synthetic fun <init> (Lio/sentry/IHub;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (ZZ)V
+	public synthetic fun <init> (ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getEnableAutoFragmentLifecycleTracing ()Z
+	public final fun getEnableFragmentLifecycleBreadcrumbs ()Z
 	public fun onFragmentAttached (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;Landroid/content/Context;)V
 	public fun onFragmentCreated (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;Landroid/os/Bundle;)V
 	public fun onFragmentDestroyed (Landroidx/fragment/app/FragmentManager;Landroidx/fragment/app/Fragment;)V
diff --git a/sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt b/sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt
index 6d0232757e..633ce75ebd 100644
--- a/sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt
+++ b/sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt
@@ -33,9 +33,11 @@ class SentryFragmentLifecycleCallbacksTest {
         val transaction = mock<ITransaction>()
         val span = mock<ISpan>()
 
-        fun getSut(enableFragmentLifecycleBreadcrumbs: Boolean = true,
-                   enableAutoFragmentLifecycleTracing: Boolean = false,
-                   tracesSampleRate: Double? = 1.0): SentryFragmentLifecycleCallbacks {
+        fun getSut(
+            enableFragmentLifecycleBreadcrumbs: Boolean = true,
+            enableAutoFragmentLifecycleTracing: Boolean = false,
+            tracesSampleRate: Double? = 1.0
+        ): SentryFragmentLifecycleCallbacks {
             whenever(hub.options).thenReturn(SentryOptions().apply {
                 setTracesSampleRate(tracesSampleRate)
             })
@@ -211,6 +213,19 @@ class SentryFragmentLifecycleCallbacksTest {
         })
     }
 
+    @Test
+    fun `When fragment is resumed, it should stop tracing if enabled but keep status`() {
+        val sut = fixture.getSut(enableAutoFragmentLifecycleTracing = true)
+
+        whenever(fixture.span.status).thenReturn(SpanStatus.ABORTED)
+        sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
+        sut.onFragmentResumed(fixture.fragmentManager, fixture.fragment)
+
+        verify(fixture.span).finish(check {
+            assertEquals(SpanStatus.ABORTED, it)
+        })
+    }
+
     @Test
     fun `When fragment is destroyed, it should stop tracing if enabled`() {
         val sut = fixture.getSut(enableAutoFragmentLifecycleTracing = true)

From 6b7429a15966fb28dabef083b35da383e406805d Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Thu, 24 Jun 2021 16:27:18 +0200
Subject: [PATCH 20/23] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7cbb61577..5393ce0aa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Feat: Support transaction waiting for children to finish. (#1535) 
 * Feat: Capture logged marker in log4j2 and logback appenders (#1551)
 * Feat: Set mechanism type in SentryExceptionResolver (#1556)
+* Feat: Perf. for fragments (#1528)
 
 ## 5.1.0-beta.1
 

From 7e062b71bdbfcdfe8b54e6b1223fd4128299fbdb Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Fri, 25 Jun 2021 10:30:32 +0200
Subject: [PATCH 21/23] review

---
 .../android/fragment/SentryFragmentLifecycleCallbacks.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index c234c75423..c7e6622412 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -12,6 +12,7 @@ import io.sentry.IHub
 import io.sentry.ISpan
 import io.sentry.SentryLevel.INFO
 import io.sentry.SpanStatus
+import java.util.WeakHashMap
 
 @Suppress("TooManyFunctions")
 class SentryFragmentLifecycleCallbacks(
@@ -29,9 +30,9 @@ class SentryFragmentLifecycleCallbacks(
         enableAutoFragmentLifecycleTracing = enableAutoFragmentLifecycleTracing
     )
 
-    private val isPerformanceEnabled = hub.options.isTracingEnabled && enableAutoFragmentLifecycleTracing
+    private val isPerformanceEnabled get() = hub.options.isTracingEnabled && enableAutoFragmentLifecycleTracing
 
-    private val fragmentsWithOngoingTransactions = mutableMapOf<Fragment, ISpan>()
+    private val fragmentsWithOngoingTransactions = WeakHashMap<Fragment, ISpan>()
 
     override fun onFragmentAttached(
         fragmentManager: FragmentManager,

From c064ab7abf96358582c1611f6bc1b673253cd5d2 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Fri, 25 Jun 2021 13:26:36 +0200
Subject: [PATCH 22/23] rename span op

---
 .../sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
index c7e6622412..1218a6dc61 100644
--- a/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
+++ b/sentry-android-fragment/src/main/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacks.kt
@@ -157,6 +157,6 @@ class SentryFragmentLifecycleCallbacks(
     }
 
     companion object {
-        const val FRAGMENT_LOAD_OP = "fragment.load"
+        const val FRAGMENT_LOAD_OP = "ui.fragment.load"
     }
 }

From d74594091ce27ab8f0eba1fcf5ecb2b4e9916588 Mon Sep 17 00:00:00 2001
From: Manoel Aranda Neto <marandaneto@gmail.com>
Date: Mon, 28 Jun 2021 10:24:39 +0200
Subject: [PATCH 23/23] fix tests

---
 .../core/ActivityLifecycleIntegrationTest.kt  | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
index 6c05e6c13b..e7acfd67a2 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
@@ -40,7 +40,6 @@ class ActivityLifecycleIntegrationTest {
         val buildInfo = mock<IBuildInfoProvider>()
 
         fun getSut(apiVersion: Int = 29): ActivityLifecycleIntegration {
-            whenever(hub.startTransaction(any<String>(), any())).thenReturn(transaction)
             whenever(hub.options).thenReturn(options)
             whenever(hub.startTransaction(any(), any(), anyOrNull<Date>(), any())).thenReturn(transaction)
             whenever(buildInfo.sdkInfoVersion).thenReturn(apiVersion)
@@ -219,8 +218,7 @@ class ActivityLifecycleIntegrationTest {
         val activity = mock<Activity>()
         sut.onActivityPreCreated(activity, fixture.bundle)
 
-        verify(fixture.hub, never()).startTransaction(any<String>(), any())
-        verify(fixture.hub, never()).startTransaction(any(), any(), any<Date>(), any())
+        verify(fixture.hub, never()).startTransaction(any(), any(), anyOrNull<Date>(), any())
     }
 
     @Test
@@ -233,9 +231,7 @@ class ActivityLifecycleIntegrationTest {
         sut.onActivityPreCreated(activity, fixture.bundle)
         sut.onActivityPreCreated(activity, fixture.bundle)
 
-        // call only once
-//        verify(fixture.hub).startTransaction(any<String>(), any())
-        verify(fixture.hub, never()).startTransaction(any(), any(), any<Date>(), any())
+        verify(fixture.hub).startTransaction(any(), any(), anyOrNull<Date>(), any())
     }
 
     @Test
@@ -251,7 +247,7 @@ class ActivityLifecycleIntegrationTest {
 
         verify(fixture.hub).startTransaction(any(), check {
             assertEquals("ui.load", it)
-        }, any<Date>(), any())
+        }, anyOrNull<Date>(), any())
     }
 
     @Test
@@ -267,7 +263,7 @@ class ActivityLifecycleIntegrationTest {
 
         verify(fixture.hub).startTransaction(check {
             assertEquals("Activity", it)
-        }, any(), any<Date>(), any())
+        }, any(), anyOrNull<Date>(), any())
     }
 
     @Test
@@ -427,8 +423,7 @@ class ActivityLifecycleIntegrationTest {
         val activity = mock<Activity>()
         sut.onActivityCreated(activity, mock())
 
-        verify(fixture.hub, never()).startTransaction(any<String>(), any())
-        verify(fixture.hub, never()).startTransaction(any(), any(), any<Date>(), any())
+        verify(fixture.hub, never()).startTransaction(any(), any(), anyOrNull<Date>(), any())
     }
 
     @Test
@@ -455,7 +450,7 @@ class ActivityLifecycleIntegrationTest {
         val activity = mock<Activity>()
         sut.onActivityCreated(activity, mock())
 
-        verify(fixture.hub).startTransaction(any(), any(), any<Date>(), any())
+        verify(fixture.hub).startTransaction(any(), any(), anyOrNull<Date>(), any())
     }
 
     @Test
@@ -616,19 +611,21 @@ class ActivityLifecycleIntegrationTest {
         fixture.options.tracesSampleRate = 1.0
         sut.register(fixture.hub, fixture.options)
 
+        val date = Date(0)
         setAppStartTime()
 
         val activity = mock<Activity>()
         sut.onActivityPreCreated(activity, fixture.bundle)
 
-        verify(fixture.hub).startTransaction(any(), any(), any<Date>(), any())
+        verify(fixture.hub).startTransaction(any(), any(), eq(date), any())
         sut.onActivityCreated(activity, fixture.bundle)
         sut.onActivityPostResumed(activity)
 
         val newActivity = mock<Activity>()
         sut.onActivityPreCreated(newActivity, fixture.bundle)
 
-        verify(fixture.hub).startTransaction(any(), any(), any<Date>(), any())
+        val nullDate: Date? = null
+        verify(fixture.hub).startTransaction(any(), any(), eq(nullDate), any())
     }
 
     private fun setAppStartTime(date: Date = Date(0)) {