Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions posthog/src/main/java/com/posthog/PostHog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2592,11 +2592,16 @@ public class PostHog private constructor(
val listener = FeatureFlagsListener(callback)
featureFlagsListeners.add(listener)

remoteConfigExecutor.executeSafely {
runFeatureFlagsListener {
// Read at delivery time so a delivery already queued can't be followed by an older value.
lastFeatureFlagsLoaded?.let { deliverFeatureFlags(listener, it) }
}
// Read at delivery time so a delivery already queued can't be followed by an older value.
val replay = { lastFeatureFlagsLoaded?.let { deliverFeatureFlags(listener, it) } }
// Post straight to the listener executor (the main thread on Android), so the replay doesn't
// wait behind a flags request in flight on the remote config thread. Without one, listeners
// run on the remote config thread, so the replay queues there.
val executor = config?.featureFlagsListenerExecutor
if (executor != null) {
executor.executeSafely { replay() }
} else {
remoteConfigExecutor.executeSafely { runFeatureFlagsListener { replay() } }
}

return PostHogFeatureFlagsSubscription {
Expand Down
72 changes: 65 additions & 7 deletions posthog/src/test/java/com/posthog/PostHogBootstrapTest.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import org.junit.Rule
import org.junit.rules.TemporaryFolder
import java.io.File
import java.util.concurrent.CountDownLatch
import java.util.concurrent.Executor
import java.util.concurrent.Executors
import java.util.concurrent.LinkedBlockingQueue
import java.util.concurrent.TimeUnit
Expand Down Expand Up @@ -49,6 +50,7 @@ internal class PostHogBootstrapTest {
storagePrefix: String = tmpDir.newFolder().absolutePath,
logger: TestLogger? = null,
optOut: Boolean = false,
featureFlagsListenerExecutor: Executor? = null,
): PostHogInterface {
config =
PostHogConfig(PROJECT_TOKEN, host).apply {
Expand All @@ -60,6 +62,7 @@ internal class PostHogBootstrapTest {
this.cachePreferences = cachePreferences
this.bootstrap = bootstrap
this.optOut = optOut
this.featureFlagsListenerExecutor = featureFlagsListenerExecutor
if (logger != null) {
this.logger = logger
}
Expand Down Expand Up @@ -368,24 +371,79 @@ internal class PostHogBootstrapTest {
http.shutdown()
}

private fun heldFlagsServer(release: CountDownLatch): MockWebServer {
val http = MockWebServer()
http.dispatcher =
object : Dispatcher() {
override fun dispatch(request: RecordedRequest): MockResponse {
release.await(10, TimeUnit.SECONDS)
if (request.path!!.contains("/flags")) {
return MockResponse().setBody("""{"featureFlags":{"beta-ui":"test"}}""")
}
return MockResponse().setBody("""{"hasFeatureFlags":true}""")
}
}
http.start()
return http
}

@Test
fun `onFeatureFlags replays bootstrapped flags to a listener registered after setup`() {
fun `onFeatureFlags replays bootstrapped flags to a late listener while setup's load is in flight`() {
val release = CountDownLatch(1)
val http = heldFlagsServer(release)
val listenerExecutor = Executors.newSingleThreadExecutor()
val sut =
getSut(
host = "http://127.0.0.1:1",
// the replay comes from setup's flag loading, before /config answers
reloadFeatureFlags = true,
host = http.url("/").toString(),
preloadFeatureFlags = true,
bootstrap = PostHogBootstrapConfig(featureFlags = mapOf("beta-ui" to true)),
featureFlagsListenerExecutor = listenerExecutor,
)
http.takeRequest(5, TimeUnit.SECONDS)!!

val updates = LinkedBlockingQueue<PostHogFeatureFlagsLoaded>()
sut.onFeatureFlags { updates.add(it) }

// setup's load to the unreachable host may already have failed, which keeps the bootstrapped flags
val loaded = updates.poll(5, TimeUnit.SECONDS)!!
assertEquals(mapOf<String, Any>("beta-ui" to true), loaded.variants)
val replayed = updates.poll(2, TimeUnit.SECONDS)
assertEquals(mapOf<String, Any>("beta-ui" to true), replayed?.variants)
assertFalse(replayed!!.errorsLoading)

release.countDown()
val loaded = updates.poll(5, TimeUnit.SECONDS)
assertEquals(mapOf<String, Any>("beta-ui" to "test"), loaded?.variants)
assertFalse(loaded!!.errorsLoading)
assertNull(updates.poll(1, TimeUnit.SECONDS))

sut.close()
listenerExecutor.shutdownAndAwaitTermination()
http.shutdown()
}

@Test
fun `onFeatureFlags delivers a load that lands before a late listener's replay runs once`() {
val release = CountDownLatch(1)
val http = heldFlagsServer(release)
val queued = LinkedBlockingQueue<Runnable>()
val sut =
getSut(
host = http.url("/").toString(),
preloadFeatureFlags = true,
bootstrap = PostHogBootstrapConfig(featureFlags = mapOf("beta-ui" to true)),
featureFlagsListenerExecutor = Executor { queued.add(it) },
)
http.takeRequest(5, TimeUnit.SECONDS)!!

val updates = mutableListOf<PostHogFeatureFlagsLoaded>()
sut.onFeatureFlags { updates.add(it) }
release.countDown()
http.takeRequest(5, TimeUnit.SECONDS)!!
remoteConfigExecutor.submit {}.get(5, TimeUnit.SECONDS)
generateSequence { queued.poll() }.forEach { it.run() }

assertEquals(listOf<Map<String, Any>>(mapOf("beta-ui" to "test")), updates.map { it.variants })

sut.close()
http.shutdown()
}

@Test
Expand Down
Loading