RUM-6171: Cleanup

Author: kikoveiga

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestrator.kt

@@ -26,6 +26,7 @@ import com.datadog.android.core.internal.persistence.file.listFilesSafe
 import com.datadog.android.core.internal.persistence.file.mkdirsSafe
 import java.io.File
 import java.util.Locale
+import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicLong
 import kotlin.math.roundToLong
@@ -51,8 +52,8 @@ internal class BatchFileOrchestrator(
     private var previousFile: File? = null
     private var previousFileItemCount: Long = 0
     private var lastFileAccessTimestamp: Long = 0L
-    private val lastCleanupTimestamp: AtomicLong = AtomicLong(0L)
-    private var isFileObserverStarted: Boolean = false
+    private val lastCleanupTimestamp = AtomicLong(0L)
+    private var isFileObserverStarted = AtomicBoolean(false)
 
     private val knownFiles: MutableSet<File> = mutableSetOf()
 
@@ -196,9 +197,7 @@ internal class BatchFileOrchestrator(
 
                 else -> true
             }
-        } else {
-            createRootDirectory()
-        }
+        } else createRootDirectory()
 
         if (isValid) startFileObserverIfNotStarted()
         return isValid
@@ -218,14 +217,13 @@ internal class BatchFileOrchestrator(
 
     @Synchronized
     private fun startFileObserverIfNotStarted() {
-        if (!isFileObserverStarted) {
+        if (isFileObserverStarted.compareAndSet(false, true)) {
+            fileObserver.startWatching()
             synchronized(knownFiles) {
                 rootDir.listFilesSafe(internalLogger)
                     ?.filter { it.name.isBatchFileName }
                     ?.let { knownFiles.addAll(it) }
             }
-            fileObserver.startWatching()
-            isFileObserverStarted = true
         }
     }
 

dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/persistence/file/batch/BatchFileOrchestratorTest.kt

@@ -335,7 +335,6 @@ internal class BatchFileOrchestratorTest {
         val start = System.currentTimeMillis()
         val result = testedOrchestrator.getWritableFile()
         val end = System.currentTimeMillis()
-        // Wait for both cleanup threshold AND recent delay so a new file will be created
         Thread.sleep(maxOf(CLEANUP_FREQUENCY_THRESHOLD_MS, RECENT_DELAY_MS) + 1)
         val evenOlderFile = File(fakeRootDir, (oldTimestamp - 1).toString())
         evenOlderFile.createNewFile()