improve logs, fix crap in random till generation

Author: mredolatti

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.1.7-rc4</version>
+        <version>4.1.7-rc5</version>
     </parent>
     <artifactId>java-client</artifactId>
     <packaging>jar</packaging>

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

@@ -60,7 +60,8 @@ private HttpSplitChangeFetcher(CloseableHttpClient client, URI uri, Metrics metr
     }
 
     long makeRandomTill() {
-        return (-1)*(int)Math.floor(Math.random()*(Math.pow(2, 63)));
+
+        return (-1)*(long)Math.floor(Math.random()*(Math.pow(2, 63)));
     }
 
     @Override

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

@@ -114,7 +114,6 @@ private SyncResult attemptSync(long targetChangeNumber,
             if (targetChangeNumber <= _splitCache.getChangeNumber()) {
                 return new SyncResult(true, remainingAttempts);
             } else if (remainingAttempts <= 0) {
-                _log.info(String.format("No changes fetched after %s attempts.", maxRetries));
                 return new SyncResult(false, remainingAttempts);
             }
             try {
@@ -150,19 +149,28 @@ public void refreshSplits(long targetChangeNumber) {
         SyncResult regularResult = attemptSync(targetChangeNumber, opts,
                 (discard) -> (long) _onDemandFetchRetryDelayMs, _onDemandFetchMaxRetries);
 
+        int attempts =  _onDemandFetchMaxRetries - regularResult.remainingAttempts();
         if (regularResult.success()) {
-            _log.debug(String.format("Refresh completed in %s attempts.", _onDemandFetchMaxRetries - regularResult.remainingAttempts()));
+            _log.debug(String.format("Refresh completed in %s attempts.", attempts));
             if (_cdnResponseHeadersLogging) {
                 logCdnHeaders(_onDemandFetchMaxRetries , regularResult.remainingAttempts(), captor.get());
             }
             return;
         }
 
+        _log.info(String.format("No changes fetched after %s attempts. Will retry bypassing CDN.", attempts));
         FetchOptions withCdnBypass = new FetchOptions.Builder(opts).cdnBypass(true).build();
         Backoff backoff = new Backoff(ON_DEMAND_FETCH_BACKOFF_BASE_MS, ON_DEMAND_FETCH_BACKOFF_MAX_WAIT_MS);
         SyncResult withCDNBypassed = attemptSync(targetChangeNumber, withCdnBypass,
                 (discard) -> backoff.interval(), ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES);
 
+        int withoutCDNAttempts = ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES - withCDNBypassed._remainingAttempts;
+        if (withCDNBypassed.success()) {
+            _log.debug(String.format("Refresh completed bypassing the CDN in %s attempts.", attempts));
+        } else {
+            _log.debug(String.format("No changes fetched after %s attempts, even with CDN bypassed.", attempts));
+        }
+
         if (_cdnResponseHeadersLogging) {
             logCdnHeaders(_onDemandFetchMaxRetries + ON_DEMAND_FETCH_BACKOFF_MAX_RETRIES,
                     withCDNBypassed.remainingAttempts(), captor.get());

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

@@ -24,8 +24,10 @@
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import static org.mockito.Mockito.when;
 
@@ -121,10 +123,15 @@ public void testRandomNumberGeneration() throws URISyntaxException {
         Metrics.NoopMetrics metrics = new Metrics.NoopMetrics();
         HttpSplitChangeFetcher fetcher = HttpSplitChangeFetcher.create(httpClientMock, rootTarget, metrics);
 
+        Set<Long> seen = new HashSet<>();
         long min = (long)Math.pow(2, 63) * (-1);
-        for (long x = 0; x < 100000000; x++) {
+        final long total = 10000000;
+        for (long x = 0; x < total; x++) {
             long r = fetcher.makeRandomTill();
             Assert.assertTrue(r < 0 && r > min);
+            seen.add(r);
         }
+
+        Assert.assertTrue(seen.size() >= (total * 0.9999));
     }
 }

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.split.client</groupId>
     <artifactId>java-client-parent</artifactId>
-    <version>4.1.7-rc4</version>
+    <version>4.1.7-rc5</version>
     <dependencyManagement>
         <dependencies>
             <dependency>

testing/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.split.client</groupId>
         <artifactId>java-client-parent</artifactId>
-        <version>4.1.7-rc4</version>
+        <version>4.1.7-rc5</version>
     </parent>
 
     <artifactId>java-client-testing</artifactId>