Merge pull request #2675 from DataDog/xgouchet/RUM-9501/remove_error_logs

RUM-9501 Don't send fatal errors to Logs, only send them to RUM

Author: xgouchet

dd-sdk-android-core/api/apiSurface

@@ -253,8 +253,6 @@ sealed class com.datadog.android.core.feature.event.JvmCrash
   abstract val throwable: Throwable
   abstract val message: String
   abstract val threads: List<ThreadDump>
-  data class Logs : JvmCrash
-    constructor(String, Throwable, Long, String, String, List<ThreadDump>)
   data class Rum : JvmCrash
     constructor(Throwable, String, List<ThreadDump>)
 data class com.datadog.android.core.feature.event.ThreadDump

dd-sdk-android-core/api/dd-sdk-android-core.api

@@ -673,27 +673,6 @@ public abstract class com/datadog/android/core/feature/event/JvmCrash {
 	public abstract fun getThrowable ()Ljava/lang/Throwable;
 }
 
-public final class com/datadog/android/core/feature/event/JvmCrash$Logs : com/datadog/android/core/feature/event/JvmCrash {
-	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;JLjava/lang/String;Ljava/lang/String;Ljava/util/List;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/Throwable;
-	public final fun component3 ()J
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Ljava/lang/String;
-	public final fun component6 ()Ljava/util/List;
-	public final fun copy (Ljava/lang/String;Ljava/lang/Throwable;JLjava/lang/String;Ljava/lang/String;Ljava/util/List;)Lcom/datadog/android/core/feature/event/JvmCrash$Logs;
-	public static synthetic fun copy$default (Lcom/datadog/android/core/feature/event/JvmCrash$Logs;Ljava/lang/String;Ljava/lang/Throwable;JLjava/lang/String;Ljava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/datadog/android/core/feature/event/JvmCrash$Logs;
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getLoggerName ()Ljava/lang/String;
-	public fun getMessage ()Ljava/lang/String;
-	public final fun getThreadName ()Ljava/lang/String;
-	public fun getThreads ()Ljava/util/List;
-	public fun getThrowable ()Ljava/lang/Throwable;
-	public final fun getTimestamp ()J
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class com/datadog/android/core/feature/event/JvmCrash$Rum : com/datadog/android/core/feature/event/JvmCrash {
 	public fun <init> (Ljava/lang/Throwable;Ljava/lang/String;Ljava/util/List;)V
 	public final fun component1 ()Ljava/lang/Throwable;

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/feature/event/JvmCrash.kt

@@ -16,15 +16,6 @@ sealed class JvmCrash {
     abstract val message: String
     abstract val threads: List<ThreadDump>
 
-    data class Logs(
-        val threadName: String,
-        override val throwable: Throwable,
-        val timestamp: Long,
-        override val message: String,
-        val loggerName: String,
-        override val threads: List<ThreadDump>
-    ) : JvmCrash()
-
     data class Rum(
         override val throwable: Throwable,
         override val message: String,

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/CoreFeature.kt

@@ -32,15 +32,11 @@ import com.datadog.android.core.internal.data.upload.RotatingDnsResolver
 import com.datadog.android.core.internal.net.DefaultFirstPartyHostHeaderTypeResolver
 import com.datadog.android.core.internal.net.info.BroadcastReceiverNetworkInfoProvider
 import com.datadog.android.core.internal.net.info.CallbackNetworkInfoProvider
-import com.datadog.android.core.internal.net.info.NetworkInfoDeserializer
 import com.datadog.android.core.internal.net.info.NetworkInfoProvider
 import com.datadog.android.core.internal.net.info.NoOpNetworkInfoProvider
 import com.datadog.android.core.internal.persistence.JsonObjectDeserializer
-import com.datadog.android.core.internal.persistence.file.FileMover
 import com.datadog.android.core.internal.persistence.file.FilePersistenceConfig
-import com.datadog.android.core.internal.persistence.file.FileReaderWriter
 import com.datadog.android.core.internal.persistence.file.FileWriter
-import com.datadog.android.core.internal.persistence.file.advanced.ScheduledWriter
 import com.datadog.android.core.internal.persistence.file.batch.BatchFileReaderWriter
 import com.datadog.android.core.internal.persistence.file.deleteSafe
 import com.datadog.android.core.internal.persistence.file.existsSafe
@@ -70,16 +66,13 @@ import com.datadog.android.core.internal.time.TimeProvider
 import com.datadog.android.core.internal.user.DatadogUserInfoProvider
 import com.datadog.android.core.internal.user.MutableUserInfoProvider
 import com.datadog.android.core.internal.user.NoOpMutableUserInfoProvider
-import com.datadog.android.core.internal.user.UserInfoDeserializer
 import com.datadog.android.core.internal.utils.executeSafe
 import com.datadog.android.core.internal.utils.unboundInternalLogger
 import com.datadog.android.core.persistence.PersistenceStrategy
 import com.datadog.android.core.thread.FlushableExecutorService
 import com.datadog.android.ndk.internal.DatadogNdkCrashHandler
 import com.datadog.android.ndk.internal.NdkCrashHandler
 import com.datadog.android.ndk.internal.NdkCrashLogDeserializer
-import com.datadog.android.ndk.internal.NdkNetworkInfoDataWriter
-import com.datadog.android.ndk.internal.NdkUserInfoDataWriter
 import com.datadog.android.ndk.internal.NoOpNdkCrashHandler
 import com.datadog.android.privacy.TrackingConsent
 import com.datadog.android.security.Encryption
@@ -377,10 +370,7 @@ internal class CoreFeature(
                 storageDir,
                 persistenceExecutorService,
                 NdkCrashLogDeserializer(internalLogger),
-                NetworkInfoDeserializer(internalLogger),
-                UserInfoDeserializer(internalLogger),
                 internalLogger,
-                envFileReader = FileReaderWriter.create(internalLogger, localDataEncryption),
                 lastRumViewEventProvider = { lastViewEvent },
                 nativeCrashSourceType = nativeSourceType ?: "ndk"
             )
@@ -524,44 +514,14 @@ internal class CoreFeature(
         setupNetworkInfoProviders(appContext)
 
         // User Info Provider
-        setupUserInfoProvider()
-    }
-
-    private fun setupUserInfoProvider() {
-        val userInfoWriter = ScheduledWriter(
-            NdkUserInfoDataWriter(
-                storageDir,
-                trackingConsentProvider,
-                persistenceExecutorService,
-                FileReaderWriter.create(internalLogger, localDataEncryption),
-                FileMover(internalLogger),
-                internalLogger,
-                buildFilePersistenceConfig()
-            ),
-            persistenceExecutorService,
-            internalLogger
-        )
-        userInfoProvider = DatadogUserInfoProvider(userInfoWriter)
+        userInfoProvider = DatadogUserInfoProvider()
     }
 
     private fun setupNetworkInfoProviders(appContext: Context) {
-        val networkInfoWriter = ScheduledWriter(
-            NdkNetworkInfoDataWriter(
-                storageDir,
-                trackingConsentProvider,
-                persistenceExecutorService,
-                FileReaderWriter.create(internalLogger, localDataEncryption),
-                FileMover(internalLogger),
-                internalLogger,
-                buildFilePersistenceConfig()
-            ),
-            persistenceExecutorService,
-            internalLogger
-        )
         networkInfoProvider = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            CallbackNetworkInfoProvider(networkInfoWriter, internalLogger = internalLogger)
+            CallbackNetworkInfoProvider(internalLogger = internalLogger)
         } else {
-            BroadcastReceiverNetworkInfoProvider(networkInfoWriter)
+            BroadcastReceiverNetworkInfoProvider()
         }
         networkInfoProvider.register(appContext)
     }

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/DatadogCore.kt

@@ -39,7 +39,6 @@ import com.datadog.android.core.internal.utils.scheduleSafe
 import com.datadog.android.core.thread.FlushableExecutorService
 import com.datadog.android.error.internal.CrashReportsFeature
 import com.datadog.android.internal.telemetry.InternalTelemetryEvent
-import com.datadog.android.ndk.internal.NdkCrashHandler
 import com.datadog.android.privacy.TrackingConsent
 import com.google.gson.JsonObject
 import java.io.File
@@ -135,16 +134,8 @@ internal class DatadogCore(
         features[feature.name] = sdkFeature
         sdkFeature.initialize(context, instanceId)
 
-        when (feature.name) {
-            Feature.LOGS_FEATURE_NAME -> {
-                coreFeature.ndkCrashHandler
-                    .handleNdkCrash(this, NdkCrashHandler.ReportTarget.LOGS)
-            }
-
-            Feature.RUM_FEATURE_NAME -> {
-                coreFeature.ndkCrashHandler
-                    .handleNdkCrash(this, NdkCrashHandler.ReportTarget.RUM)
-            }
+        if (feature.name == Feature.RUM_FEATURE_NAME) {
+            coreFeature.ndkCrashHandler.handleNdkCrash(this)
         }
     }
 

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/net/info/BroadcastReceiverNetworkInfoProvider.kt

@@ -16,26 +16,19 @@ import android.net.ConnectivityManager
 import android.os.Build
 import android.telephony.TelephonyManager
 import com.datadog.android.api.context.NetworkInfo
-import com.datadog.android.core.internal.persistence.DataWriter
 import com.datadog.android.core.internal.receiver.ThreadSafeReceiver
 import com.datadog.android.core.internal.system.BuildSdkVersionProvider
 import android.net.NetworkInfo as AndroidNetworkInfo
 
 @Suppress("DEPRECATION")
 @SuppressLint("InlinedApi")
 internal class BroadcastReceiverNetworkInfoProvider(
-    private val dataWriter: DataWriter<NetworkInfo>,
     private val buildSdkVersionProvider: BuildSdkVersionProvider = BuildSdkVersionProvider.DEFAULT
 ) :
     ThreadSafeReceiver(),
     NetworkInfoProvider {
 
     private var networkInfo: NetworkInfo = NetworkInfo()
-        set(value) {
-            field = value
-            @Suppress("ThreadSafety") // TODO RUM-3756 delegate to another thread
-            dataWriter.write(field)
-        }
 
     // region BroadcastReceiver
 

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/net/info/CallbackNetworkInfoProvider.kt

@@ -15,24 +15,17 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import com.datadog.android.api.InternalLogger
 import com.datadog.android.api.context.NetworkInfo
-import com.datadog.android.core.internal.persistence.DataWriter
 import com.datadog.android.core.internal.system.BuildSdkVersionProvider
 
 @RequiresApi(Build.VERSION_CODES.N)
 internal class CallbackNetworkInfoProvider(
-    private val dataWriter: DataWriter<NetworkInfo>,
     private val buildSdkVersionProvider: BuildSdkVersionProvider = BuildSdkVersionProvider.DEFAULT,
     private val internalLogger: InternalLogger
 ) :
     ConnectivityManager.NetworkCallback(),
     NetworkInfoProvider {
 
     private var lastNetworkInfo: NetworkInfo = NetworkInfo()
-        set(value) {
-            field = value
-            @Suppress("ThreadSafety") // TODO RUM-3756 delegate to another thread
-            dataWriter.write(field)
-        }
 
     // region NetworkCallback
 

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/net/info/NetworkInfoDeserializer.kt

@@ -7,18 +7,10 @@
 package com.datadog.android.core.internal.user
 
 import com.datadog.android.api.context.UserInfo
-import com.datadog.android.core.internal.persistence.DataWriter
 
-internal class DatadogUserInfoProvider(
-    internal val dataWriter: DataWriter<UserInfo>
-) : MutableUserInfoProvider {
+internal class DatadogUserInfoProvider : MutableUserInfoProvider {
 
     private var internalUserInfo = UserInfo()
-        set(value) {
-            field = value
-            @Suppress("ThreadSafety") // TODO RUM-3756 delegate to another thread
-            dataWriter.write(field)
-        }
 
     override fun setUserInfo(id: String, name: String?, email: String?, extraInfo: Map<String, Any?>) {
         internalUserInfo = internalUserInfo.copy(