From 16f1e2b6858c2752fa4db3738cbce601383b3908 Mon Sep 17 00:00:00 2001 From: Nadia Mayor Date: Mon, 4 Sep 2023 13:21:56 -0300 Subject: [PATCH 1/5] Update track impressions to send all impressions to listener --- .../impressions/ImpressionsManagerImpl.java | 2 +- .../ImpressionsManagerImplTest.java | 136 +++++++++++++++++- 2 files changed, 134 insertions(+), 4 deletions(-) diff --git a/client/src/main/java/io/split/client/impressions/ImpressionsManagerImpl.java b/client/src/main/java/io/split/client/impressions/ImpressionsManagerImpl.java index 07ef85605..dec5150c7 100644 --- a/client/src/main/java/io/split/client/impressions/ImpressionsManagerImpl.java +++ b/client/src/main/java/io/split/client/impressions/ImpressionsManagerImpl.java @@ -117,7 +117,7 @@ public void track(List impressions) { ImpressionsResult impressionsResult = _processImpressionStrategy.process(impressions); List impressionsForLogs = impressionsResult.getImpressionsToQueue(); - List impressionsToListener = impressionsResult.getImpressionsToQueue(); + List impressionsToListener = impressionsResult.getImpressionsToListener(); int totalImpressions = impressionsForLogs.size(); long queued = _impressionsStorageProducer.put(impressionsForLogs.stream().map(KeyImpression::fromImpression).collect(Collectors.toList())); diff --git a/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java b/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java index b5732a61b..eaab73b62 100644 --- a/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java +++ b/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java @@ -28,6 +28,7 @@ import java.net.URISyntaxException; import java.util.AbstractMap; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Optional; @@ -74,9 +75,11 @@ public void works() throws URISyntaxException { ImpressionCounter impressionCounter = Mockito.mock(ImpressionCounter.class); ImpressionObserver impressionObserver = new ImpressionObserver(200); - ProcessImpressionStrategy processImpressionStrategy = new ProcessImpressionDebug(false, impressionObserver); + ProcessImpressionStrategy processImpressionStrategy = new ProcessImpressionDebug(true, impressionObserver); - ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, null); + ImpressionListener impressionListener = Mockito.mock(AsynchronousImpressionListener.class); + + ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, impressionListener); treatmentLog.start(); KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, null); @@ -88,6 +91,96 @@ public void works() throws URISyntaxException { treatmentLog.track(Stream.of(new Impression(ki2.keyName, null, ki2.feature, ki2.treatment, ki2.time, null, ki2.changeNumber, null)).collect(Collectors.toList())); treatmentLog.track(Stream.of(new Impression(ki3.keyName, null, ki3.feature, ki3.treatment, ki3.time, null, ki3.changeNumber, null)).collect(Collectors.toList())); treatmentLog.track(Stream.of(new Impression(ki4.keyName, null, ki4.feature, ki4.treatment, ki4.time, null, ki4.changeNumber, null)).collect(Collectors.toList())); + verify(impressionListener, times(4)).log(Mockito.anyObject()); + + // Do what the scheduler would do. + treatmentLog.sendImpressions(); + + verify(senderMock).postImpressionsBulk(impressionsCaptor.capture()); + + List captured = impressionsCaptor.getValue(); + + Assert.assertEquals(2, captured.size()); + } + + @Test + public void testImpressionListenerOptimize() throws URISyntaxException { + SplitClientConfig config = SplitClientConfig.builder() + .impressionsQueueSize(10) + .endpoint("nowhere.com", "nowhere.com") + .impressionsMode(ImpressionsManager.Mode.OPTIMIZED) + .build(); + ImpressionsStorage storage = new InMemoryImpressionsStorage(config.impressionsQueueSize()); + + ImpressionsSender senderMock = Mockito.mock(ImpressionsSender.class); + ImpressionCounter impressionCounter = new ImpressionCounter(); + ImpressionObserver impressionObserver = new ImpressionObserver(200); + TelemetryStorageProducer telemetryStorageProducer = new InMemoryTelemetryStorage(); + + ProcessImpressionStrategy processImpressionStrategy = new ProcessImpressionOptimized(true, impressionObserver, impressionCounter, telemetryStorageProducer); + + ImpressionListener impressionListener = Mockito.mock(AsynchronousImpressionListener.class); + + ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, impressionListener); + treatmentLog.start(); + + KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, null); + KeyImpression ki2 = keyImpression("test1", "adil", "on", 2L, 1L); + KeyImpression ki3 = keyImpression("test1", "pato", "on", 3L, 2L); + KeyImpression ki4 = keyImpression("test2", "pato", "on", 4L, 3L); + + List impressionList = new ArrayList<>(); + impressionList.add(new Impression(ki1.keyName, null, ki1.feature, ki1.treatment, ki1.time, null, ki1.changeNumber, null)); + impressionList.add(new Impression(ki2.keyName, null, ki2.feature, ki2.treatment, ki2.time, null, ki2.changeNumber, null)); + impressionList.add(new Impression(ki3.keyName, null, ki3.feature, ki3.treatment, ki3.time, null, ki3.changeNumber, null)); + impressionList.add(new Impression(ki4.keyName, null, ki4.feature, ki4.treatment, ki4.time, null, ki4.changeNumber, null)); + + treatmentLog.track(impressionList); + verify(impressionListener, times(4)).log(Mockito.anyObject()); + + // Do what the scheduler would do. + treatmentLog.sendImpressions(); + + verify(senderMock).postImpressionsBulk(impressionsCaptor.capture()); + + List captured = impressionsCaptor.getValue(); + + Assert.assertEquals(2, captured.size()); + } + + @Test + public void testImpressionListenerDebug() throws URISyntaxException { + SplitClientConfig config = SplitClientConfig.builder() + .impressionsQueueSize(4) + .endpoint("nowhere.com", "nowhere.com") + .impressionsMode(ImpressionsManager.Mode.DEBUG) + .build(); + ImpressionsStorage storage = new InMemoryImpressionsStorage(config.impressionsQueueSize()); + + ImpressionsSender senderMock = Mockito.mock(ImpressionsSender.class); + ImpressionCounter impressionCounter = Mockito.mock(ImpressionCounter.class); + ImpressionObserver impressionObserver = new ImpressionObserver(200); + + ProcessImpressionStrategy processImpressionStrategy = new ProcessImpressionDebug(true, impressionObserver); + + ImpressionListener impressionListener = Mockito.mock(AsynchronousImpressionListener.class); + + ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, impressionListener); + treatmentLog.start(); + + KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, null); + KeyImpression ki2 = keyImpression("test1", "adil", "on", 2L, 1L); + KeyImpression ki3 = keyImpression("test1", "pato", "on", 3L, 2L); + KeyImpression ki4 = keyImpression("test2", "pato", "on", 4L, 3L); + + List impressionList = new ArrayList<>(); + impressionList.add(new Impression(ki1.keyName, null, ki1.feature, ki1.treatment, ki1.time, null, ki1.changeNumber, null)); + impressionList.add(new Impression(ki2.keyName, null, ki2.feature, ki2.treatment, ki2.time, null, ki2.changeNumber, null)); + impressionList.add(new Impression(ki3.keyName, null, ki3.feature, ki3.treatment, ki3.time, null, ki3.changeNumber, null)); + impressionList.add(new Impression(ki4.keyName, null, ki4.feature, ki4.treatment, ki4.time, null, ki4.changeNumber, null)); + + treatmentLog.track(impressionList); + verify(impressionListener, times(4)).log(Mockito.anyObject()); // Do what the scheduler would do. treatmentLog.sendImpressions(); @@ -99,6 +192,43 @@ public void works() throws URISyntaxException { Assert.assertEquals(2, captured.size()); } + @Test + public void testImpressionListenerNone() throws URISyntaxException { + SplitClientConfig config = SplitClientConfig.builder() + .impressionsQueueSize(10) + .endpoint("nowhere.com", "nowhere.com") + .impressionsMode(ImpressionsManager.Mode.NONE) + .build(); + ImpressionsStorage storage = new InMemoryImpressionsStorage(config.impressionsQueueSize()); + + ImpressionsSender senderMock = Mockito.mock(ImpressionsSender.class); + TelemetrySynchronizer telemetrySynchronizer = Mockito.mock(TelemetryInMemorySubmitter.class); + ImpressionCounter impressionCounter = new ImpressionCounter(); + UniqueKeysTracker uniqueKeysTracker = new UniqueKeysTrackerImp(telemetrySynchronizer, 1000, 1000, null); + uniqueKeysTracker.start(); + + ProcessImpressionStrategy processImpressionStrategy = new ProcessImpressionNone(true, uniqueKeysTracker, impressionCounter); + + ImpressionListener impressionListener = Mockito.mock(AsynchronousImpressionListener.class); + + ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, impressionListener); + treatmentLog.start(); + + KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, null); + KeyImpression ki2 = keyImpression("test1", "adil", "on", 2L, 1L); + KeyImpression ki3 = keyImpression("test1", "pato", "on", 3L, 2L); + KeyImpression ki4 = keyImpression("test2", "pato", "on", 4L, 3L); + + List impressionList = new ArrayList<>(); + impressionList.add(new Impression(ki1.keyName, null, ki1.feature, ki1.treatment, ki1.time, null, ki1.changeNumber, null)); + impressionList.add(new Impression(ki2.keyName, null, ki2.feature, ki2.treatment, ki2.time, null, ki2.changeNumber, null)); + impressionList.add(new Impression(ki3.keyName, null, ki3.feature, ki3.treatment, ki3.time, null, ki3.changeNumber, null)); + impressionList.add(new Impression(ki4.keyName, null, ki4.feature, ki4.treatment, ki4.time, null, ki4.changeNumber, null)); + + treatmentLog.track(impressionList); + verify(impressionListener, times(4)).log(Mockito.anyObject()); + } + @Test public void worksButDropsImpressions() throws URISyntaxException { @@ -627,7 +757,7 @@ public void testCounterStandaloneModeDebugMode() throws URISyntaxException { } @Test - public void testCounterStandaloneModeNoseMode() throws URISyntaxException { + public void testCounterStandaloneModeNoneMode() throws URISyntaxException { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") From eade9da83a053da0da32e3267b192e504a0fb179 Mon Sep 17 00:00:00 2001 From: Nadia Mayor Date: Mon, 4 Sep 2023 18:00:11 -0300 Subject: [PATCH 2/5] Improve test cases --- .../impressions/ImpressionsManagerImpl.java | 4 +- .../ImpressionsManagerImplTest.java | 86 ++++++++++--------- 2 files changed, 46 insertions(+), 44 deletions(-) diff --git a/client/src/main/java/io/split/client/impressions/ImpressionsManagerImpl.java b/client/src/main/java/io/split/client/impressions/ImpressionsManagerImpl.java index dec5150c7..384264332 100644 --- a/client/src/main/java/io/split/client/impressions/ImpressionsManagerImpl.java +++ b/client/src/main/java/io/split/client/impressions/ImpressionsManagerImpl.java @@ -61,7 +61,7 @@ public static ImpressionsManagerImpl instanceForTest(SplitClientConfig config, ImpressionsStorageProducer impressionsStorageProducer, ProcessImpressionStrategy processImpressionStrategy, ImpressionCounter counter, - ImpressionListener listener) throws URISyntaxException { + ImpressionListener listener) { return new ImpressionsManagerImpl(config, impressionsSender, telemetryRuntimeProducer, impressionsStorageConsumer, impressionsStorageProducer, processImpressionStrategy, counter, listener); } @@ -73,7 +73,7 @@ private ImpressionsManagerImpl(SplitClientConfig config, ImpressionsStorageProducer impressionsStorageProducer, ProcessImpressionStrategy processImpressionStrategy, ImpressionCounter impressionCounter, - ImpressionListener impressionListener) throws URISyntaxException { + ImpressionListener impressionListener) { _config = checkNotNull(config); diff --git a/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java b/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java index eaab73b62..c46de4339 100644 --- a/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java +++ b/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java @@ -56,6 +56,9 @@ public void setUp() { @Captor private ArgumentCaptor> impressionsCaptor; + @Captor + private ArgumentCaptor> impressionKeyList; + @Captor private ArgumentCaptor uniqueKeysCaptor; @@ -91,7 +94,6 @@ public void works() throws URISyntaxException { treatmentLog.track(Stream.of(new Impression(ki2.keyName, null, ki2.feature, ki2.treatment, ki2.time, null, ki2.changeNumber, null)).collect(Collectors.toList())); treatmentLog.track(Stream.of(new Impression(ki3.keyName, null, ki3.feature, ki3.treatment, ki3.time, null, ki3.changeNumber, null)).collect(Collectors.toList())); treatmentLog.track(Stream.of(new Impression(ki4.keyName, null, ki4.feature, ki4.treatment, ki4.time, null, ki4.changeNumber, null)).collect(Collectors.toList())); - verify(impressionListener, times(4)).log(Mockito.anyObject()); // Do what the scheduler would do. treatmentLog.sendImpressions(); @@ -104,13 +106,13 @@ public void works() throws URISyntaxException { } @Test - public void testImpressionListenerOptimize() throws URISyntaxException { + public void testImpressionListenerOptimize() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") .impressionsMode(ImpressionsManager.Mode.OPTIMIZED) .build(); - ImpressionsStorage storage = new InMemoryImpressionsStorage(config.impressionsQueueSize()); + ImpressionsStorage storage = Mockito.mock(InMemoryImpressionsStorage.class); ImpressionsSender senderMock = Mockito.mock(ImpressionsSender.class); ImpressionCounter impressionCounter = new ImpressionCounter(); @@ -124,8 +126,8 @@ public void testImpressionListenerOptimize() throws URISyntaxException { ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, impressionListener); treatmentLog.start(); - KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, null); - KeyImpression ki2 = keyImpression("test1", "adil", "on", 2L, 1L); + KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, 1L); + KeyImpression ki2 = keyImpression("test1", "adil", "on", 1L, 1L); KeyImpression ki3 = keyImpression("test1", "pato", "on", 3L, 2L); KeyImpression ki4 = keyImpression("test2", "pato", "on", 4L, 3L); @@ -138,24 +140,21 @@ public void testImpressionListenerOptimize() throws URISyntaxException { treatmentLog.track(impressionList); verify(impressionListener, times(4)).log(Mockito.anyObject()); - // Do what the scheduler would do. - treatmentLog.sendImpressions(); - - verify(senderMock).postImpressionsBulk(impressionsCaptor.capture()); + verify(storage).put(impressionKeyList.capture()); - List captured = impressionsCaptor.getValue(); + List captured = impressionKeyList.getValue(); - Assert.assertEquals(2, captured.size()); + Assert.assertEquals(3, captured.size()); } @Test - public void testImpressionListenerDebug() throws URISyntaxException { + public void testImpressionListenerDebug() { SplitClientConfig config = SplitClientConfig.builder() - .impressionsQueueSize(4) + .impressionsQueueSize(6) .endpoint("nowhere.com", "nowhere.com") .impressionsMode(ImpressionsManager.Mode.DEBUG) .build(); - ImpressionsStorage storage = new InMemoryImpressionsStorage(config.impressionsQueueSize()); + ImpressionsStorage storage = Mockito.mock(InMemoryImpressionsStorage.class); ImpressionsSender senderMock = Mockito.mock(ImpressionsSender.class); ImpressionCounter impressionCounter = Mockito.mock(ImpressionCounter.class); @@ -168,8 +167,8 @@ public void testImpressionListenerDebug() throws URISyntaxException { ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, impressionListener); treatmentLog.start(); - KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, null); - KeyImpression ki2 = keyImpression("test1", "adil", "on", 2L, 1L); + KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, 1L); + KeyImpression ki2 = keyImpression("test1", "adil", "on", 1L, 1L); KeyImpression ki3 = keyImpression("test1", "pato", "on", 3L, 2L); KeyImpression ki4 = keyImpression("test2", "pato", "on", 4L, 3L); @@ -182,24 +181,21 @@ public void testImpressionListenerDebug() throws URISyntaxException { treatmentLog.track(impressionList); verify(impressionListener, times(4)).log(Mockito.anyObject()); - // Do what the scheduler would do. - treatmentLog.sendImpressions(); - - verify(senderMock).postImpressionsBulk(impressionsCaptor.capture()); + verify(storage).put(impressionKeyList.capture()); - List captured = impressionsCaptor.getValue(); + List captured = impressionKeyList.getValue(); - Assert.assertEquals(2, captured.size()); + Assert.assertEquals(4, captured.size()); } @Test - public void testImpressionListenerNone() throws URISyntaxException { + public void testImpressionListenerNone() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") .impressionsMode(ImpressionsManager.Mode.NONE) .build(); - ImpressionsStorage storage = new InMemoryImpressionsStorage(config.impressionsQueueSize()); + ImpressionsStorage storage = Mockito.mock(InMemoryImpressionsStorage.class); ImpressionsSender senderMock = Mockito.mock(ImpressionsSender.class); TelemetrySynchronizer telemetrySynchronizer = Mockito.mock(TelemetryInMemorySubmitter.class); @@ -214,8 +210,8 @@ public void testImpressionListenerNone() throws URISyntaxException { ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, impressionListener); treatmentLog.start(); - KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, null); - KeyImpression ki2 = keyImpression("test1", "adil", "on", 2L, 1L); + KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, 1L); + KeyImpression ki2 = keyImpression("test1", "adil", "on", 1L, 1L); KeyImpression ki3 = keyImpression("test1", "pato", "on", 3L, 2L); KeyImpression ki4 = keyImpression("test2", "pato", "on", 4L, 3L); @@ -227,10 +223,16 @@ public void testImpressionListenerNone() throws URISyntaxException { treatmentLog.track(impressionList); verify(impressionListener, times(4)).log(Mockito.anyObject()); + + verify(storage).put(impressionKeyList.capture()); + + List captured = impressionKeyList.getValue(); + + Assert.assertEquals(0, captured.size()); } @Test - public void worksButDropsImpressions() throws URISyntaxException { + public void worksButDropsImpressions() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(3) @@ -271,7 +273,7 @@ public void worksButDropsImpressions() throws URISyntaxException { } @Test - public void works4ImpressionsInOneTest() throws URISyntaxException { + public void works4ImpressionsInOneTest() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) @@ -314,7 +316,7 @@ public void works4ImpressionsInOneTest() throws URISyntaxException { } @Test - public void worksNoImpressions() throws URISyntaxException { + public void worksNoImpressions() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) @@ -340,7 +342,7 @@ public void worksNoImpressions() throws URISyntaxException { } @Test - public void alreadySeenImpressionsAreMarked() throws URISyntaxException { + public void alreadySeenImpressionsAreMarked() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -396,7 +398,7 @@ public void alreadySeenImpressionsAreMarked() throws URISyntaxException { } @Test - public void testImpressionsStandaloneModeOptimizedMode() throws URISyntaxException { + public void testImpressionsStandaloneModeOptimizedMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -452,7 +454,7 @@ public void testImpressionsStandaloneModeOptimizedMode() throws URISyntaxExcepti } @Test - public void testImpressionsStandaloneModeDebugMode() throws URISyntaxException { + public void testImpressionsStandaloneModeDebugMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -500,7 +502,7 @@ public void testImpressionsStandaloneModeDebugMode() throws URISyntaxException { } @Test - public void testImpressionsStandaloneModeNoneMode() throws URISyntaxException { + public void testImpressionsStandaloneModeNoneMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -556,7 +558,7 @@ public void testImpressionsStandaloneModeNoneMode() throws URISyntaxException { } @Test - public void testImpressionsConsumerModeOptimizedMode() throws URISyntaxException { + public void testImpressionsConsumerModeOptimizedMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -613,7 +615,7 @@ public void testImpressionsConsumerModeOptimizedMode() throws URISyntaxException } @Test - public void testImpressionsConsumerModeNoneMode() throws URISyntaxException { + public void testImpressionsConsumerModeNoneMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -670,7 +672,7 @@ public void testImpressionsConsumerModeNoneMode() throws URISyntaxException { } @Test - public void testImpressionsConsumerModeDebugMode() throws URISyntaxException { + public void testImpressionsConsumerModeDebugMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -720,7 +722,7 @@ public void testImpressionsConsumerModeDebugMode() throws URISyntaxException { } @Test - public void testCounterStandaloneModeOptimizedMode() throws URISyntaxException { + public void testCounterStandaloneModeOptimizedMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -739,7 +741,7 @@ public void testCounterStandaloneModeOptimizedMode() throws URISyntaxException { Assert.assertNotNull(manager.getCounter()); } @Test - public void testCounterStandaloneModeDebugMode() throws URISyntaxException { + public void testCounterStandaloneModeDebugMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -757,7 +759,7 @@ public void testCounterStandaloneModeDebugMode() throws URISyntaxException { } @Test - public void testCounterStandaloneModeNoneMode() throws URISyntaxException { + public void testCounterStandaloneModeNoneMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -775,7 +777,7 @@ public void testCounterStandaloneModeNoneMode() throws URISyntaxException { } @Test - public void testCounterConsumerModeOptimizedMode() throws URISyntaxException { + public void testCounterConsumerModeOptimizedMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -795,7 +797,7 @@ public void testCounterConsumerModeOptimizedMode() throws URISyntaxException { } @Test - public void testCounterConsumerModeDebugMode() throws URISyntaxException { + public void testCounterConsumerModeDebugMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") @@ -814,7 +816,7 @@ public void testCounterConsumerModeDebugMode() throws URISyntaxException { } @Test - public void testCounterConsumerModeNoneMode() throws URISyntaxException { + public void testCounterConsumerModeNoneMode() { SplitClientConfig config = SplitClientConfig.builder() .impressionsQueueSize(10) .endpoint("nowhere.com", "nowhere.com") From 0039f94aecaa827fe84b5e5aa05df2c1efabaf96 Mon Sep 17 00:00:00 2001 From: Nadia Mayor Date: Mon, 4 Sep 2023 18:09:04 -0300 Subject: [PATCH 3/5] Update impressions test --- .../client/impressions/ImpressionsManagerImplTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java b/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java index c46de4339..f066f1d81 100644 --- a/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java +++ b/client/src/test/java/io/split/client/impressions/ImpressionsManagerImplTest.java @@ -78,11 +78,9 @@ public void works() throws URISyntaxException { ImpressionCounter impressionCounter = Mockito.mock(ImpressionCounter.class); ImpressionObserver impressionObserver = new ImpressionObserver(200); - ProcessImpressionStrategy processImpressionStrategy = new ProcessImpressionDebug(true, impressionObserver); - - ImpressionListener impressionListener = Mockito.mock(AsynchronousImpressionListener.class); + ProcessImpressionStrategy processImpressionStrategy = new ProcessImpressionDebug(false, impressionObserver); - ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, impressionListener); + ImpressionsManagerImpl treatmentLog = ImpressionsManagerImpl.instanceForTest(config, senderMock, TELEMETRY_STORAGE, storage, storage, processImpressionStrategy, impressionCounter, null); treatmentLog.start(); KeyImpression ki1 = keyImpression("test1", "adil", "on", 1L, null); From e662d18be753ce97e8db432a4bcd2b440b77ba23 Mon Sep 17 00:00:00 2001 From: Nadia Mayor Date: Wed, 6 Sep 2023 10:15:06 -0300 Subject: [PATCH 4/5] Update version to release in tapps --- client/pom.xml | 2 +- pluggable-storage/pom.xml | 2 +- pom.xml | 2 +- redis-wrapper/pom.xml | 2 +- testing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index a775f5fb4..b8dcffc63 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -5,7 +5,7 @@ io.split.client java-client-parent - 4.8.1 + 4.8.2-rc1 java-client jar diff --git a/pluggable-storage/pom.xml b/pluggable-storage/pom.xml index f2a69fc6a..49020c8a9 100644 --- a/pluggable-storage/pom.xml +++ b/pluggable-storage/pom.xml @@ -6,7 +6,7 @@ java-client-parent io.split.client - 4.8.1 + 4.8.2-rc1 2.0.0 diff --git a/pom.xml b/pom.xml index 9b4160086..308e1af05 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.split.client java-client-parent - 4.8.1 + 4.8.2-rc1 diff --git a/redis-wrapper/pom.xml b/redis-wrapper/pom.xml index 99b77073e..cd2811d9b 100644 --- a/redis-wrapper/pom.xml +++ b/redis-wrapper/pom.xml @@ -6,7 +6,7 @@ java-client-parent io.split.client - 4.8.1 + 4.8.2-rc1 redis-wrapper 3.0.1 diff --git a/testing/pom.xml b/testing/pom.xml index d35996d06..3ae0769cf 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -5,7 +5,7 @@ io.split.client java-client-parent - 4.8.1 + 4.8.2-rc1 java-client-testing jar From 2817e33278404fd90c6e4f6e4ac808285fdcf001 Mon Sep 17 00:00:00 2001 From: Nadia Mayor Date: Wed, 6 Sep 2023 17:30:48 -0300 Subject: [PATCH 5/5] Update version --- client/pom.xml | 2 +- pluggable-storage/pom.xml | 2 +- pom.xml | 2 +- redis-wrapper/pom.xml | 2 +- testing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index b8dcffc63..a775f5fb4 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -5,7 +5,7 @@ io.split.client java-client-parent - 4.8.2-rc1 + 4.8.1 java-client jar diff --git a/pluggable-storage/pom.xml b/pluggable-storage/pom.xml index 49020c8a9..f2a69fc6a 100644 --- a/pluggable-storage/pom.xml +++ b/pluggable-storage/pom.xml @@ -6,7 +6,7 @@ java-client-parent io.split.client - 4.8.2-rc1 + 4.8.1 2.0.0 diff --git a/pom.xml b/pom.xml index 308e1af05..9b4160086 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.split.client java-client-parent - 4.8.2-rc1 + 4.8.1 diff --git a/redis-wrapper/pom.xml b/redis-wrapper/pom.xml index cd2811d9b..99b77073e 100644 --- a/redis-wrapper/pom.xml +++ b/redis-wrapper/pom.xml @@ -6,7 +6,7 @@ java-client-parent io.split.client - 4.8.2-rc1 + 4.8.1 redis-wrapper 3.0.1 diff --git a/testing/pom.xml b/testing/pom.xml index 3ae0769cf..d35996d06 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -5,7 +5,7 @@ io.split.client java-client-parent - 4.8.2-rc1 + 4.8.1 java-client-testing jar