Added immediate socket close option

Author: chillaq

client/pom.xml

@@ -5,9 +5,9 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.18.1-rc3</version>
+        <version>4.18.1-rc5</version>
     </parent>
-    <version>4.18.1-rc3</version>
+    <version>4.18.1-rc5</version>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>
     <name>Java Client</name>

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

@@ -112,8 +112,6 @@ private HttpScheme() {
     private final CustomHeaderDecorator _customHeaderDecorator;
     private final CustomHttpModule _alternativeHTTPModule;
 
-    private final int _streamingTokenRefreshRate;
-
     public static Builder builder() {
         return new Builder();
     }
@@ -172,8 +170,7 @@ private SplitClientConfig(String endpoint,
                               int invalidSets,
                               CustomHeaderDecorator customHeaderDecorator,
                               CustomHttpModule alternativeHTTPModule,
-                              FallbackTreatmentsConfiguration fallbackTreatments,
-                              int streamingTokenRefreshRate) {
+                              FallbackTreatmentsConfiguration fallbackTreatments) {
         _endpoint = endpoint;
         _eventsEndpoint = eventsEndpoint;
         _featuresRefreshRate = pollForFeatureChangesEveryNSeconds;
@@ -229,7 +226,6 @@ private SplitClientConfig(String endpoint,
         _customHeaderDecorator = customHeaderDecorator;
         _alternativeHTTPModule = alternativeHTTPModule;
         _fallbackTreatments = fallbackTreatments;
-        _streamingTokenRefreshRate = streamingTokenRefreshRate;
 
         Properties props = new Properties();
         try {
@@ -450,8 +446,6 @@ public boolean isSdkEndpointOverridden() {
 
     public FallbackTreatmentsConfiguration fallbackTreatments() { return _fallbackTreatments; }
 
-    public int streamingTokenRefreshRate() { return _streamingTokenRefreshRate; }
-
     public static final class Builder {
         private String _endpoint = SDK_ENDPOINT;
         private boolean _endpointSet = false;
@@ -511,7 +505,6 @@ public static final class Builder {
         private CustomHeaderDecorator _customHeaderDecorator = null;
         private CustomHttpModule _alternativeHTTPModule = null;
         private FallbackTreatmentsConfiguration _fallbackTreatments;
-        private int _streamingTokenRefreshRate = 180;
 
         public Builder() {
         }
@@ -1062,11 +1055,6 @@ public Builder threadFactory(ThreadFactory threadFactory) {
             return this;
         }
 
-        public Builder streamingTokenRefreshRate(int streamingTokenRefreshRate) {
-            _streamingTokenRefreshRate = streamingTokenRefreshRate;
-            return this;
-        }
-
         private void verifyRates() {
             if (_featuresRefreshRate < 5 ) {
                 throw new IllegalArgumentException("featuresRefreshRate must be >= 5: " + _featuresRefreshRate);
@@ -1087,10 +1075,6 @@ private void verifyRates() {
             if(_telemetryRefreshRate < 60) {
                 throw new IllegalStateException("_telemetryRefreshRate must be >= 60");
             }
-
-            if (_streamingTokenRefreshRate < 60) {
-                throw new IllegalStateException("_streamingTokenRefreshRate must be >= 60");
-            }
         }
 
         private void verifyEndPoints() {
@@ -1291,8 +1275,7 @@ public SplitClientConfig build() {
                     _invalidSetsCount,
                     _customHeaderDecorator,
                     _alternativeHTTPModule,
-                    _fallbackTreatments,
-                    _streamingTokenRefreshRate);
+                    _fallbackTreatments);
         }
     }
 }

client/src/main/java/io/split/engine/common/PushManagerImp.java

@@ -52,7 +52,6 @@ public class PushManagerImp implements PushManager {
     private final ScheduledExecutorService _scheduledExecutorService;
     private AtomicLong _expirationTime;
     private final TelemetryRuntimeProducer _telemetryRuntimeProducer;
-    private final int _streamingTokenRefreshRate;
 
     @VisibleForTesting
     /* package private */ PushManagerImp(AuthApiClient authApiClient,
@@ -61,8 +60,7 @@ public class PushManagerImp implements PushManager {
                                          Worker<SegmentQueueDto> segmentWorker,
                                          PushStatusTracker pushStatusTracker,
                                          TelemetryRuntimeProducer telemetryRuntimeProducer,
-                                         ThreadFactory threadFactory,
-                                         int streamingTokenRefreshRate) {
+                                         ThreadFactory threadFactory) {
 
         _authApiClient = checkNotNull(authApiClient);
         _eventSourceClient = checkNotNull(eventSourceClient);
@@ -72,7 +70,6 @@ public class PushManagerImp implements PushManager {
         _expirationTime = new AtomicLong();
         _scheduledExecutorService = buildSingleThreadScheduledExecutor(threadFactory, "Split-SSERefreshToken-%d");
         _telemetryRuntimeProducer = checkNotNull(telemetryRuntimeProducer);
-        _streamingTokenRefreshRate = streamingTokenRefreshRate;
     }
 
     public static PushManagerImp build(Synchronizer synchronizer,
@@ -86,8 +83,7 @@ public static PushManagerImp build(Synchronizer synchronizer,
                                        SplitCacheProducer splitCacheProducer,
                                        FlagSetsFilter flagSetsFilter,
                                        RuleBasedSegmentCache ruleBasedSegmentCache,
-                                       RuleBasedSegmentParser ruleBasedSegmentParser,
-                                       int streamingTokenRefreshRate) {
+                                       RuleBasedSegmentParser ruleBasedSegmentParser) {
         FeatureFlagsWorker featureFlagsWorker = new FeatureFlagWorkerImp(synchronizer, splitParser, ruleBasedSegmentParser, splitCacheProducer,
                 ruleBasedSegmentCache, telemetryRuntimeProducer, flagSetsFilter);
         Worker<SegmentQueueDto> segmentWorker = new SegmentsWorkerImp(synchronizer);
@@ -100,26 +96,23 @@ public static PushManagerImp build(Synchronizer synchronizer,
                 segmentWorker,
                 pushStatusTracker,
                 telemetryRuntimeProducer,
-                threadFactory,
-                streamingTokenRefreshRate);
+                threadFactory);
     }
 
     @Override
     public void start() {
-        _log.debug("#1 - Start PushManagerImp");
         try {
             lock.lock();
             AuthenticationResponse response = _authApiClient.Authenticate();
             _log.debug(String.format("Auth service response pushEnabled: %s", response.isPushEnabled()));
             if (response.isPushEnabled() && startSse(response.getToken(), response.getChannels())) {
                 _log.debug("#2 - PushManagerImp connected");
-                _expirationTime.set(_streamingTokenRefreshRate);
+                _expirationTime.set(response.getExpiration());
                 _telemetryRuntimeProducer.recordStreamingEvents(new StreamingEvent(StreamEventsEnum.TOKEN_REFRESH.getType(),
                         response.getExpiration(), System.currentTimeMillis()));
                 return;
             }
 
-            _log.debug("#3 - PushManagerImp error");
             cleanUpResources();
             if (response.isRetry()) {
                 _log.debug(String.format("Handling retry error response"));
@@ -128,7 +121,6 @@ public void start() {
                 _log.debug(String.format("Auth service response is disabled: %s", response.getToken()));
                 _pushStatusTracker.forcePushDisable();
             }
-            _log.debug("#4 - PushManagerImp error");
         } catch (Exception e) {
             _log.debug("Exception in PushManager start: " + e.getMessage());
         } finally {
@@ -138,11 +130,9 @@ public void start() {
 
     @Override
     public void stop() {
-        _log.debug("#1 - Stopping PushManagerImp");
         try {
             lock.lock();
             cleanUpResources();
-            _log.debug("#2 - Stopped PushManagerImp");
         } catch (Exception e) {
             _log.debug("Exception in stopping push manager: " + e.getMessage());
         } finally {
@@ -154,11 +144,8 @@ public void stop() {
     public void scheduleConnectionReset() {
         _log.debug(String.format("scheduleNextTokenRefresh in %s SECONDS", _expirationTime));
         _nextTokenRefreshTask = _scheduledExecutorService.schedule(() -> {
-            _log.debug("#1 - Starting scheduleNextTokenRefresh ...");
             stop();
-            _log.debug("#2 - Finished to stop all streaming engine");
             start();
-            _log.debug("#3 - Finished to start streaming connection");
         }, _expirationTime.get(), TimeUnit.SECONDS);
     }
 
@@ -175,9 +162,7 @@ private boolean startSse(String token, String channels) {
     @Override
     public void startWorkers() {
         try {
-            _log.debug("Starting featureflag worker");
             _featureFlagsWorker.start();
-            _log.debug("Starting segment worker");
             _segmentWorker.start();
         } catch (Exception e) {
             _log.debug("Exception in starting workers: " + e.getMessage());
@@ -187,25 +172,18 @@ public void startWorkers() {
     @Override
     public void stopWorkers() {
         try {
-            _log.debug("Stopping featureflag worker");
             _featureFlagsWorker.stop();
-            _log.debug("Stopping segment worker");
             _segmentWorker.stop();
         } catch (Exception e) {
             _log.debug("Exception in stopping workers: " + e.getMessage());
         }
     }
 
     private void cleanUpResources() {
-        _log.debug("Starting cleanUpResources - #1");
         _eventSourceClient.stop();
-        _log.debug("cleanUpResources - #2");
         stopWorkers();
         if (_nextTokenRefreshTask != null) {
-            _log.debug("Cancel nextTokenRefreshTask");
             _nextTokenRefreshTask.cancel(false);
-            _log.debug("Finished cleanUpResources - #3 - Finished cancel nextTokenRefreshTask");
         }
-        _log.debug("Finished cleanUpResources - #4");
     }
 }

client/src/main/java/io/split/engine/common/SyncManagerImp.java

@@ -116,8 +116,7 @@ public static SyncManagerImp build(SplitTasks splitTasks,
                                                         splitCacheProducer,
                                                         flagSetsFilter,
                                                         ruleBasedSegmentCache,
-                                                        ruleBasedSegmentParser,
-                                                        config.streamingTokenRefreshRate());
+                                                        ruleBasedSegmentParser);
 
         return new SyncManagerImp(splitTasks,
                                   config.streamingEnabled(),

client/src/main/java/io/split/engine/sse/client/SSEClient.java

@@ -9,6 +9,7 @@
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.core5.io.CloseMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -121,12 +122,8 @@ public void close() {
             _forcedStop.set(true);
             if (_state.compareAndSet(ConnectionState.OPEN, ConnectionState.CLOSED)) {
                 if (_ongoingResponse.get() != null) {
-                    try {
-                        _ongoingRequest.get().abort();
-                        _ongoingResponse.get().close();
-                    } catch (IOException e) {
-                        _log.debug(String.format("SSEClient close forced: %s", e.getMessage()));
-                    }
+                    _ongoingRequest.get().abort();
+                    _ongoingResponse.get().close(CloseMode.IMMEDIATE);
                 }
             }
         } catch (Exception e) {
@@ -195,14 +192,7 @@ private void connectAndLoop(URI uri, CountDownLatch signal) {
             _log.warn(e.getMessage(), e);
             _statusCallback.apply(StatusMessage.NONRETRYABLE_ERROR);
         } finally {
-            _log.debug(String.format("Attempt to close SSE connection"));
-            try {
-                _ongoingResponse.get().close();
-            } catch (IOException e) {
-                _log.debug(String.format("SSE connection closing exception: %s", e.getMessage()));
-                _log.debug(e.getMessage());
-            }
-
+            _ongoingResponse.get().close(CloseMode.IMMEDIATE);
             _state.set(ConnectionState.CLOSED);
             _log.debug("SSEClient finished.");
             _forcedStop.set(false);

client/src/main/java/io/split/engine/sse/workers/Worker.java

@@ -22,7 +22,6 @@ public Worker(String workerName) {
 
     public void start() {
         if (_running.compareAndSet(false, true)) {
-            _log.debug(String.format("%s Worker starting ...", _workerName));
             _queue.clear();
             _thread = new Thread( this);
             _thread.setName(String.format("%s-worker", _workerName));
@@ -36,7 +35,6 @@ public void start() {
 
     public  void stop() {
         if (_running.compareAndSet(true, false)) {
-            _log.debug(String.format("%s stopping Worker", _workerName));
             _thread.interrupt();
             _log.debug(String.format("%s Worked stopped.", _workerName));
         } else {

client/src/test/java/io/split/engine/common/PushManagerTest.java

@@ -40,8 +40,7 @@ public void setUp() {
                 _segmentsWorkerImp,
                 _pushStatusTracker,
                 _telemetryStorage,
-                null,
-                180);
+                null);
     }
 
     @Test

okhttp-modules/pom.xml

@@ -5,10 +5,10 @@
     <parent>
         <artifactId>java-client-parent</artifactId>
         <groupId>io.split.client</groupId>
-        <version>4.18.1-rc3</version>
+        <version>4.18.1-rc5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>4.18.1-rc3</version>
+    <version>4.18.1-rc5</version>
     <artifactId>okhttp-modules</artifactId>
     <packaging>jar</packaging>
     <name>http-modules</name>

pluggable-storage/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>java-client-parent</artifactId>
         <groupId>io.split.client</groupId>
-        <version>4.18.1-rc3</version>
+        <version>4.18.1-rc5</version>
     </parent>
 
     <version>2.1.0</version>

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.split.client</groupId>
     <artifactId>java-client-parent</artifactId>
-    <version>4.18.1-rc3</version>
+    <version>4.18.1-rc5</version>
     <dependencyManagement>
         <dependencies>
             <dependency>