Skip to content

[FME-4228] Events - Updated flags logic #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: FME-4222-events-withMetadata
Choose a base branch
from
Open
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
6 changes: 4 additions & 2 deletions Split/Localhost/LocalhostSynchronizer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class LocalhostSynchronizer: FeatureFlagsSynchronizer {
func notifyKilled() {
}

func notifyUpdated() {
func notifyUpdated(flagsList: [String]) {
}

func pause() {
Expand Down Expand Up @@ -74,7 +74,9 @@ class LocalhostSynchronizer: FeatureFlagsSynchronizer {
// Update will remove all records before insert new ones
_ = self.featureFlagsStorage.update(splitChange: change)

self.eventsManager.notifyInternalEvent(.splitsUpdated)
// Notify event
let metadata = EventMetadata(type: .FLAGS_UPDATED, data: featureFlags.values.description)
self.eventsManager.notifyInternalEvent(.splitsUpdated, metadata: metadata)
}
}
}
18 changes: 11 additions & 7 deletions Split/Network/Streaming/SyncUpdateWorker.swift
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,12 @@ class SplitsUpdateWorker: UpdateWorker<TargetingRuleUpdateNotification> {

Logger.v("Split update received: \(change)")

if self.splitsStorage.update(splitChange: self.splitChangeProcessor.process(change)) {
self.synchronizer.notifyFeatureFlagsUpdated()
let processedFlags = self.splitChangeProcessor.process(change)

if self.splitsStorage.update(splitChange: processedFlags) {
var updatedFlags: [String] = processedFlags.activeSplits.compactMap(\.name)
updatedFlags += processedFlags.archivedSplits.compactMap(\.name)
self.synchronizer.notifyFeatureFlagsUpdated(flagsList: updatedFlags)
}

self.telemetryProducer?.recordUpdatesFromSse(type: .splits)
Expand All @@ -161,9 +165,9 @@ class SplitsUpdateWorker: UpdateWorker<TargetingRuleUpdateNotification> {
previousChangeNumber: Int64,
changeNumber: Int64) -> Bool {
do {
let rbs = try self.ruleBasedSegmentsPayloadDecoder.decode(
let rbs = try ruleBasedSegmentsPayloadDecoder.decode(
payload: payload,
compressionUtil: self.decomProvider.decompressor(for: compressionType))
compressionUtil: decomProvider.decompressor(for: compressionType))

let change = RuleBasedSegmentChange(segments: [rbs],
since: previousChangeNumber,
Expand All @@ -173,13 +177,13 @@ class SplitsUpdateWorker: UpdateWorker<TargetingRuleUpdateNotification> {

let processedChange = ruleBasedSegmentsChangeProcessor.process(change)

if self.ruleBasedSegmentsStorage.update(toAdd: processedChange.toAdd,
if ruleBasedSegmentsStorage.update(toAdd: processedChange.toAdd,
toRemove: processedChange.toRemove,
changeNumber: processedChange.changeNumber) {
self.synchronizer.notifyFeatureFlagsUpdated()
synchronizer.notifyFeatureFlagsUpdated(flagsList: []) //TODO: Notify segments updated (new notification method?)
}

self.telemetryProducer?.recordUpdatesFromSse(type: .splits)
telemetryProducer?.recordUpdatesFromSse(type: .splits)
return true
} catch {
Logger.e("Error decoding rule based segments payload from notification: \(error)")
Expand Down
7 changes: 4 additions & 3 deletions Split/Network/Sync/FeatureFlagsSynchronizer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ protocol FeatureFlagsSynchronizer {
func startPeriodicSync()
func stopPeriodicSync()
func notifyKilled()
func notifyUpdated()
func notifyUpdated(flagsList: [String])
func pause()
func resume()
func destroy()
Expand Down Expand Up @@ -148,8 +148,9 @@ class DefaultFeatureFlagsSynchronizer: FeatureFlagsSynchronizer {
splitEventsManager.notifyInternalEvent(.splitKilledNotification)
}

func notifyUpdated() {
splitEventsManager.notifyInternalEvent(.splitsUpdated)
func notifyUpdated(flagsList: [String]) {
let eventMetadata = EventMetadata(type: .FLAGS_UPDATED, data: flagsList.description)
splitEventsManager.notifyInternalEvent(.splitsUpdated, metadata: eventMetadata)
}

func pause() {
Expand Down
6 changes: 3 additions & 3 deletions Split/Network/Sync/Synchronizer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protocol Synchronizer: ImpressionLogger {
func startRecordingTelemetry()
func stopRecordingTelemetry()
func pushEvent(event: EventDTO)
func notifyFeatureFlagsUpdated()
func notifyFeatureFlagsUpdated(flagsList: [String])
func notifySegmentsUpdated(forKey key: String)
func notifyLargeSegmentsUpdated(forKey key: String)
func notifySplitKilled()
Expand Down Expand Up @@ -207,8 +207,8 @@ class DefaultSynchronizer: Synchronizer {
}
}

func notifyFeatureFlagsUpdated() {
featureFlagsSynchronizer.notifyUpdated()
func notifyFeatureFlagsUpdated(flagsList: [String]) {
featureFlagsSynchronizer.notifyUpdated(flagsList: flagsList)
}

func notifySegmentsUpdated(forKey key: String) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@ class FeatureFlagsSynchronizerStub: FeatureFlagsSynchronizer {
}

var notifyUpdatedCalled = false
func notifyUpdated() {
var updatedFlagsList = [String]()
func notifyUpdated(flagsList: [String]) {
notifyUpdatedCalled = true
updatedFlagsList = flagsList
}

var pauseCalled = false
Expand Down
4 changes: 3 additions & 1 deletion SplitTests/Fake/Streaming/SynchronizerSpy.swift
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,10 @@ class SynchronizerSpy: Synchronizer {
}

var notifyFeatureFlagsUpdatedCalled = false
func notifyFeatureFlagsUpdated() {
var updatedFlagsList = [String]()
func notifyFeatureFlagsUpdated(flagsList: [String]) {
notifyFeatureFlagsUpdatedCalled = true
updatedFlagsList = flagsList
}

func notifySplitKilled() {
Expand Down
4 changes: 3 additions & 1 deletion SplitTests/Fake/Streaming/SynchronizerStub.swift
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,10 @@ class SynchronizerStub: Synchronizer {
}

var notifyFeatureFlagsUpdatedCalled = true
func notifyFeatureFlagsUpdated() {
var updatedFlagsList = [String]()
func notifyFeatureFlagsUpdated(flagsList: [String]) {
notifyFeatureFlagsUpdatedCalled = true
updatedFlagsList = flagsList
}

func notifySplitKilled() {
Expand Down
Loading