chore: Mode resolution and switching for FDv2#326
Merged
aaron-zeisler merged 18 commits intomainfrom Mar 27, 2026
Merged
Conversation
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSource.java
Show resolved
Hide resolved
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ModeAware.java
Outdated
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Outdated
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Outdated
Show resolved
Hide resolved
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSource.java
Outdated
Show resolved
Hide resolved
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSource.java
Outdated
Show resolved
Hide resolved
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSource.java
Outdated
Show resolved
Hide resolved
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSource.java
Outdated
Show resolved
Hide resolved
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSource.java
Outdated
Show resolved
Hide resolved
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSource.java
Outdated
Show resolved
Hide resolved
aaron-zeisler
commented
Mar 12, 2026
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSource.java
Outdated
Show resolved
Hide resolved
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
from
4e24bb9 to
070f859
Compare
3 tasks
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
from
ee7bfc4 to
c71379b
Compare
aaron-zeisler
changed the title
Contributor
Author
|
I merged the code from the other approach into this branch in the commit titled "refactor: switch to Approach 2 for FDv2 mode resolution and switching", and then I closed that other PR. |
tanderson-ld
requested changes
Mar 18, 2026
...hdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ClientContextImpl.java
Show resolved
Hide resolved
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectionMode.java
Outdated
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Outdated
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Outdated
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Outdated
Show resolved
Hide resolved
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Show resolved
Hide resolved
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Outdated
Show resolved
Hide resolved
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Show resolved
Hide resolved
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Outdated
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ModeResolutionTable.java
Outdated
Show resolved
Hide resolved
aaron-zeisler
commented
Mar 18, 2026
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
from
c71379b to
0b070e6
Compare
aaron-zeisler
commented
Mar 20, 2026
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
aaron-zeisler
commented
Mar 20, 2026
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Outdated
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Outdated
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
...y-android-client-sdk/src/test/java/com/launchdarkly/sdk/android/ConnectivityManagerTest.java
Show resolved
Hide resolved
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
2 times, most recently
from
b0b1e2f to
ba6ac91
Compare
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
from
ba6ac91 to
34c2752
Compare
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Show resolved
Hide resolved
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Outdated
Show resolved
Hide resolved
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Outdated
Show resolved
Hide resolved
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
from
34c2752 to
1c78c34
Compare
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
from
1c78c34 to
5c6ac49
Compare
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Show resolved
Hide resolved
...kly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/FDv2DataSourceBuilder.java
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ModeResolutionTable.java
Show resolved
Hide resolved
tanderson-ld
requested changes
Mar 24, 2026
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Outdated
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Show resolved
Hide resolved
...arkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/ConnectivityManager.java
Outdated
Show resolved
Hide resolved
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
from
6fcd7ff to
e82d3da
Compare
Introduces the core types for FDv2 mode resolution (CONNMODE spec): - ConnectionMode: enum for streaming, polling, offline, one-shot, background - ModeDefinition: initializer/synchronizer lists per mode with stubbed configurers - ModeState: platform state snapshot (foreground, networkAvailable) - ModeResolutionEntry: condition + mode pair for resolution table entries - ModeResolutionTable: ordered first-match-wins resolver with MOBILE default table - ModeAware: interface for DataSources that support runtime switchMode() All types are package-private. No changes to existing code.
Add ResolvedModeDefinition and mode-table constructors so FDv2DataSource can look up initializer/synchronizer factories per ConnectionMode. switchMode() tears down the current SourceManager, builds a new one with the target mode's synchronizers (skipping initializers per CONNMODE 2.0.1), and schedules execution on the background executor. runSynchronizers() now takes an explicit SourceManager parameter to prevent a race where the finally block could close a SourceManager swapped in by a concurrent switchMode().
Introduces FDv2DataSourceBuilder, a ComponentConfigurer<DataSource> that resolves the ModeDefinition table's ComponentConfigurers into DataSourceFactories at build time by capturing the ClientContext. The configurers are currently stubbed (return null); real wiring of concrete initializer/synchronizer types will follow in a subsequent commit.
…ourceBuilder Replace stub configurers with concrete factories that create FDv2PollingInitializer, FDv2PollingSynchronizer, and FDv2StreamingSynchronizer. Shared dependencies (SelectorSource, ScheduledExecutorService) are created once per build() call; each factory creates a fresh DefaultFDv2Requestor for lifecycle isolation. Add FDv2 endpoint path constants to StandardEndpoints. Thread TransactionalDataStore through ClientContextImpl and ConnectivityManager so the builder can construct SelectorSourceFacade from ClientContext.
ConnectivityManager now detects ModeAware data sources and routes foreground, connectivity, and force-offline state changes through resolveAndSwitchMode() instead of the legacy teardown/rebuild cycle.
…d switching Replace Approach 1 implementation with Approach 2, which the team preferred for its cleaner architecture: - ConnectivityManager owns the resolved mode table and performs ModeState -> ConnectionMode -> ResolvedModeDefinition lookup - FDv2DataSource receives ResolvedModeDefinition via switchMode() and has no internal mode table - FDv2DataSourceBuilder uses a unified ComponentConfigurer-based code path for both production and test mode tables - ResolvedModeDefinition is a top-level class rather than an inner class of FDv2DataSource - ConnectionMode is a final class with static instances instead of a Java enum Made-with: Cursor
FDv2DataSource now explicitly implements both DataSource and ModeAware, keeping the two interfaces independent. Made-with: Cursor
…n ConnectivityManager Extract updateEventProcessor() and handleModeStateChange() so that event processor state (setOffline, setInBackground) is managed independently from data source lifecycle. Both platform listeners and setForceOffline() now route through handleModeStateChange(), which snapshots state once and updates each subsystem separately. Made-with: Cursor
…o prevent race condition SourceManager now owns a switchSynchronizers() method that atomically swaps the synchronizer list under the existing lock, eliminating the window where two runSynchronizers() loops could push data into the update sink concurrently. FDv2DataSource keeps a single final SourceManager and uses an AtomicBoolean guard to ensure only one execution loop runs at a time. Made-with: Cursor
…pdateDataSource handleModeStateChange() now simply updates the event processor and delegates to updateDataSource(). The FDv2 ModeAware early-return and FDv1 needsRefresh() check both live inside updateDataSource, keeping the branching logic in one place. Made-with: Cursor
…nectivityManager level Per updated CSFDV2 spec and JS implementation, mode switching now tears down the old data source and builds a new one rather than swapping internal synchronizers. Delete ModeAware interface, remove switchMode() from FDv2DataSource and switchSynchronizers() from SourceManager. FDv2DataSourceBuilder becomes the sole owner of mode resolution via setActiveMode()/build(), with ConnectivityManager using a useFDv2ModeResolution flag to route FDv2 through the new path while preserving FDv1 behavior. Implements CSFDV2 5.3.8 (retain data source when old and new modes share the same ModeDefinition). Made-with: Cursor
- Short-circuit forceOffline in resolveMode() so ModeState reflects actual platform state - Match ConnectionMode string values to cross-SDK spec (lowercase, hyphenated) - Add Javadoc to ConnectionMode, ClientContextImpl overloads, and FDv2DataSource internals - Inline FDv2DataSourceBuilder casts in ConnectivityManager - Restore try/finally and explanatory comments in runSynchronizers Made-with: Cursor
- Extract DataSourceSetup helper and makePollingRequestor() to eliminate duplicated configurer boilerplate in FDv2DataSourceBuilder - Share builder's sharedExecutor across all components to prevent thread pool leaks on mode switches; increase pool size from 2 to 4 - Make FDv2DataSourceBuilder implement Closeable; shut down executor in ConnectivityManager.shutDown() - Honor backgroundUpdatingDisabled in FDv2 mode resolution by adding the flag to ModeState and ModeResolutionTable Made-with: Cursor
- ConnectivityManager: use .equals() for ModeDefinition comparison, synchronize handleModeStateChange() - FDv2DataSourceBuilder: remove redundant unmodifiableMap() wrapping - ModeResolutionTable: use explicit default mode instead of catch-all entry - Add 5 FDv1 round-trip tests for offline, network, and foreground transitions
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
from
e82d3da to
ee8ce29
Compare
Contributor
Author
|
Apologies again @tanderson-ld , but I rebased with the main branch and then pushed. This whole thing is going to be squashed (hopefully today), which will probably make for a challenging merge in your development branch. |
launchdarkly-android-client-sdk/src/main/java/com/launchdarkly/sdk/android/RepeatingTask.java
Outdated
Show resolved
Hide resolved
| () -> workerPool.execute(task), | ||
| initialDelayMillis, TimeUnit.MILLISECONDS); | ||
| return task; | ||
| } |
Contributor
There was a problem hiding this comment.
Consider just having a pooled scheduled executor for long running work. We shouldn't need to make the RepeatingTask and should be able to use existing java paradigms.
Contributor
There was a problem hiding this comment.
After more investigation and discussion, we're going to stick with the FDv2DataSourceFactory owning the fixed thread pool executor. These changes should be reverted.
Move resolveMode() into updateDataSource so it covers both startup and state-change paths, eliminating the duplicate call in startUp that was always overwritten. Made-with: Cursor
aaron-zeisler
force-pushed
the
aaronz/SDK-1956/mode-resolution-and-switching
branch
2 times, most recently
from
ca50abd to
9fad9ac
Compare
tanderson-ld
approved these changes
Mar 25, 2026
Contributor
tanderson-ld
left a comment
tanderson-ld
left a comment
There was a problem hiding this comment.
Final bench testing.
…consistency Guard needsRefresh() so it only fires when platform state has changed since the last data source build, preventing unnecessary FDv1 polling rebuilds on connectivity events. Snapshot ModeState once per state change and pass it through updateDataSource to eliminate race between event processor and data source reads. Synchronize switchToContext. Add equals/hashCode to ModeState. Made-with: Cursor
Used the Android Studio to geenrate it instead of Cursor AI
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
| @NonNull | ||
| ConnectionMode getStartingMode() { | ||
| return startingMode; | ||
| } |
There was a problem hiding this comment.
Unused getStartingMode method in FDv2DataSourceBuilder
Low Severity
getStartingMode() is defined but never called anywhere in the codebase. A grep for getStartingMode only returns its definition. The startingMode field is used internally via activeMode != null ? activeMode : startingMode in build(), but the getter itself is dead code.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Details coming soon
Requirements
Note
Medium Risk
Introduces a new FDv2 mode-resolution and rebuild path in
ConnectivityManager, which changes when data sources are torn down/recreated across foreground/offline/network transitions. Risk is mitigated by substantial new unit coverage, but regressions could impact connection lifecycle and initialization timing.Overview
Adds an internal FDv2 connection mode system (
ConnectionMode,ModeState,ModeResolutionTable,ModeDefinition) and a newFDv2DataSourceBuilderthat builds anFDv2DataSourcebased on the resolved mode.Updates
ConnectivityManagerto snapshot platform state, update the event processor consistently, and (when usingFDv2DataSourceBuilder) resolve modes and rebuild data sources only on meaningful mode changes (including an equivalence check to skip rebuilds when configs match); it also closes the factory on shutdown when supported.Extends
ClientContextImplto optionally carry aTransactionalDataStorethroughforDataSource, and updatesFDv2DataSource.needsRefreshto rebuild only on context changes. Adds FDv2 endpoint base paths inStandardEndpointsand broad new tests covering FDv1 regression scenarios plus FDv2 mode switching/resolution behavior.Written by Cursor Bugbot for commit 06f870d. This will update automatically on new commits. Configure here.