RUM-16305: PR fixes

Author: aleksandr-gringauz

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

@@ -23,7 +23,7 @@ internal data class FilePersistenceConfig(
         internal const val MAX_ITEMS_PER_BATCH: Int = 1000
         internal const val MAX_ITEM_SIZE: Long = 1024L * 1024 // 1 MB
         internal const val OLD_FILE_THRESHOLD: Long = 18L * 60L * 60L * 1000L // 18 hours
-        internal const val MAX_DISK_SPACE: Long = 128 * MAX_BATCH_SIZE // 640 MB
+        internal const val MAX_DISK_SPACE: Long = 512L * 1024 * 1024 // 512 MB
         internal const val MAX_DELAY_BETWEEN_MESSAGES_MS = 5000L
         internal const val CLEANUP_FREQUENCY_THRESHOLD_MS = 5000L // 5s
     }

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

@@ -237,7 +237,7 @@ internal class BatchFileOrchestrator(
         }
 
         val isRecentEnough = isFileRecent(lastFile, recentWriteDelayMs)
-        val hasRoomForMore = lastFile.lengthSafe(internalLogger) < config.maxBatchSize
+        val hasRoomForMore = lastFile.lengthSafe(internalLogger) < config.maxBatchSize - config.maxItemSize
         val hasSlotForMore = (lastKnownFileItemCount < config.maxItemsPerBatch)
 
         return if (isRecentEnough && hasRoomForMore && hasSlotForMore) {

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

@@ -522,6 +522,37 @@ internal class BatchFileOrchestratorTest {
         verifyNoMoreInteractions(mockMetricsDispatcher)
     }
 
+    @Test
+    fun `M return new File W getWritableFile() {previous file leaves no room for a max-size item}`(
+        @StringForgery(size = MAX_BATCH_SIZE - MAX_ITEM_SIZE) previousData: String
+    ) {
+        // Given
+        assumeTrue(fakeRootDir.listFiles().isNullOrEmpty())
+        val fileCreateTimestamp = stubTimeProvider.deviceTimestampMs
+        val previousFile = testedOrchestrator.getWritableFile()
+        checkNotNull(previousFile)
+        previousFile.writeText(previousData)
+        stubTimeProvider.deviceTimestampMs += 1
+        val newFileTimestamp = stubTimeProvider.deviceTimestampMs
+
+        // When
+        val result = testedOrchestrator.getWritableFile()
+
+        // Then
+        checkNotNull(result)
+        assertThat(result)
+            .doesNotExist()
+            .hasParent(fakeRootDir)
+        assertThat(result.name.toLong()).isEqualTo(newFileTimestamp)
+        assertThat(previousFile.readText()).isEqualTo(previousData)
+        argumentCaptor<BatchClosedMetadata> {
+            verify(mockMetricsDispatcher).sendBatchClosedMetric(eq(previousFile), capture())
+            assertThat(firstValue.lastTimeWasUsedInMs).isEqualTo(fileCreateTimestamp)
+            assertThat(firstValue.eventsCount).isEqualTo(1L)
+        }
+        verifyNoMoreInteractions(mockMetricsDispatcher)
+    }
+
     @Test
     fun `M return new File W getWritableFile() {previous file has too many items}`(
         forge: Forge

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/ResourcesFeature.kt

@@ -58,7 +58,7 @@ internal class ResourcesFeature(
         /**
          * Session Replay Resources storage configuration with the following parameters:
          * max item size = 10 MB,
-         * max items per batch = 500,
+         * max items per batch = 1000,
          * max batch size = 10 MB, SR intake batch limit is 10MB
          * old batch threshold = 18 hours.
          */

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/SessionReplayFeature.kt

@@ -402,7 +402,7 @@ internal class SessionReplayFeature(
         /**
          * Session Replay storage configuration with the following parameters:
          * max item size = 10 MB,
-         * max items per batch = 500,
+         * max items per batch = 1000,
          * max batch size = 10 MB, SR intake batch limit is 10MB
          * old batch threshold = 5 hours.
          */

features/dd-sdk-android-webview/src/main/kotlin/com/datadog/android/webview/internal/replay/WebViewReplayFeature.kt

@@ -59,7 +59,7 @@ internal class WebViewReplayFeature(
         /**
          * Storage configuration with the following parameters:
          * max item size = 10 MB,
-         * max items per batch = 500,
+         * max items per batch = 1000,
          * max batch size = 10 MB, SR intake batch limit is 10MB
          * old batch threshold = 18 hours.
          */