Serialize properties in impression

.github/workflows/instrumented.yml

@@ -9,15 +9,21 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
       matrix:
         api-level: [ 29 ]
-        shard: [ 0, 1, 2, 3 ]
+        shard: [ 0, 1, 2, 3, 4, 5 ]
 
     steps:
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
       - name: checkout
         uses: actions/checkout@v4
 
@@ -40,12 +46,6 @@ jobs:
             ~/.android/adb*
           key: avd-${{ matrix.api-level }}
 
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-
       - name: create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
@@ -65,4 +65,4 @@ jobs:
         with:
           api-level: ${{ matrix.api-level }}
           profile: Galaxy Nexus
-          script: ./gradlew connectedCheck --continue -Pandroid.testInstrumentationRunnerArguments.numShards=4 -Pandroid.testInstrumentationRunnerArguments.shardIndex=${{ matrix.shard }}
+          script: ./gradlew connectedCheck --continue -Pandroid.testInstrumentationRunnerArguments.numShards=6 -Pandroid.testInstrumentationRunnerArguments.shardIndex=${{ matrix.shard }}

src/androidTest/java/io/split/android/client/service/impressions/observer/ImpressionsObserverTest.java

@@ -47,6 +47,7 @@ private List<Impression> generateImpressions(long count) {
                     System.currentTimeMillis(),
                     (i % 2 == 0) ? "in segment all" : "whitelisted",
                     i * i,
+                    null,
                     null);
             imps.add(imp);
         }
@@ -61,6 +62,7 @@ public void testBasicFunctionality() {
                 "on", System.currentTimeMillis(),
                 "in segment all",
                 1234L,
+                null,
                 null);
 
         // Add 5 new impressions so that the old one is evicted and re-try the test.
@@ -80,13 +82,14 @@ public void testValuesArePersistedAcrossInstances() throws InterruptedException
                 "on", System.currentTimeMillis(),
                 "in segment all",
                 1234L,
+                null,
                 null);
         Impression imp2 = new Impression("someOtherKey",
                 null, "someOtherFeature",
                 "on", System.currentTimeMillis(),
                 "in segment all",
                 1234L,
-                null);
+                null, null);
 
         // These are not in the cache, so they should return null
         Long firstImp = observer.testAndSet(imp);
@@ -177,6 +180,7 @@ private void caller(ImpressionsObserver o, int count, ConcurrentLinkedQueue<Impr
                     System.currentTimeMillis(),
                     "label" + mRandom.nextInt(5),
                     1234567L,
+                    null,
                     null);
 
             i = i.withPreviousTime(o.testAndSet(i));

src/main/java/io/split/android/client/EventsTrackerImpl.java

