Skip to content
Closed
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
5 changes: 4 additions & 1 deletion Split/Events/SplitEventsManager.swift
Original file line number Diff line number Diff line change
@@ -51,6 +51,7 @@ class DefaultSplitEventsManager: SplitEventsManager {
}
}

// MARK: Notifiers
func notifyInternalEvent(_ event: SplitInternalEvent, metadata: EventMetadata? = nil) {
let event = SplitInternalEventWithMetadata(event, metadata: metadata)

@@ -65,7 +66,8 @@ class DefaultSplitEventsManager: SplitEventsManager {
func notifyInternalEvent(_ event: SplitInternalEvent) {
notifyInternalEvent(event, metadata: nil)
}


// MARK: Registers
func register(event: SplitEventWithMetadata, task: SplitEventActionTask) {
let eventName = event.type.toString()
processQueue.async { [weak self] in
@@ -84,6 +86,7 @@ class DefaultSplitEventsManager: SplitEventsManager {
register(event: SplitEventWithMetadata(type: event, metadata: nil), task: task)
}

// MARK: Flow
func start() {
dataAccessQueue.sync {
if self.isStarted {
6 changes: 4 additions & 2 deletions Split/Localhost/LocalhostSynchronizer.swift
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ class LocalhostSynchronizer: FeatureFlagsSynchronizer {
func notifyKilled() {
}

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

func pause() {
@@ -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
@@ -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)
@@ -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,
@@ -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)")
7 changes: 4 additions & 3 deletions Split/Network/Sync/FeatureFlagsSynchronizer.swift
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ protocol FeatureFlagsSynchronizer {
func startPeriodicSync()
func stopPeriodicSync()
func notifyKilled()
func notifyUpdated()
func notifyUpdated(flagsList: [String])
func pause()
func resume()
func destroy()
@@ -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() {
6 changes: 3 additions & 3 deletions Split/Network/Sync/Synchronizer.swift
Original file line number Diff line number Diff line change
@@ -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()
@@ -207,8 +207,8 @@ class DefaultSynchronizer: Synchronizer {
}
}

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

func notifySegmentsUpdated(forKey key: String) {
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion SplitTests/Fake/Streaming/SynchronizerSpy.swift
Original file line number Diff line number Diff line change
@@ -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() {
4 changes: 3 additions & 1 deletion SplitTests/Fake/Streaming/SynchronizerStub.swift
Original file line number Diff line number Diff line change
@@ -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() {