Merge pull request #559 from embrace-io/lucas/fix_race_condition_on_logs

Fix race condition for logs.
embrace-io · Mar 13, 2024 · 7883bac · 7883bac
2 parents 34af6df + 4da6077
commit 7883bac
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logs/LogSinkImpl.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logs/LogSinkImpl.kt
@@ -26,9 +26,10 @@ internal class LogSinkImpl : LogSink {
 
  override fun flushLogs(max: Int?): List<EmbraceLogRecordData> {
  synchronized(flushLock) {
+ val currentSize = storedLogs.size
  val maxIndex = max?.let {
- minOf(storedLogs.size, it)
- } ?: storedLogs.size
+ minOf(currentSize, it)
+ } ?: currentSize
  val flushedLogs = storedLogs.take(maxIndex)
  storedLogs.removeAll(flushedLogs.toSet())
  return flushedLogs