Fix for the case where the millis difference is exact (#779)

embrace-io · Apr 19, 2024 · 15f3376 · 15f3376
1 parent fe20265
commit 15f3376
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logs/LogOrchestrator.kt b/...-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/logs/LogOrchestrator.kt
@@ -100,11 +100,11 @@ internal class LogOrchestratorImpl(
  sink.completedLogs().size >= MAX_LOGS_PER_BATCH
 
  private fun isMaxInactivityTimeReached(now: Long): Boolean =
- now - lastLogTime.get() > MAX_INACTIVITY_TIME
+ now - lastLogTime.get() >= MAX_INACTIVITY_TIME
 
  private fun isMaxBatchTimeReached(now: Long): Boolean {
  val firstLogInBatchTime = firstLogInBatchTime.get()
- return firstLogInBatchTime != 0L && now - firstLogInBatchTime > MAX_BATCH_TIME
+ return firstLogInBatchTime != 0L && now - firstLogInBatchTime >= MAX_BATCH_TIME
  }
 
  companion object {

diff --git a/...roid-sdk/src/test/java/io/embrace/android/embracesdk/internal/logs/LogOrchestratorTest.kt b/...roid-sdk/src/test/java/io/embrace/android/embracesdk/internal/logs/LogOrchestratorTest.kt
@@ -78,7 +78,7 @@ internal class LogOrchestratorTest {
  fun `logs are sent after inactivity time has passed`() {
  logSink.storeLogs(listOf(FakeLogRecordData()))
 
- moveTimeAhead(2500L)
+ moveTimeAhead(2000L)
 
  // Verify the logs are sent
  assertTrue(logSink.completedLogs().isEmpty())
@@ -87,9 +87,9 @@ internal class LogOrchestratorTest {
 
  @Test
  fun `logs are sent after batch time has passed`() {
- val timeStep = 1100L
+ val timeStep = 500L
 
- repeat(4) {
+ repeat(9) {
  logSink.storeLogs(listOf(FakeLogRecordData()))
  moveTimeAhead(timeStep)
  }
@@ -98,11 +98,11 @@ internal class LogOrchestratorTest {
  assertFalse(logSink.completedLogs().isEmpty())
  verifyPayloadNotSent()
 
- moveTimeAhead(700)
+ moveTimeAhead(500)
 
  // Verify the logs are sent
  assertTrue(logSink.completedLogs().isEmpty())
- verifyPayload(4)
+ verifyPayload(9)
  }
 
  @Test