Flush events only when the buffer is full (close #648)

snowplow · Nov 30, 2023 · caf3d05 · caf3d05
1 parent c6ad42b
commit caf3d05
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 7 deletions.
diff --git a/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/EmitterTest.kt b/snowplow-tracker/src/androidTest/java/com/snowplowanalytics/snowplow/tracker/EmitterTest.kt
@@ -429,6 +429,29 @@ class EmitterTest {
         emitter.flush()
     }
 
+    @Test
+    fun testDoesntMakeRequestUnlessBufferSizeIsReached() {
+        val networkConnection = MockNetworkConnection(HttpMethod.GET, 200)
+        val emitter = getEmitter(networkConnection, BufferOption.SmallGroup)
+
+        for (payload in generatePayloads(9)) {
+            emitter.add(payload)
+        }
+        Thread.sleep(1000)
+
+        // all events waiting in queue
+        Assert.assertEquals(0, networkConnection.previousResults.size)
+        Assert.assertEquals(9, emitter.eventStore!!.size())
+
+        emitter.add(generatePayloads(1)[0])
+        Thread.sleep(1000)
+
+        // all events sent
+        Assert.assertEquals(0, emitter.eventStore!!.size())
+        Assert.assertEquals(1, networkConnection.previousResults.size)
+        emitter.flush()
+    }
+
     // Emitter Builder
     private fun getEmitter(networkConnection: NetworkConnection?, option: BufferOption?): Emitter {
         val builder = { emitter: Emitter ->

diff --git a/snowplow-tracker/src/main/java/com/snowplowanalytics/core/emitter/Emitter.kt b/snowplow-tracker/src/main/java/com/snowplowanalytics/core/emitter/Emitter.kt
@@ -422,13 +422,15 @@ class Emitter(context: Context, collectorUri: String, builder: ((Emitter) -> Uni
      */
     fun add(payload: Payload) {
         Executor.execute(TAG) {
-            eventStore?.add(payload)
-            if (isRunning.compareAndSet(false, true)) {
-                try {
-                    attemptEmit(networkConnection)
-                } catch (t: Throwable) {
-                    isRunning.set(false)
-                    Logger.e(TAG, "Received error during emission process: %s", t)
+            eventStore?.let { eventStore ->
+                eventStore.add(payload)
+                if (eventStore.size() >= bufferOption.code && isRunning.compareAndSet(false, true)) {
+                    try {
+                        attemptEmit(networkConnection)
+                    } catch (t: Throwable) {
+                        isRunning.set(false)
+                        Logger.e(TAG, "Received error during emission process: %s", t)
+                    }
                 }
             }
         }