Extract tracker module (#624)

Author: gthea

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
     branches:
       - master
       - development
+      - '*_baseline'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}

client/pom.xml

@@ -167,6 +167,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>io.split.client</groupId>
+            <artifactId>tracker</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.split.client</groupId>
             <artifactId>targeting-engine</artifactId>

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

@@ -9,6 +9,8 @@
 import io.split.client.events.EventsTask;
 import io.split.client.events.InMemoryEventsStorage;
 import io.split.client.events.NoopEventsStorageImp;
+import io.split.client.events.EventQueueStats;
+import io.split.client.events.TelemetryEventQueueStats;
 import io.split.client.impressions.AsynchronousImpressionListener;
 import io.split.client.impressions.HttpImpressionsSender;
 import io.split.client.impressions.ImpressionCounter;
@@ -254,7 +256,8 @@ public SplitFactoryImpl(String apiToken, SplitClientConfig config) throws URISyn
         _impressionsManager = buildImpressionsManager(config, impressionsStorage, impressionsStorage);
 
         // EventClient
-        EventsStorage eventsStorage = new InMemoryEventsStorage(config.eventsQueueSize(), _telemetryStorageProducer);
+        EventQueueStats eventsQueueStats = new TelemetryEventQueueStats(_telemetryStorageProducer);
+        EventsStorage eventsStorage = new InMemoryEventsStorage(config.eventsQueueSize(), eventsQueueStats);
         EventsSender eventsSender = EventsSender.create(_splitHttpClient, _eventsRootTarget, _telemetryStorageProducer);
         _eventsTask = EventsTask.create(config.eventSendIntervalInMillis(), eventsStorage, eventsSender,
                 config.getThreadFactory());

client/src/main/java/io/split/client/events/EventsSender.java

@@ -14,7 +14,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-public class EventsSender {
+public class EventsSender implements io.split.client.events.EventSender {
 
     private static final String BULK_ENDPOINT_PATH = "api/events/bulk";
     private final URI _bulkEndpoint;
@@ -34,10 +34,15 @@ public static EventsSender create(SplitHttpClient splitHttpclient, URI eventsTar
         _httpPostImp = new HttpPostImp(_client, telemetryRuntimeProducer);
     }
 
-    public void sendEvents(List<Event> _data) {
+    @Override
+    public void send(List<Event> _data) {
         _httpPostImp.post(_bulkEndpoint, _data, "Events ", HttpParamsWrapper.EVENTS);
     }
 
+    public void sendEvents(List<Event> _data) {
+        send(_data);
+    }
+
     @VisibleForTesting
     URI getBulkEndpoint() {
         return _bulkEndpoint;

client/src/main/java/io/split/client/events/TelemetryEventQueueStats.java

@@ -0,0 +1,25 @@
+package io.split.client.events;
+
+import io.split.telemetry.domain.enums.EventsDataRecordsEnum;
+import io.split.telemetry.storage.TelemetryRuntimeProducer;
+
+import java.util.Objects;
+
+public class TelemetryEventQueueStats implements EventQueueStats {
+
+    private final TelemetryRuntimeProducer _telemetryRuntimeProducer;
+
+    public TelemetryEventQueueStats(TelemetryRuntimeProducer telemetryRuntimeProducer) {
+        _telemetryRuntimeProducer = Objects.requireNonNull(telemetryRuntimeProducer);
+    }
+
+    @Override
+    public void onQueued(long count) {
+        _telemetryRuntimeProducer.recordEventStats(EventsDataRecordsEnum.EVENTS_QUEUED, count);
+    }
+
+    @Override
+    public void onDropped(long count) {
+        _telemetryRuntimeProducer.recordEventStats(EventsDataRecordsEnum.EVENTS_DROPPED, count);
+    }
+}

client/src/test/java/io/split/client/SplitManagerImplTest.java

@@ -88,7 +88,9 @@ public void splitCallWithExistentSplit() {
         Assert.assertEquals("off", theOne.treatments.get(0));
         Assert.assertEquals(0, theOne.configs.size());
         Assert.assertEquals("off", theOne.defaultTreatment);
-        Assert.assertEquals(Lists.newArrayList(prereq), theOne.prerequisites);
+        Assert.assertEquals(1, theOne.prerequisites.size());
+        Assert.assertEquals(prereq.featureFlagName, theOne.prerequisites.get(0).featureFlagName);
+        Assert.assertEquals(prereq.treatments, theOne.prerequisites.get(0).treatments);
     }
 
     @Test

client/src/test/java/io/split/client/events/EventsTaskTest.java

@@ -0,0 +1,32 @@
+package io.split.client.events;
+
+import io.split.telemetry.domain.enums.EventsDataRecordsEnum;
+import io.split.telemetry.storage.TelemetryRuntimeProducer;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.mockito.Mockito.verify;
+
+public class TelemetryEventQueueStatsTest {
+
+    @Test
+    public void onQueuedRecordsEventStats() {
+        TelemetryRuntimeProducer telemetryRuntimeProducer = Mockito.mock(TelemetryRuntimeProducer.class);
+        TelemetryEventQueueStats stats = new TelemetryEventQueueStats(telemetryRuntimeProducer);
+
+        stats.onQueued(42);
+
+        verify(telemetryRuntimeProducer).recordEventStats(EventsDataRecordsEnum.EVENTS_QUEUED, 42);
+    }
+
+    @Test
+    public void onDroppedRecordsEventStats() {
+        TelemetryRuntimeProducer telemetryRuntimeProducer = Mockito.mock(TelemetryRuntimeProducer.class);
+        TelemetryEventQueueStats stats = new TelemetryEventQueueStats(telemetryRuntimeProducer);
+
+        stats.onDropped(10);
+
+        verify(telemetryRuntimeProducer).recordEventStats(EventsDataRecordsEnum.EVENTS_DROPPED, 10);
+    }
+
+}