MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `Timer.Sample` throughout `Experiment`

This commit is contained in:
Jon Chambers 2023-06-20 10:47:31 -04:00 committed by Jon Chambers
parent c78c109577
commit 97710540c0
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
service/src/main/java/org/whispersystems/textsecuregcm/experiment/Experiment.java
View File

@ -15,7 +15,6 @@ import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage; import java.util.concurrent.CompletionStage;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -72,65 +71,62 @@ public class Experiment {
} }
public <T> void compareFutureResult(final T expected, final CompletionStage<T> experimentStage) { public <T> void compareFutureResult(final T expected, final CompletionStage<T> experimentStage) {
final long startNanos = System.nanoTime(); final Timer.Sample sample = Timer.start();
experimentStage.whenComplete((actual, cause) -> { experimentStage.whenComplete((actual, cause) -> {
final long durationNanos = System.nanoTime() - startNanos;
if (cause != null) { if (cause != null) {
recordError(cause, durationNanos); recordError(cause, sample);
} else { } else {
recordResult(expected, actual, durationNanos); recordResult(expected, actual, sample);
} }
}); });
} }
public <T> void compareSupplierResult(final T expected, final Supplier<T> experimentSupplier) { public <T> void compareSupplierResult(final T expected, final Supplier<T> experimentSupplier) {
final long startNanos = System.nanoTime(); final Timer.Sample sample = Timer.start();
try { try {
final T result = experimentSupplier.get(); final T result = experimentSupplier.get();
recordResult(expected, result, System.nanoTime() - startNanos); recordResult(expected, result, sample);
} catch (final Exception e) { } catch (final Exception e) {
recordError(e, System.nanoTime() - startNanos); recordError(e, sample);
} }
} }
public <T> void compareSupplierResultAsync(final T expected, final Supplier<T> experimentSupplier, public <T> void compareSupplierResultAsync(final T expected, final Supplier<T> experimentSupplier, final Executor executor) {
final Executor executor) { final Timer.Sample sample = Timer.start();
final long startNanos = System.nanoTime();
try { try {
compareFutureResult(expected, CompletableFuture.supplyAsync(experimentSupplier, executor)); compareFutureResult(expected, CompletableFuture.supplyAsync(experimentSupplier, executor));
} catch (final Exception e) { } catch (final Exception e) {
recordError(e, System.nanoTime() - startNanos); recordError(e, sample);
} }
} }
private void recordError(final Throwable cause, final long durationNanos) { private void recordError(final Throwable cause, final Timer.Sample sample) {
log.warn("Experiment {} threw an exception.", name, cause); log.warn("Experiment {} threw an exception.", name, cause);
errorTimer.record(durationNanos, TimeUnit.NANOSECONDS); sample.stop(errorTimer);
} }
@VisibleForTesting @VisibleForTesting
<T> void recordResult(final T expected, final T actual, final long durationNanos) { <T> void recordResult(final T expected, final T actual, final Timer.Sample sample) {
if (expected instanceof Optional && actual instanceof Optional) { if (expected instanceof Optional && actual instanceof Optional) {
recordResult(((Optional) expected).orElse(null), ((Optional) actual).orElse(null), durationNanos); recordResult(((Optional) expected).orElse(null), ((Optional) actual).orElse(null), sample);
} else { } else {
final Timer Timer; final Timer timer;
if (Objects.equals(expected, actual)) { if (Objects.equals(expected, actual)) {
Timer = matchTimer; timer = matchTimer;
} else if (expected == null) { } else if (expected == null) {
Timer = controlNullMismatchTimer; timer = controlNullMismatchTimer;
} else if (actual == null) { } else if (actual == null) {
Timer = experimentNullMismatchTimer; timer = experimentNullMismatchTimer;
} else { } else {
Timer = bothPresentMismatchTimer; timer = bothPresentMismatchTimer;
} }
Timer.record(durationNanos, TimeUnit.NANOSECONDS); sample.stop(timer);
} }
} }
} }

12
service/src/test/java/org/whispersystems/textsecuregcm/experiment/ExperimentTest.java
View File

@ -13,6 +13,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset; import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import io.micrometer.core.instrument.MockClock;
import io.micrometer.core.instrument.Timer; import io.micrometer.core.instrument.Timer;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@ -104,13 +105,16 @@ class ExperimentTest {
@ParameterizedTest @ParameterizedTest
@MethodSource @MethodSource
public void testRecordResult(final Object expected, final Object actual, final Experiment experiment, public void testRecordResult(final Object expected, final Object actual, final Experiment experiment, final Timer expectedTimer) {
final Timer expectedTimer) {
reset(expectedTimer); reset(expectedTimer);
final long durationNanos = 123; final MockClock clock = new MockClock();
final Timer.Sample sample = Timer.start(clock);
experiment.recordResult(expected, actual, durationNanos); final long durationNanos = 123;
clock.add(durationNanos, TimeUnit.NANOSECONDS);
experiment.recordResult(expected, actual, sample);
verify(expectedTimer).record(durationNanos, TimeUnit.NANOSECONDS); verify(expectedTimer).record(durationNanos, TimeUnit.NANOSECONDS);
} }