Updated flushQueue entry scheduling.

segmentio · Nov 17, 2023 · 4af5a8b · 4af5a8b
1 parent 2f61ef7
commit 4af5a8b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/Sources/Segment/Analytics.swift b/Sources/Segment/Analytics.swift
@@ -212,18 +212,23 @@ extension Analytics {
         flushGroup.enter()
 
         apply { plugin in
+            // we want to enter as soon as possible.  waiting to do it from
+            // another queue just takes too long.
+            flushGroup.enter()
             operatingMode.run(queue: configuration.values.flushQueue) {
                 if let p = plugin as? FlushCompletion {
-                    // this is async
                     // flush(group:completion:) handles the enter/leave.
-                    p.flush(group: flushGroup) { plugin in
+                    p.flush { plugin in
                         // we don't really care about the plugin value .. yet.
+                        flushGroup.leave()
                     }
                 } else if let p = plugin as? EventPlugin {
                     // we have no idea if this will be async or not, assume it's sync.
-                    flushGroup.enter()
                     p.flush()
                     flushGroup.leave()
+                } else {
+                    // this is for plugins that don't implement flush.
+                    flushGroup.leave()
                 }
             }
         }

diff --git a/Sources/Segment/Plugins.swift b/Sources/Segment/Plugins.swift
@@ -63,7 +63,7 @@ public protocol VersionedPlugin {
 }
 
 public protocol FlushCompletion {
-    func flush(group: DispatchGroup, completion: @escaping (DestinationPlugin) -> Void)
+    func flush(completion: @escaping (DestinationPlugin) -> Void)
 }
 
 // For internal platform-specific bits

diff --git a/Sources/Segment/Plugins/SegmentDestination.swift b/Sources/Segment/Plugins/SegmentDestination.swift
@@ -116,7 +116,7 @@ public class SegmentDestination: DestinationPlugin, Subscriber, FlushCompletion
         // unused .. see flush(group:completion:)
     }
 
-    public func flush(group: DispatchGroup, completion: @escaping (DestinationPlugin) -> Void) {
+    public func flush(completion: @escaping (DestinationPlugin) -> Void) {
         guard let storage = self.storage else { return }
         guard let analytics = self.analytics else { return }
         guard let httpClient = self.httpClient else { return }
@@ -135,8 +135,6 @@ public class SegmentDestination: DestinationPlugin, Subscriber, FlushCompletion
         if pendingUploads == 0 {
             for url in data {
                 analytics.log(message: "Processing Batch:\n\(url.lastPathComponent)")
-                // enter the dispatch group
-                group.enter()
                 // set up the task
                 let uploadTask = httpClient.startBatchUpload(writeKey: analytics.configuration.values.writeKey, batch: url) { (result) in
                     switch result {
@@ -154,8 +152,6 @@ public class SegmentDestination: DestinationPlugin, Subscriber, FlushCompletion
                     self.cleanupUploads()
                     // call the completion
                     completion(self)
-                    // leave the dispatch group
-                    group.leave()
                 }
                 // we have a legit upload in progress now, so add it to our list.
                 if let upload = uploadTask {