Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initializes Reservoir reset setting eagerly. #52

Merged
merged 2 commits into from
Jan 15, 2019
Merged

Initializes Reservoir reset setting eagerly. #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fdc8fa
Initailizes reset setting eagerly.
chang-chao Jan 6, 2019
e54f28f
Merge branch 'master' into master
chrisradek Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...rder-sdk-core/src/main/java/com/amazonaws/xray/strategy/sampling/reservoir/Reservoir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class Reservoir {
private final int tracesPerSecond;
private final MaxFunction maxFunction;
private final AtomicInteger usage = new AtomicInteger(0);
private final AtomicLong nextReset = new AtomicLong(0);
private final AtomicLong nextReset;

public Reservoir() {
this(0);
Expand All @@ -21,6 +21,9 @@ public Reservoir(int tracesPerSecond) {
this.tracesPerSecond = tracesPerSecond;
this.maxFunction =
tracesPerSecond < 10 ? new LessThan10(tracesPerSecond) : new AtLeast10(tracesPerSecond);

long now = System.nanoTime();
this.nextReset = new AtomicLong(now + NANOS_PER_SECOND);
}

public boolean take() {
Expand Down
13 changes: 13 additions & 0 deletions ...-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/reservoir/ReservoirTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,19 @@ public class ReservoirTest {
assertFalse(reservoir.take());
}

@Test public void samplesFairNegativeNanoTime() {
mockStatic(System.class);
when(System.nanoTime()).thenReturn(-2 * NANOS_PER_SECOND);
Reservoir reservoir = new Reservoir(10);

when(System.nanoTime()).thenReturn(-2 * NANOS_PER_SECOND + 1);
assertTrue(reservoir.take());
when(System.nanoTime()).thenReturn(-2 * NANOS_PER_SECOND + 2);
assertTrue(reservoir.take());
when(System.nanoTime()).thenReturn(-2 * NANOS_PER_SECOND + 2);
assertFalse(reservoir.take());
}

@Test public void resetsAfterASecond() {
mockStatic(System.class);

Expand Down