Merge branch 'development' into feature/rule-based-segment

Author: chillaq

CHANGES.txt

@@ -1,3 +1,7 @@
+4.15.0 (Apr 18, 2025)
+- Prevent polling threads from starting when the SDK calls destroy method.
+- Added a new optional argument to the client `getTreatment` methods to allow passing additional evaluation options, such as a map of properties to append to the generated impressions sent to Split backend. Read more in our docs.
+
 4.14.0 (Jan 17, 2025)
 - Added support for the new impressions tracking toggle available on feature flags, both respecting the setting and including the new field being returned on SplitView type objects. Read more in our docs.
 - Cleaned unused imports to fix a collision issue.

client/pom.xml

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

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

@@ -61,6 +61,7 @@ private SplitChange processSplitChange(SplitChange splitChange, long changeNumbe
             _log.warn("The till is lower than the change number or different to -1");
             return null;
         }
+      
         byte [] currHashFeatureFlags = getStringDigest(splitChange.featureFlags.d.toString());
         byte [] currHashRuleBasedSegments = getStringDigest(splitChange.ruleBasedSegments.d.toString());
         //if sha exist and is equal to before sha, or if till is equal to default till returns the same segmentChange with till equals to storage CN

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

@@ -552,7 +552,7 @@ private String validateProperties(Map<String, Object> properties) {
 
          ImpressionPropertiesValidator.ImpressionPropertiesValidatorResult iPValidatorResult = ImpressionPropertiesValidator.propertiesAreValid(
                     properties);
-         return  new GsonBuilder().create().toJson(iPValidatorResult.getValue()).toString();
+         return  new GsonBuilder().create().toJson(iPValidatorResult.getValue());
     }
 
     private Map<String, SplitResult> getTreatmentsWithConfigInternal(String matchingKey, String bucketingKey, List<String> featureFlagNames,

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

@@ -130,7 +130,7 @@ public class SplitFactoryImpl implements SplitFactory {
     private static final org.slf4j.Logger _log = LoggerFactory.getLogger(SplitFactoryImpl.class);
     private static final String LEGACY_LOG_MESSAGE = "The sdk initialize in localhost mode using Legacy file. The splitFile or "
             +
-            "inputStream doesn't add it to the config.";
+            "inputStream are not added to the config.";
     private final static long SSE_CONNECT_TIMEOUT = 30000;
     private final static long SSE_SOCKET_TIMEOUT = 70000;
 

client/src/main/java/io/split/client/dtos/EvaluationOptions.java

@@ -10,5 +10,5 @@ public EvaluationOptions(Map<String, Object> properties) {
     }
     public Map<String, Object> getProperties() {
         return _properties;
-    };
+    }
 }

client/src/main/java/io/split/client/dtos/KeyImpression.java

@@ -17,8 +17,6 @@ public class KeyImpression {
     /* package private */ static final String FIELD_PREVIOUS_TIME = "pt";
     /* package private */ static final String FIELD_PROPERTIES = "properties";
 
-    public static int MAX_PROPERTIES_LENGTH_BYTES = 32 * 1024;
-
     public transient String feature; // Non-serializable
 
     @SerializedName(FIELD_KEY_NAME)

client/src/main/java/io/split/client/impressions/strategy/ProcessImpressionOptimized.java

@@ -32,16 +32,14 @@ public ProcessImpressionOptimized(boolean listenerEnabled, ImpressionObserver im
     public ImpressionsResult process(List<Impression> impressions) {
         List<Impression> impressionsToQueue = new ArrayList<>();
         for(Impression impression : impressions) {
-            if (impression.properties() != null) {
-                impressionsToQueue.add(impression);
-                continue;
-            }
-            impression = impression.withPreviousTime(_impressionObserver.testAndSet(impression));
-            if(!Objects.isNull(impression.pt()) && impression.pt() != 0){
-                _impressionCounter.inc(impression.split(), impression.time(), 1);
-            }
-            if(shouldntQueueImpression(impression)) {
-                continue;
+            if (impression.properties() == null) {
+                impression = impression.withPreviousTime(_impressionObserver.testAndSet(impression));
+                if (!Objects.isNull(impression.pt()) && impression.pt() != 0) {
+                    _impressionCounter.inc(impression.split(), impression.time(), 1);
+                }
+                if (shouldntQueueImpression(impression)) {
+                    continue;
+                }
             }
             impressionsToQueue.add(impression);
         }

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

@@ -219,6 +219,11 @@ private void startPollingMode() {
                     case STREAMING_DOWN:
                         _log.info("Streaming service temporarily unavailable, working in polling mode.");
                         _pushManager.stopWorkers();
+                        //  if the whole SDK is being shutdown, don't start polling,
+                        //  in case the polling threads are not terminated and a graceful shutdown will fail.
+                        if(_shuttedDown.get()) {
+                            break;
+                        }
                         _synchronizer.startPeriodicFetching();
                         break;
                     case STREAMING_BACKOFF:

client/src/main/java/io/split/inputValidation/ImpressionPropertiesValidator.java

@@ -3,6 +3,9 @@
 import java.util.Map;
 
 public class ImpressionPropertiesValidator {
+    ImpressionPropertiesValidator() {
+        throw new IllegalStateException("Utility class");
+    }
 
     public static ImpressionPropertiesValidatorResult propertiesAreValid(Map<String, Object> properties) {
         EventsValidator.EventValidatorResult result = EventsValidator.propertiesAreValid(properties);