Adjustments to testing and failed flush behavior.

Author: kinyoklion

lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/events/DefaultEventProcessor.java

@@ -624,9 +624,16 @@ private void triggerFlush(EventBuffer outbox, BlockingQueue<FlushPayload> payloa
       } else {
         logger.debug("Skipped flushing because all workers are busy");
         // All the workers are busy so we can't flush now; keep the events in our state
-        // Only restore if using single summarizer (not per-context)
-        if (outbox.summarizer != null && !payload.summaries.isEmpty()) {
-          outbox.summarizer.restoreTo(payload.summaries.get(0));
+        if (outbox.perContextSummarization) {
+          // Per-context mode: restore all summaries
+          if (outbox.multiContextSummarizer != null && !payload.summaries.isEmpty()) {
+            outbox.multiContextSummarizer.restoreTo(payload.summaries);
+          }
+        } else {
+          // Single summary mode: restore single summary
+          if (outbox.summarizer != null && !payload.summaries.isEmpty()) {
+            outbox.summarizer.restoreTo(payload.summaries.get(0));
+          }
         }
         synchronized(busyFlushWorkersCount) {
           busyFlushWorkersCount.decrementAndGet();

lib/shared/internal/src/main/java/com/launchdarkly/sdk/internal/events/MultiContextEventSummarizer.java

@@ -70,6 +70,23 @@ List<EventSummarizer.EventSummary> getSummariesAndReset() {
     return summaries;
   }
 
+  /**
+   * Restores the summarizer state from a previous snapshot. This is used when a flush
+   * operation fails and we need to keep the summary data for the next attempt.
+   *
+   * @param previousSummaries the list of summaries to restore
+   */
+  void restoreTo(List<EventSummarizer.EventSummary> previousSummaries) {
+    summarizersByContext.clear();
+    for (EventSummarizer.EventSummary summary : previousSummaries) {
+      if (summary.context != null && !summary.isEmpty()) {
+        EventSummarizer summarizer = new EventSummarizer(summary.context);
+        summarizer.restoreTo(summary);
+        summarizersByContext.put(summary.context, summarizer);
+      }
+    }
+  }
+
   /**
    * Returns true if there is no summary data for any context.
    *

lib/shared/internal/src/test/java/com/launchdarkly/sdk/internal/events/BaseEventTest.java

@@ -333,6 +333,7 @@ public static class EventsConfigurationBuilder {
     private boolean initiallyInBackground = false;
     private boolean initiallyOffline = false;
     private Set<AttributeRef> privateAttributes = new HashSet<>();
+    private boolean perContextSummarization = false;
 
     public EventsConfiguration build() {
       return new EventsConfiguration(
@@ -347,7 +348,8 @@ public EventsConfiguration build() {
           flushIntervalMillis,
           initiallyInBackground,
           initiallyOffline,
-          privateAttributes
+          privateAttributes,
+          perContextSummarization
           );
     }
 
@@ -410,6 +412,11 @@ public EventsConfigurationBuilder privateAttributes(Set<AttributeRef> privateAtt
       this.privateAttributes = privateAttributes;
       return this;
     }
+
+    public EventsConfigurationBuilder perContextSummarization(boolean perContextSummarization) {
+      this.perContextSummarization = perContextSummarization;
+      return this;
+    }
   }
 
   public static EventContextDeduplicator contextDeduplicatorThatAlwaysSaysKeysAreNew() {