@@ -43,6 +43,7 @@ public EventsTrackerImpl(@NonNull EventValidator eventValidator,
     public void enableTracking(boolean enable) {
         isTrackingEnabled.set(enable);
     }
+
     public boolean track(String key, String trafficType, String eventType,
                          double value, Map<String, Object> properties, boolean isSdkReady) {
 

src/main/java/io/split/android/client/impressions/Impression.java

@@ -1,5 +1,7 @@
 package io.split.android.client.impressions;
 
+import androidx.annotation.Nullable;
+
 import java.util.Map;
 
 public class Impression {
@@ -13,17 +15,20 @@ public class Impression {
     private final Long _changeNumber;
     private Long _previousTime;
     private final Map<String, Object> _attributes;
+    @Nullable
+    private final String _propertiesJson;
 
 
-    public Impression(String key, String bucketingKey, String split, String treatment, long time, String appliedRule, Long changeNumber, Map<String, Object> atributes) {
+    public Impression(String key, String bucketingKey, String split, String treatment, long time, String appliedRule, Long changeNumber, Map<String, Object> attributes, String propertiesJson) {
         _key = key;
         _bucketingKey = bucketingKey;
         _split = split;
         _treatment = treatment;
         _time = time;
         _appliedRule = appliedRule;
         _changeNumber = changeNumber;
-        _attributes = atributes;
+        _attributes = attributes;
+        _propertiesJson = propertiesJson;
     }
 
     public String key() {
@@ -58,6 +63,11 @@ public Map<String, Object> attributes() {
         return _attributes;
     }
 
+    @Nullable
+    public String properties() {
+        return _propertiesJson;
+    }
+
     public Long previousTime() {
         return _previousTime;
     }

src/main/java/io/split/android/client/localhost/LocalhostSplitClient.java

@@ -32,6 +32,7 @@
 import io.split.android.client.utils.logger.Logger;
 import io.split.android.client.validators.FlagSetsValidatorImpl;
 import io.split.android.client.validators.KeyValidatorImpl;
+import io.split.android.client.validators.PropertyValidatorImpl;
 import io.split.android.client.validators.SplitValidatorImpl;
 import io.split.android.client.validators.TreatmentManager;
 import io.split.android.client.validators.TreatmentManagerImpl;
@@ -75,7 +76,8 @@ public LocalhostSplitClient(@NonNull LocalhostSplitFactory container,
                 new EvaluatorImpl(splitsStorage, splitParser), new KeyValidatorImpl(),
                 new SplitValidatorImpl(), getImpressionsListener(splitClientConfig),
                 splitClientConfig.labelsEnabled(), eventsManager, attributesManager, attributesMerger,
-                telemetryStorageProducer, flagSetsFilter, splitsStorage, new ValidationMessageLoggerImpl(), new FlagSetsValidatorImpl());
+                telemetryStorageProducer, flagSetsFilter, splitsStorage, new ValidationMessageLoggerImpl(), new FlagSetsValidatorImpl(),
+                new PropertyValidatorImpl());
     }
 
     @Override

src/main/java/io/split/android/client/service/executor/SplitBaseTaskExecutor.java

@@ -125,6 +125,10 @@ public void submitOnMainThread(SplitTask splitTask) {
     }
 
     public void pause() {
+        long start = System.currentTimeMillis();
+        while (!mScheduledTasks.isEmpty() && (System.currentTimeMillis() - start) < 500L) {
+            try { Thread.sleep(50); } catch (InterruptedException e) { break; }
+        }
         mScheduler.pause();
     }
 

src/main/java/io/split/android/client/service/executor/SplitTaskExecutorImpl.java

@@ -6,7 +6,7 @@
 
 public class SplitTaskExecutorImpl extends SplitBaseTaskExecutor {
 
-    private static final int MIN_THREAD_POOL_SIZE_WHEN_IDLE = 2;
+    private static final int MIN_THREAD_POOL_SIZE_WHEN_IDLE = 6;
     private static final String THREAD_NAME_FORMAT = "split-taskExecutor-%d";
 
     @NonNull

src/main/java/io/split/android/client/storage/db/SplitQueryDaoImpl.java

@@ -5,13 +5,9 @@
 
 import androidx.annotation.NonNull;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import io.split.android.client.SplitClientFactoryImpl;
-import io.split.android.client.SplitFactoryImpl;
 import io.split.android.client.utils.logger.Logger;
 
 public class SplitQueryDaoImpl implements SplitQueryDao {
@@ -55,13 +51,13 @@ int getColumnIndexOrThrow(@NonNull Cursor c, @NonNull String name) {
 
     public Map<String, SplitEntity> getAllAsMap() {
         // Fast path - if the map is already initialized, return it immediately
-        if (mIsInitialized) {
+        if (mIsInitialized && !mCachedSplitsMap.isEmpty()) {
             return new HashMap<>(mCachedSplitsMap);
         }
 
         // Wait for initialization to complete if it's in progress
         synchronized (mLock) {
-            if (mIsInitialized) {
+            if (mIsInitialized && !mCachedSplitsMap.isEmpty()) {
                 return new HashMap<>(mCachedSplitsMap);
             }
 

src/main/java/io/split/android/client/validators/PropertyValidator.java

@@ -0,0 +1,58 @@
+package io.split.android.client.validators;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Map;
+
+public interface PropertyValidator {
+
+    Result validate(Map<String, Object> properties);
+
+    Result validate(Map<String, Object> properties, int initialSizeInBytes, String validationTag);
+
+    class Result {
+
+        private final boolean mIsValid;
+        @Nullable
+        private final Map<String, Object> mValidatedProperties;
+        private final int mSizeInBytes;
+        @Nullable
+        private final String mErrorMessage;
+
+        private Result(boolean isValid, Map<String, Object> properties, int sizeInBytes, String errorMessage) {
+            mIsValid = isValid;
+            mValidatedProperties = properties;
+            mSizeInBytes = sizeInBytes;
+            mErrorMessage = errorMessage;
+        }
+
+        public boolean isValid() {
+            return mIsValid;
+        }
+
+        @Nullable
+        public Map<String, Object> getValidatedProperties() {
+            return mValidatedProperties;
+        }
+
+        public int getSizeInBytes() {
+            return mSizeInBytes;
+        }
+
+        @Nullable
+        public String getErrorMessage() {
+            return mErrorMessage;
+        }
+
+        @NonNull
+        public static Result valid(Map<String, Object> properties, int sizeInBytes) {
+            return new Result(true, properties, sizeInBytes, null);
+        }
+
+        @NonNull
+        public static Result invalid(String errorMessage, int sizeInBytes) {
+            return new Result(false, null, sizeInBytes, errorMessage);
+        }
+    }
+}

src/main/java/io/split/android/client/validators/PropertyValidatorImpl.java

@@ -0,0 +1,16 @@
+package io.split.android.client.validators;
+
+import java.util.Map;
+
+public class PropertyValidatorImpl implements PropertyValidator {
+
+    @Override
+    public Result validate(Map<String, Object> properties) {
+        return Result.valid(properties, 0); // TODO implement
+    }
+
+    @Override
+    public Result validate(Map<String, Object> properties, int initialSizeInBytes, String validationTag) {
+        return Result.valid(properties, initialSizeInBytes);
+    }
+}

src/main/java/io/split/android/client/validators/TreatmentManager.java

@@ -11,24 +11,6 @@
 
 public interface TreatmentManager {
 
-    String getTreatment(String split, Map<String, Object> attributes, boolean isClientDestroyed);
-
-    SplitResult getTreatmentWithConfig(String split, Map<String, Object> attributes, boolean isClientDestroyed);
-
-    Map<String, String> getTreatments(List<String> splits, Map<String, Object> attributes, boolean isClientDestroyed);
-
-    Map<String, SplitResult> getTreatmentsWithConfig(List<String> splits, Map<String, Object> attributes, boolean isClientDestroyed);
-
-    Map<String, String> getTreatmentsByFlagSet(@NonNull String flagSet, @Nullable Map<String, Object> attributes, boolean isClientDestroyed);
-
-    Map<String, String> getTreatmentsByFlagSets(@NonNull List<String> flagSets, @Nullable Map<String, Object> attributes, boolean isClientDestroyed);
-
-    Map<String, SplitResult> getTreatmentsWithConfigByFlagSet(@NonNull String flagSet, @Nullable Map<String, Object> attributes, boolean isClientDestroyed);
-
-    Map<String, SplitResult> getTreatmentsWithConfigByFlagSets(@NonNull List<String> flagSets, @Nullable Map<String, Object> attributes, boolean isClientDestroyed);
-
-
-    // temporary methods to reduce changes in this iteration
     String getTreatment(String split, Map<String, Object> attributes, EvaluationOptions evaluationOptions, boolean isClientDestroyed);
 
     SplitResult getTreatmentWithConfig(String split, Map<String, Object> attributes, EvaluationOptions evaluationOptions, boolean isClientDestroyed);