Merge pull request #2621 from DataDog/nogorodnikov/rum-9720/remove-force-new-batch-api

RUM-9720: Remove `forceNewBatch` API

Author: 0xnm

dd-sdk-android-core/api/apiSurface

@@ -108,7 +108,7 @@ interface com.datadog.android.api.feature.FeatureEventReceiver
   fun onReceive(Any)
 interface com.datadog.android.api.feature.FeatureScope
   val dataStore: com.datadog.android.api.storage.datastore.DataStoreHandler
-  fun withWriteContext(Boolean = false, (com.datadog.android.api.context.DatadogContext, com.datadog.android.api.storage.EventBatchWriter) -> Unit)
+  fun withWriteContext((com.datadog.android.api.context.DatadogContext, com.datadog.android.api.storage.EventBatchWriter) -> Unit)
   fun sendEvent(Any)
   fun <T: Feature> unwrap(): T
 fun <R: Any?> com.datadog.android.api.InternalLogger.measureMethodCallPerf(Class<*>, String, Float = 100f, () -> R): R

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

@@ -344,11 +344,7 @@ public abstract interface class com/datadog/android/api/feature/FeatureScope {
 	public abstract fun getDataStore ()Lcom/datadog/android/api/storage/datastore/DataStoreHandler;
 	public abstract fun sendEvent (Ljava/lang/Object;)V
 	public abstract fun unwrap ()Lcom/datadog/android/api/feature/Feature;
-	public abstract fun withWriteContext (ZLkotlin/jvm/functions/Function2;)V
-}
-
-public final class com/datadog/android/api/feature/FeatureScope$DefaultImpls {
-	public static synthetic fun withWriteContext$default (Lcom/datadog/android/api/feature/FeatureScope;ZLkotlin/jvm/functions/Function2;ILjava/lang/Object;)V
+	public abstract fun withWriteContext (Lkotlin/jvm/functions/Function2;)V
 }
 
 public final class com/datadog/android/api/feature/FeatureScopeExtKt {

dd-sdk-android-core/src/main/kotlin/com/datadog/android/api/feature/FeatureScope.kt

@@ -23,16 +23,13 @@ interface FeatureScope {
 
     /**
      * Utility to write an event, asynchronously.
-     * @param forceNewBatch if `true` forces the [EventBatchWriter] to write in a new file and
-     * not reuse the already existing pending data persistence file. By default it is `false`.
      * @param callback an operation called with an up-to-date [DatadogContext]
      * and an [EventBatchWriter]. Callback will be executed on a worker thread from I/O pool.
      * [DatadogContext] will have a state created at the moment this method is called, before the
      * thread switch for the callback invocation.
      */
     @AnyThread
     fun withWriteContext(
-        forceNewBatch: Boolean = false,
         callback: (DatadogContext, EventBatchWriter) -> Unit
     )
 

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

@@ -169,7 +169,6 @@ internal class SdkFeature(
     // region FeatureScope
 
     override fun withWriteContext(
-        forceNewBatch: Boolean,
         callback: (DatadogContext, EventBatchWriter) -> Unit
     ) {
         // TODO RUM-1462 thread safety. Thread switch happens in Storage right now. Open questions:
@@ -179,7 +178,7 @@ internal class SdkFeature(
         val contextProvider = coreFeature.contextProvider
         if (contextProvider is NoOpContextProvider) return
         val context = contextProvider.context
-        storage.writeCurrentBatch(context, forceNewBatch) { callback(context, it) }
+        storage.writeCurrentBatch(context) { callback(context, it) }
     }
 
     override fun sendEvent(event: Any) {

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

@@ -8,6 +8,5 @@ package com.datadog.android.core.internal.metrics
 
 internal data class BatchClosedMetadata(
     internal val lastTimeWasUsedInMs: Long,
-    internal val forcedNew: Boolean,
     internal val eventsCount: Long
 )

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

@@ -136,7 +136,6 @@ internal class BatchMetricsDispatcher(
             // be sent as a batch_delete telemetry later
             BATCH_SIZE_KEY to file.lengthSafe(internalLogger),
             BATCH_EVENTS_COUNT_KEY to batchMetadata.eventsCount,
-            FORCE_NEW_KEY to batchMetadata.forcedNew,
             TRACKING_CONSENT_KEY to file.resolveFileOriginAsConsent(),
             FILE_NAME to file.name,
             THREAD_NAME to Thread.currentThread().name
@@ -246,9 +245,6 @@ internal class BatchMetricsDispatcher(
         /* The duration from batch creation to batch closing (in ms).*/
         internal const val BATCH_DURATION_KEY = "batch_duration"
 
-        /* If the batch was closed by core or after new batch was forced by the feature.*/
-        internal const val FORCE_NEW_KEY = "forced_new"
-
         internal const val BATCH_CLOSED_MESSAGE = "[Mobile Metric] Batch Closed"
 
         /* The value for the type of the metric.*/

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

@@ -61,7 +61,6 @@ internal class AbstractStorage(
     @AnyThread
     override fun writeCurrentBatch(
         datadogContext: DatadogContext,
-        forceNewBatch: Boolean,
         callback: (EventBatchWriter) -> Unit
     ) {
         executorService.executeSafe("Data write", internalLogger) {

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

@@ -55,7 +55,6 @@ internal class ConsentAwareStorage(
     @WorkerThread
     override fun writeCurrentBatch(
         datadogContext: DatadogContext,
-        forceNewBatch: Boolean,
         callback: (EventBatchWriter) -> Unit
     ) {
         executorService.executeSafe("Data write", internalLogger) {
@@ -68,7 +67,6 @@ internal class ConsentAwareStorage(
             synchronized(writeLock) {
                 val writer = FileEventBatchWriter(
                     fileOrchestrator = orchestrator,
-                    forceNewBatch = forceNewBatch,
                     eventsWriter = batchEventsReaderWriter,
                     metadataReaderWriter = batchMetadataReaderWriter,
                     filePersistenceConfig = filePersistenceConfig,

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

@@ -21,7 +21,6 @@ import java.util.Locale
 
 internal class FileEventBatchWriter(
     private val fileOrchestrator: FileOrchestrator,
-    private val forceNewBatch: Boolean,
     private val eventsWriter: FileWriter<RawBatchEvent>,
     private val metadataReaderWriter: FileReaderWriter,
     private val filePersistenceConfig: FilePersistenceConfig,
@@ -32,7 +31,7 @@ internal class FileEventBatchWriter(
     @get:WorkerThread
     private val batchFile: File? by lazy {
         @Suppress("ThreadSafety") // called in the worker context
-        fileOrchestrator.getWritableFile(forceNewFile = forceNewBatch)
+        fileOrchestrator.getWritableFile()
     }
 
     @get:WorkerThread

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

@@ -22,15 +22,12 @@ internal interface Storage {
     /**
      * Utility to write data, asynchronously.
      * @param datadogContext the context for the write operation
-     * @param forceNewBatch if `true` will force the writer to start a new batch before storing the
-     * data. By default this flag is `false`.
      * @param callback an operation to perform with a [EventBatchWriter] that will target the current
      * writeable Batch
      */
     @AnyThread
     fun writeCurrentBatch(
         datadogContext: DatadogContext,
-        forceNewBatch: Boolean,
         callback: (EventBatchWriter) -> Unit
     )