Fix log retry never ends (#224)

Wrong logic checking. postEvents enters infinite loop

Author: xinlili-statsig

src/main/kotlin/com/statsig/sdk/StatsigNetwork.kt

@@ -25,7 +25,7 @@ private const val BACKOFF_MULTIPLIER: Int = 10
 private const val MS_IN_S: Long = 1000
 const val STATSIG_API_URL_BASE: String = "https://statsigapi.net/v1"
 private const val STATSIG_CDN_URL_BASE: String = "https://api.statsigcdn.com/v1"
-
+const val LOG_EVENT_RETRY_COUNT = 5
 internal class StatsigNetwork(
     private val sdkKey: String,
     private val options: StatsigOptions,
@@ -227,7 +227,7 @@ internal class StatsigNetwork(
     }
 
     suspend fun postLogs(events: List<StatsigEvent>, statsigMetadata: StatsigMetadata) {
-        retryPostLogs(events, statsigMetadata, 5, 1)
+        retryPostLogs(events, statsigMetadata, LOG_EVENT_RETRY_COUNT, 1)
     }
 
     suspend fun retryPostLogs(
@@ -255,7 +255,7 @@ internal class StatsigNetwork(
                     statsigHttpClient.newCall(request).await().use { response ->
                         if (response.isSuccessful) {
                             return@coroutineScope
-                        } else if (!retryCodes.contains(response.code) || retries == 0) {
+                        } else if (!retryCodes.contains(response.code) || currRetry == 0) {
                             return@coroutineScope
                         }
                     }

src/test/java/com/statsig/sdk/NetworkTest.kt

@@ -4,13 +4,26 @@ import io.mockk.coVerifySequence
 import io.mockk.spyk
 import io.mockk.unmockkAll
 import kotlinx.coroutines.runBlocking
+import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
 import org.junit.After
 import org.junit.Assert.assertEquals
+import org.junit.Before
 import org.junit.Test
 
-class NetworkTest {
+internal class NetworkTest {
+    var server = MockWebServer()
+    var logEventCount = 0
+    val metadata = StatsigMetadata()
+    val options = StatsigOptions()
+    val eb = ErrorBoundary("", options, metadata)
+    @Before
+    fun setup() {
+        server = MockWebServer()
+        logEventCount = 0
+    }
 
     @After
     fun tearDown() {
@@ -19,7 +32,6 @@ class NetworkTest {
 
     @Test
     fun testRetry() = runBlocking {
-        val server = MockWebServer()
         server.start()
 
         val errResponse = MockResponse()
@@ -32,11 +44,8 @@ class NetworkTest {
         successResponse.setBody("{}")
         server.enqueue(successResponse)
 
-        val metadata = StatsigMetadata()
-        val options = StatsigOptions()
         options.api = server.url("/v1").toString()
 
-        val eb = ErrorBoundary("", options, metadata)
         val net = spyk(StatsigNetwork("secret-123", options, metadata, eb, 1))
 
         net.postLogs(listOf(StatsigEvent("TestEvent")), metadata)
@@ -49,4 +58,54 @@ class NetworkTest {
             net.retryPostLogs(any(), any(), any(), any())
         }
     }
+
+    @Test
+    fun testLogEventRetry() = runBlocking {
+        server.apply {
+            dispatcher = object : Dispatcher() {
+                @Throws(InterruptedException::class)
+                override fun dispatch(request: RecordedRequest): MockResponse {
+                    if ("/v1/log_event" in request.path!!) {
+                        val logBody = request.body.readUtf8()
+                        if (request.getHeader("Content-Type") != "application/json; charset=utf-8") {
+                            throw Exception("No content type set!")
+                        }
+                        ++logEventCount
+                        return MockResponse().setResponseCode(503)
+                    }
+                    return MockResponse().setResponseCode(400)
+                }
+            }
+        }
+        options.api = server.url("/v1").toString()
+        val net = spyk(StatsigNetwork("secret-123", options, metadata, eb))
+        net.postLogs(listOf(StatsigEvent("TestEvent")), metadata)
+        println(logEventCount)
+        assert(logEventCount === LOG_EVENT_RETRY_COUNT + 1)
+    }
+
+    @Test
+    fun testLogEventNoRetry() = runBlocking {
+        server.apply {
+            dispatcher = object : Dispatcher() {
+                @Throws(InterruptedException::class)
+                override fun dispatch(request: RecordedRequest): MockResponse {
+                    if ("/v1/log_event" in request.path!!) {
+                        val logBody = request.body.readUtf8()
+                        if (request.getHeader("Content-Type") != "application/json; charset=utf-8") {
+                            throw Exception("No content type set!")
+                        }
+                        ++logEventCount
+                        return MockResponse().setResponseCode(400)
+                    }
+                    return MockResponse().setResponseCode(400)
+                }
+            }
+        }
+        options.api = server.url("/v1").toString()
+        val net = spyk(StatsigNetwork("secret-123", options, metadata, eb))
+        net.postLogs(listOf(StatsigEvent("TestEvent")), metadata)
+        println(logEventCount)
+        assert(logEventCount === 1)
+    }
 }

src/test/java/com/statsig/sdk/StatsigE2ETest.kt

@@ -80,7 +80,7 @@ class StatsigE2ETest {
                             throw Exception("No content type set!")
                         }
                         eventLogInputCompletable.complete(gson.fromJson(logBody, LogEventInput::class.java))
-                        return MockResponse().setResponseCode(200).setBody(downloadConfigSpecsResponse)
+                        return MockResponse().setResponseCode(200)
                     }
                     if ("/v1/get_id_lists" in request.path!!) {
                         download_id_list_count++