Have TargetPoller poll without initial delay and add test for TargetP…

…oller.

aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/strategy/sampling/pollers/TargetPoller.java

@@ -20,8 +20,8 @@
 
 public class TargetPoller {
     private static final Log logger = LogFactory.getLog(TargetPoller.class);
-    private static final long PERIOD = 10; // Seconds
-    private static final long MAX_JITTER = 100; // Milliseconds
+    private static final long PERIOD_MILLIS = TimeUnit.SECONDS.toMillis(10);
+    private static final long MAX_JITTER_MILLIS = 100;
 
     private final UnsignedXrayClient client;
     private final CentralizedManifest manifest;
@@ -53,7 +53,7 @@ public void start() {
                 // The executor will die and not abrupt main thread.
                 if(t instanceof Error) { throw t; }
             }
-        }, PERIOD * 1000, getIntervalWithJitter(), TimeUnit.MILLISECONDS);
+        }, 0, getIntervalWithJitter(), TimeUnit.MILLISECONDS);
     }
 
     public void shutdown() {
@@ -82,6 +82,6 @@ private void pollManifest() {
 
     private long getIntervalWithJitter() {
         Rand random = new RandImpl();
-        return Math.round(random.next() * MAX_JITTER) + PERIOD * 1000;
+        return Math.round(random.next() * MAX_JITTER_MILLIS) + PERIOD_MILLIS;
     }
 }

aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/RulePollerTest.java

@@ -1,18 +1,20 @@
 package com.amazonaws.xray.strategy.sampling.pollers;
 
-import com.amazonaws.xray.internal.UnsignedXrayClient;
-import com.amazonaws.xray.strategy.sampling.manifest.CentralizedManifest;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
 import java.time.Clock;
 import java.util.concurrent.ScheduledExecutorService;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import com.amazonaws.xray.internal.UnsignedXrayClient;
+import com.amazonaws.xray.strategy.sampling.manifest.CentralizedManifest;
 
 public class RulePollerTest {
 
@@ -29,7 +31,7 @@ public void testPollerShutdown() {
         poller.shutdown();
 
         ScheduledExecutorService executor = poller.getExecutor();
-        assertTrue(executor.isShutdown());
+        assertThat(executor.isShutdown()).isTrue();
     }
 
     @Test
@@ -39,6 +41,6 @@ public void testPollerErrorNotAbruptMainThread() throws InterruptedException {
         poller.start();
         //Give the mocked client time (1s) to throw the pre-defined Error
         Thread.sleep(1000L);
-        assertTrue(Thread.currentThread().isAlive());
+        assertThat(Thread.currentThread().isAlive()).isTrue();
     }
 }

aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/TargetPollerTest.java

@@ -1,32 +1,51 @@
 package com.amazonaws.xray.strategy.sampling.pollers;
 
-import com.amazonaws.xray.internal.UnsignedXrayClient;
-import com.amazonaws.xray.strategy.sampling.manifest.CentralizedManifest;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+
 import java.time.Clock;
+import java.util.Collections;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
-import static org.junit.Assert.assertTrue;
+import com.amazonaws.services.xray.model.SamplingStatisticsDocument;
+import com.amazonaws.xray.internal.UnsignedXrayClient;
+import com.amazonaws.xray.strategy.sampling.manifest.CentralizedManifest;
 
 public class TargetPollerTest {
 
     @Rule
     public MockitoRule mocks = MockitoJUnit.rule();
 
+    @Mock
+    private CentralizedManifest manifest;
+
     @Mock
     private UnsignedXrayClient client;
 
     @Test
     public void testPollerShutdown() {
-        TargetPoller poller = new TargetPoller(
-            client, new CentralizedManifest(), Clock.systemUTC());
+        TargetPoller poller = new TargetPoller(client, manifest, Clock.systemUTC());
         poller.start();
         poller.shutdown();
 
+        assertThat(poller.getExecutor().isShutdown()).isTrue();
+    }
+
+    @Test
+    public void testPollerErrorNotAbruptMainThread() throws InterruptedException {
+        when(client.getSamplingTargets(any())).thenThrow(new OutOfMemoryError());
+        when(manifest.snapshots(any())).thenReturn(Collections.singletonList(new SamplingStatisticsDocument()));
 
-        assertTrue(poller.getExecutor().isShutdown());
+        TargetPoller poller = new TargetPoller(client, manifest, Clock.systemUTC());
+        poller.start();
+        //Give the mocked client time (1s) to throw the pre-defined Error
+        Thread.sleep(1000L);
+        assertThat(Thread.currentThread().isAlive()).isTrue();
     }
 }