Fixing final stats sync

Author: ldecheverz-split

client/src/main/java/io/split/client/SplitFactoryImpl.java

@@ -182,18 +182,22 @@ public synchronized void destroy() {
         if (!isTerminated) {
             _log.info("Shutdown called for split");
             try {
-                _segmentSynchronizationTaskImp.close();
-                _log.info("Successful shutdown of segment fetchers");
-                _splitSynchronizationTask.close();
-                _log.info("Successful shutdown of splits");
+                long splitCount = _splitCache.getAll().stream().count();
+                long segmentCount = _segmentCache.getAll().stream().count();
+                long segmentKeyCount = _segmentCache.getAllKeys().stream().count();
                 _impressionsManager.close();
                 _log.info("Successful shutdown of impressions manager");
                 _eventClient.close();
                 _log.info("Successful shutdown of eventClient");
+                _segmentSynchronizationTaskImp.close();
+                _log.info("Successful shutdown of segment fetchers");
+                _splitSynchronizationTask.close();
+                _log.info("Successful shutdown of splits");
                 _syncManager.shutdown();
                 _log.info("Successful shutdown of syncManager");
                 _telemetryStorage.recordSessionLength(System.currentTimeMillis() - _startTime);
-                _telemetrySyncTask.stopScheduledTask();
+                _telemetrySyncTask.stopScheduledTask(splitCount, segmentCount, segmentKeyCount);
+                _log.info("Successful shutdown of telemetry sync task");
                 _httpclient.close();
                 _log.info("Successful shutdown of httpclient");
             } catch (IOException e) {

client/src/main/java/io/split/telemetry/synchronizer/TelemetrySubmitter.java

@@ -54,6 +54,15 @@ public void synchronizeStats() throws Exception {
         _httpHttpTelemetryMemorySender.postStats(generateStats());
     }
 
+    @Override
+    public void finalSynchronization(long splitCount, long segmentCount, long segmentKeyCount) throws Exception {
+        Stats stats = generateStats();
+        stats.set_splitCount(splitCount);
+        stats.set_segmentCount(segmentCount);
+        stats.set_segmentKeyCount(segmentKeyCount);
+        _httpHttpTelemetryMemorySender.postStats(stats);
+    }
+
     @VisibleForTesting
     Stats generateStats() throws Exception {
         Stats stats = new Stats();

client/src/main/java/io/split/telemetry/synchronizer/TelemetrySyncTask.java

@@ -30,19 +30,19 @@ public TelemetrySyncTask(int telemetryRefreshRate, TelemetrySynchronizer telemet
     }
 
     @VisibleForTesting
-    protected void startScheduledTask() throws Exception {
+    protected void startScheduledTask() {
         _telemetrySyncScheduledExecutorService.scheduleWithFixedDelay(() -> {
             try {
                 _telemetrySynchronizer.synchronizeStats();
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        },0l,  _telemetryRefreshRate, TimeUnit.SECONDS);
+        },_telemetryRefreshRate,  _telemetryRefreshRate, TimeUnit.SECONDS);
     }
 
-    public void stopScheduledTask() {
+    public void stopScheduledTask(long splitCount, long segmentCount, long segmentKeyCount) {
         try {
-            _telemetrySynchronizer.synchronizeStats();
+            _telemetrySynchronizer.finalSynchronization(splitCount, segmentCount, segmentKeyCount);
         } catch (Exception e) {
             e.printStackTrace();
         }

client/src/main/java/io/split/telemetry/synchronizer/TelemetrySynchronizer.java

@@ -8,4 +8,5 @@
 public interface TelemetrySynchronizer {
     void synchronizeConfig(SplitClientConfig config, long timeUntilReady, Map<String, Long> factoryInstances, List<String> tags);
     void synchronizeStats() throws Exception;
+    void finalSynchronization(long splitCount, long segmentCount, long segmentKeyCount) throws Exception;
 }

client/src/test/java/io/split/telemetry/synchronizer/TelemetrySyncTaskTest.java

@@ -11,7 +11,7 @@ public void testSynchronizationTask() throws Exception {
         Mockito.doNothing().when(telemetrySynchronizer).synchronizeStats();
         TelemetrySyncTask telemetrySyncTask = new TelemetrySyncTask(1, telemetrySynchronizer);
         Thread.sleep(2900);
-        Mockito.verify(telemetrySynchronizer, Mockito.times(3)).synchronizeStats();
+        Mockito.verify(telemetrySynchronizer, Mockito.times(2)).synchronizeStats();
     }
 
     @Test
@@ -20,11 +20,11 @@ public void testStopSynchronizationTask() throws Exception {
 //        Mockito.doNothing().when(telemetrySynchronizer).synchronizeStats();
         TelemetrySyncTask telemetrySyncTask = new TelemetrySyncTask(1, telemetrySynchronizer);
         Thread.sleep(3000);
-        Mockito.verify(telemetrySynchronizer, Mockito.times(3)).synchronizeStats();
-        telemetrySyncTask.stopScheduledTask();
+        Mockito.verify(telemetrySynchronizer, Mockito.times(2)).synchronizeStats();
+        telemetrySyncTask.stopScheduledTask(1l, 1l, 1l);
         Thread.sleep(2000);
-        Mockito.verify(telemetrySynchronizer, Mockito.times(4)).synchronizeStats();
-
+        Mockito.verify(telemetrySynchronizer, Mockito.times(2)).synchronizeStats();
+        Mockito.verify(telemetrySynchronizer, Mockito.times(1)).finalSynchronization(1l, 1l, 1l);
     }
 
 }