RUM-9899: Merge v3

Author: satween

sample/kotlin/src/main/kotlin/com/datadog/android/sample/account/AccountFragment.kt

@@ -15,7 +15,6 @@ import androidx.fragment.app.Fragment
 import com.datadog.android.Datadog
 import com.datadog.android.sample.Preferences
 import com.datadog.android.sample.R
-import com.datadog.android.trace.logMessage
 import com.datadog.android.trace.withinSpan
 import com.google.android.material.snackbar.Snackbar
 

sample/kotlin/src/main/kotlin/com/datadog/android/sample/traces/TracesViewModel.kt

@@ -20,10 +20,6 @@ import com.datadog.android.trace.coroutines.asyncTraced
 import com.datadog.android.trace.coroutines.awaitTraced
 import com.datadog.android.trace.coroutines.launchTraced
 import com.datadog.android.trace.coroutines.withContextTraced
-import com.datadog.android.trace.logAttributes
-import com.datadog.android.trace.logErrorMessage
-import com.datadog.android.trace.logMessage
-import com.datadog.android.trace.logThrowable
 import com.datadog.android.trace.withinSpan
 import com.datadog.android.vendor.sample.LocalServer
 import com.launchdarkly.eventsource.EventHandler

sample/kotlin/src/main/kotlin/com/datadog/android/sample/user/UserFragment.kt

@@ -15,7 +15,6 @@ import androidx.fragment.app.Fragment
 import com.datadog.android.Datadog
 import com.datadog.android.sample.Preferences
 import com.datadog.android.sample.R
-import com.datadog.android.trace.logMessage
 import com.datadog.android.trace.withinSpan
 import com.google.android.material.snackbar.Snackbar
 
@@ -93,7 +92,7 @@ internal class UserFragment : Fragment(), View.OnClickListener {
                     emailField.text.clear()
                     userGenderField.text.clear()
                     userAgeField.text.clear()
-                    log("Cleared user info")
+                    logMessage("Cleared user info")
                 }
                 Snackbar.make(view ?: v.rootView, "User info cleared", Snackbar.LENGTH_SHORT).show()
             }