Merge pull request #605 from splitio/FME-10194-upgrade-apache

upgrade apache commons

Author: chillaq

CHANGES.txt

@@ -1,3 +1,6 @@
+4.18.1 (Sep 30, 2025)
+- Fixed an issue where Streaming client hangs during token renew process.
+
 4.18.0 (Sep 12, 2025)
 - Added new configuration for Fallback Treatments, which allows setting a treatment value and optional config to be returned in place of "control", either globally or by flag. Read more in our docs.
 

client/pom.xml

@@ -5,9 +5,9 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.18.0</version>
+        <version>4.18.1</version>
     </parent>
-    <version>4.18.0</version>
+    <version>4.18.1</version>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>
     <name>Java Client</name>
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.4.4</version>
+            <version>5.5</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

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

@@ -1071,6 +1071,7 @@ private void verifyRates() {
             if (_metricsRefreshRate < 30) {
                 throw new IllegalArgumentException("metricsRefreshRate must be >= 30: " + _metricsRefreshRate);
             }
+
             if(_telemetryRefreshRate < 60) {
                 throw new IllegalStateException("_telemetryRefreshRate must be >= 60");
             }

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

@@ -118,6 +118,8 @@ public void start() {
             } else {
                 _pushStatusTracker.forcePushDisable();
             }
+        } catch (Exception e) {
+            _log.debug("Exception in PushManager start: " + e.getMessage());
         } finally {
             lock.unlock();
         }
@@ -129,6 +131,8 @@ public void stop() {
             lock.lock();
             _log.debug("Stopping PushManagerImp");
             cleanUpResources();
+        } catch (Exception e) {
+            _log.debug("Exception in stopping push manager: " + e.getMessage());
         } finally {
             lock.unlock();
         }
@@ -156,14 +160,22 @@ private boolean startSse(String token, String channels) {
 
     @Override
     public void startWorkers() {
-        _featureFlagsWorker.start();
-        _segmentWorker.start();
+        try {
+            _featureFlagsWorker.start();
+            _segmentWorker.start();
+        } catch (Exception e) {
+            _log.debug("Exception in starting workers: " + e.getMessage());
+        }
     }
 
     @Override
     public void stopWorkers() {
-        _featureFlagsWorker.stop();
-        _segmentWorker.stop();
+        try {
+            _featureFlagsWorker.stop();
+            _segmentWorker.stop();
+        } catch (Exception e) {
+            _log.debug("Exception in stopping workers: " + e.getMessage());
+        }
     }
 
     private void cleanUpResources() {
@@ -174,4 +186,4 @@ private void cleanUpResources() {
             _nextTokenRefreshTask.cancel(false);
         }
     }
-}
+}

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;
 
@@ -115,19 +116,18 @@ public boolean isOpen() {
     }
 
     public void close() {
+        _log.debug("closing SSE client");
         try {
             lock.lock();
             _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) {
+            _log.debug("Exception in closing SSE client: " + e.getMessage());
         } finally {
             lock.unlock();
         }
@@ -184,19 +184,15 @@ private void connectAndLoop(URI uri, CountDownLatch signal) {
                 }
             }
         } catch (Exception e) { // Any other error non related to the connection disables streaming altogether
+            _log.debug(String.format("SSE connection exception: %s", e.getMessage()));
             _telemetryRuntimeProducer
                     .recordStreamingEvents(new StreamingEvent(StreamEventsEnum.SSE_CONNECTION_ERROR.getType(),
                             StreamEventsEnum.SseConnectionErrorValues.NON_REQUESTED_CONNECTION_ERROR.getValue(),
                             System.currentTimeMillis()));
             _log.warn(e.getMessage(), e);
             _statusCallback.apply(StatusMessage.NONRETRYABLE_ERROR);
         } finally {
-            try {
-                _ongoingResponse.get().close();
-            } catch (IOException e) {
-                _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,11 +22,11 @@ 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));
             _thread.start();
+            _log.debug(String.format("%s Worker started ...", _workerName));
         } else {
             _log.debug(String.format("%s Worker already running.", _workerName));
             return;

okhttp-modules/pom.xml

@@ -5,10 +5,10 @@
     <parent>
         <artifactId>java-client-parent</artifactId>
         <groupId>io.split.client</groupId>
-        <version>4.18.0</version>
+        <version>4.18.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>4.18.0</version>
+    <version>4.18.1</version>
     <artifactId>okhttp-modules</artifactId>
     <packaging>jar</packaging>
     <name>http-modules</name>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.4.1</version>
+            <version>5.5</version>
         </dependency>
         <!-- Test deps -->
         <dependency>

pluggable-storage/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>java-client-parent</artifactId>
         <groupId>io.split.client</groupId>
-        <version>4.18.0</version>
+        <version>4.18.1</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.0</version>
+    <version>4.18.1</version>
     <dependencyManagement>
         <dependencies>
             <dependency>

redis-wrapper/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>java-client-parent</artifactId>
         <groupId>io.split.client</groupId>
-        <version>4.18.0</version>
+        <version>4.18.1</version>
     </parent>
     <artifactId>redis-wrapper</artifactId>
     <version>3.1.1</version>