Nullable tracker value

build.gradle

@@ -20,7 +20,7 @@ if (rootProject.name == 'android-client') {
 }
 
 ext {
-    splitVersion = '5.5.1'
+    splitVersion = '5.5.2-rc1'
     jacocoVersion = '0.8.8'
 }
 

main/src/androidTest/java/tests/database/TrackDaoTest.java

@@ -156,7 +156,7 @@ private List<EventEntity> generateData(int from, int to, long timestamp, boolean
             trackEvent.trafficTypeName = "traffic_" + i;
             trackEvent.eventTypeId = "type_" + i;
             trackEvent.key = "key";
-            trackEvent.value = i;
+            trackEvent.value = (double) i;
             trackEvent.timestamp = timestamp + i;
 
             EventEntity eventEntity = new EventEntity();

main/src/androidTest/java/tests/integration/TrackTest.java

@@ -2,11 +2,16 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
+import android.util.Log;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonParser;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -30,6 +35,8 @@
 import io.split.android.client.SplitClient;
 import io.split.android.client.SplitClientConfig;
 import io.split.android.client.SplitFactory;
+import java.util.Objects;
+
 import io.split.android.client.SplitFactoryBuilder;
 import io.split.android.client.api.Key;
 import io.split.android.client.dtos.Event;
@@ -49,13 +56,15 @@
     ArrayList<String> mJsonChanges = null;
     ArrayList<CountDownLatch> mLatchs;
     ArrayList<List<Event>> mEventsHits;
+    ArrayList<String> mRawEventsHitBodies;
 
     @Before
     public void setup() {
         mContext = InstrumentationRegistry.getInstrumentation().getContext();
         mCurReqId = 0;
         mLatchs = new ArrayList<>();
         mEventsHits = new ArrayList<>();
+        mRawEventsHitBodies = new ArrayList<>();
         for (int i = 0; i < 6; i++) {
             mLatchs.add(new CountDownLatch(1));
         }
@@ -89,7 +98,9 @@
                         if (index > 0 && index < 4) {
                             code = 500;
                         } else {
-                            List<Event> data = IntegrationHelper.buildEventsFromJson(request.getBody().readUtf8());
+                            String body = request.getBody().readUtf8();
+                            mRawEventsHitBodies.add(body);
+                            List<Event> data = IntegrationHelper.buildEventsFromJson(body);
                             mEventsHits.add(data);
                             code = 200;
                         }
@@ -261,6 +272,65 @@
         assertEquals(158576837, event.properties.get("id"));
     }
 
+    @Test
+    public void trackWithNullValueSendsNullInPayload() throws InterruptedException, SplitInstantiationException {
+        CountDownLatch latch = new CountDownLatch(1);
+        String apiKey = IntegrationHelper.dummyApiKey();
+        SplitRoomDatabase splitRoomDatabase = DatabaseHelper.getTestDatabase(mContext);
+        splitRoomDatabase.clearAllTables();
+
+        final String url = mWebServer.url("/").url().toString();
+
+        Key key = new Key("CUSTOMER_ID", null);
+        SplitClientConfig config = new TestableSplitConfigBuilder()
+                .serviceEndpoints(ServiceEndpoints
+                        .builder()
+                        .apiEndpoint(url)
+                        .eventsEndpoint(url)
+                        .build())
+                .ready(30000)
+                .eventFlushInterval(5)
+                .eventsPerPush(5)
+                .eventsQueueSize(1000)
+                .enableDebug()
+                .trafficType("client")
+                .build();
+
+        SplitFactory splitFactory = SplitFactoryBuilder.build(apiKey, key, config, mContext);
+
+        SplitClient client = splitFactory.client();
+
+        SplitEventTaskHelper readyTask = new SplitEventTaskHelper(latch);
+        SplitEventTaskHelper readyTimeOutTask = new SplitEventTaskHelper(latch);
+
+        client.on(SplitEvent.SDK_READY, readyTask);
+        client.on(SplitEvent.SDK_READY_TIMED_OUT, readyTimeOutTask);
+
+        latch.await(20, TimeUnit.SECONDS);
+
+        client.track("trafficType", "no-value-event");
+        mLatchs.get(0).await(20, TimeUnit.SECONDS);
+        Thread.sleep(500);
+
+        assertNotNull("Expected at least one events/bulk hit", mRawEventsHitBodies.isEmpty() ? null : mRawEventsHitBodies.get(0));
+        String rawBody = mRawEventsHitBodies.get(0);
+        Log.d("Track_test", rawBody);
+        JsonArray events = JsonParser.parseString(rawBody).getAsJsonArray();
+        boolean found = false;
+        for (int i = 0; i < events.size(); i++) {
+            if ("no-value-event".equals(events.get(i).getAsJsonObject().get("eventTypeId").getAsString())) {
+                assertTrue("Expected value to be null in JSON payload, but got: " +
+                        events.get(i).getAsJsonObject().get("value"),
+                        events.get(i).getAsJsonObject().get("value").isJsonNull());
+                found = true;
+                break;
+            }
+        }
+        assertTrue("Event 'no-value-event' not found in payload", found);
+
+        client.destroy();
+    }
+
     private String emptyChanges() {
         return IntegrationHelper.emptySplitChanges(9567456937869L, 9567456937869L);
     }
@@ -271,7 +341,7 @@
             List<Event> events = mEventsHits.get(i);
             if (events != null) {
                 Optional<Event> oe = events.stream()
-                        .filter(event -> event.eventTypeId.equals(type) && event.value == value).findFirst();
+                        .filter(event -> event.eventTypeId.equals(type) && Objects.equals(event.value, value)).findFirst();
                 if (oe.isPresent()) {
                     return oe.get();
                 }

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

@@ -38,8 +38,6 @@ public final class SplitClientImpl implements SplitClient {
     private final AttributesManager mAttributesManager;
     private final Tracker mEventsTracker;
 
-    private static final double TRACK_DEFAULT_VALUE = 0.0;
-
     private boolean mIsClientDestroyed = false;
 
     public SplitClientImpl(SplitFactory container,
@@ -219,7 +217,7 @@ public void addEventListener(@NonNull SplitEventListener listener) {
 
     @Override
     public boolean track(String trafficType, String eventType) {
-        return track(mKey.matchingKey(), trafficType, eventType, TRACK_DEFAULT_VALUE, null);
+        return track(mKey.matchingKey(), trafficType, eventType, null, null);
     }
 
     @Override
@@ -229,7 +227,7 @@ public boolean track(String trafficType, String eventType, double value) {
 
     @Override
     public boolean track(String eventType) {
-        return track(mKey.matchingKey(), mConfig.trafficType(), eventType, TRACK_DEFAULT_VALUE, null);
+        return track(mKey.matchingKey(), mConfig.trafficType(), eventType, null, null);
     }
 
     @Override
@@ -239,7 +237,7 @@ public boolean track(String eventType, double value) {
 
     @Override
     public boolean track(String trafficType, String eventType, Map<String, Object> properties) {
-        return track(mKey.matchingKey(), trafficType, eventType, TRACK_DEFAULT_VALUE, properties);
+        return track(mKey.matchingKey(), trafficType, eventType, null, properties);
     }
 
     @Override
@@ -249,15 +247,15 @@ public boolean track(String trafficType, String eventType, double value, Map<Str
 
     @Override
     public boolean track(String eventType, Map<String, Object> properties) {
-        return track(mKey.matchingKey(), mConfig.trafficType(), eventType, TRACK_DEFAULT_VALUE, properties);
+        return track(mKey.matchingKey(), mConfig.trafficType(), eventType, null, properties);
     }
 
     @Override
     public boolean track(String eventType, double value, Map<String, Object> properties) {
         return track(mKey.matchingKey(), mConfig.trafficType(), eventType, value, properties);
     }
 
-    private boolean track(String key, String trafficType, String eventType, double value, Map<String, Object> properties) {
+    private boolean track(String key, String trafficType, String eventType, Double value, Map<String, Object> properties) {
         if (mIsClientDestroyed) {
             mValidationLogger.e("Client has already been destroyed - no calls possible", "track");
             return false;

main/src/main/java/io/split/android/client/dtos/SerializableEvent.java

@@ -21,7 +21,7 @@ public class SerializableEvent {
     @SerializedName(KEY_FIELD)
     public String key;
     @SerializedName(VALUE_FIELD)
-    public double value;
+    public Double value;
     @SerializedName(TIMESTAMP_FIELD)
     public long timestamp;
     @SerializedName(PROPERTIES_FIELD)
@@ -31,8 +31,8 @@ public class SerializableEvent {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        Event event = (Event) o;
-        return Double.compare(event.value, value) == 0 &&
+        SerializableEvent event = (SerializableEvent) o;
+        return Objects.equals(value, event.value) &&
                 timestamp == event.timestamp &&
                 Objects.equals(eventTypeId, event.eventTypeId) &&
                 Objects.equals(trafficTypeName, event.trafficTypeName) &&

main/src/main/java/io/split/android/client/utils/deserializer/EventDeserializer.java

@@ -28,7 +28,8 @@
         event.eventTypeId = jsonObject.get(Event.EVENT_TYPE_FIELD).getAsString();
         event.trafficTypeName = jsonObject.get(Event.TRAFFIC_TYPE_NAME_FIELD).getAsString();
         event.key = jsonObject.get(Event.KEY_FIELD).getAsString();
-        event.value = jsonObject.get(Event.VALUE_FIELD).getAsDouble();
+        JsonElement valueElement = jsonObject.get(Event.VALUE_FIELD);
+        event.value = (valueElement != null && !valueElement.isJsonNull()) ? valueElement.getAsDouble() : null;
         event.timestamp = jsonObject.get(Event.TIMESTAMP_FIELD).getAsLong();
         event.properties = buildMappedProperties(properties);
 

main/src/test/java/io/split/android/client/storage/events/SqLitePersistentEventsStorageTest.java

@@ -130,7 +130,7 @@ public void entityForModelEncryptsBody() {
         mStorage.entityForModel(event);
 
         verify(mSplitCipher).encrypt("{\"sizeInBytes\":0,\"eventTypeId\":\"test_event_0\"," +
-                "\"trafficTypeName\":\"custom\",\"key\":\"key1\",\"value\":0,\"timestamp\":0," +
+                "\"trafficTypeName\":\"custom\",\"key\":\"key1\",\"value\":null,\"timestamp\":0," +
                 "\"properties\":{}}");
     }
 

tracker/src/main/java/io/split/android/client/tracker/DefaultTracker.java

@@ -56,7 +56,7 @@ public void enableTracking(boolean enable) {
 
     @Override
     public boolean track(String key, String trafficType, String eventType,
-                         double value, Map<String, Object> properties, boolean isSdkReady) {
+                         Double value, Map<String, Object> properties, boolean isSdkReady) {
         if (!isTrackingEnabled.get()) {
             mTrackerLogger.v("Event not tracked because tracking is disabled");
             return false;

tracker/src/main/java/io/split/android/client/tracker/Tracker.java

@@ -5,6 +5,6 @@
 public interface Tracker {
     void enableTracking(boolean enable);
 
-    boolean track(String key, String trafficType, String eventType, double value,
+    boolean track(String key, String trafficType, String eventType, Double value,
                   Map<String, Object> properties, boolean isSdkReady);
 }

tracker/src/main/java/io/split/android/client/tracker/TrackerEvent.java

@@ -10,7 +10,7 @@
     public String trafficType;
     public String eventType;
     public String key;
-    public double value;
+    public Double value;
     public long timestamp;
     public Map<String, Object> properties;
     public int sizeInBytes;

tracker/src/test/java/io/split/android/client/tracker/DefaultTrackerTest.java

@@ -205,6 +205,20 @@ public void successfulTrackPopulatesEventFieldsCorrectly() {
         assertEquals(512, captured.sizeInBytes);
     }
 
+    @Test
+    public void trackWithNullValueSucceeds() {
+        boolean result = mTracker.track("key", "traffic", "eventType", null, null, true);
+
+        assertTrue(result);
+
+        ArgumentCaptor<TrackerEvent> captor = ArgumentCaptor.forClass(TrackerEvent.class);
+        verify(mOnEventPush).accept(captor.capture());
+
+        TrackerEvent captured = captor.getValue();
+        assertNotNull(captured);
+        assertEquals(null, captured.value);
+    }
+
     // Helper matcher for verifying TrackerEvent fields
     private static <T> T argThat(ArgumentMatcherWithReturn<T> matcher) {
         return org.mockito.ArgumentMatchers.argThat(matcher::matches);