Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 07:28:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expand Experiment to deal with async suppliers and Optionals.

Browse Source
This commit is contained in:
Jon Chambers
2020-07-10 17:51:11 -04:00
committed by Jon Chambers
parent 3d3790fdbc
commit 639898ec07
2 changed files with 108 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.function.Supplier;
import static com.codahale.metrics.MetricRegistry.name;
@@ -77,24 +81,37 @@ public class Experiment {
}
}
public <T> void compareSupplierResultAsync(final T expected, final Supplier<T> experimentSupplier, final Executor executor) {
try {
compareFutureResult(expected, CompletableFuture.supplyAsync(experimentSupplier, executor));
} catch (final Exception e) {
recordError(e);
}
}
private void recordError(final Throwable cause) {
log.warn("Experiment {} threw an exception.", name, cause);
errorCounter.increment();
}
private <T> void recordResult(final T expected, final T actual) {
final Counter counter;
if (Objects.equals(expected, actual)) {
counter = matchCounter;
} else if (expected == null) {
counter = controlNullMismatchCounter;
} else if (actual == null) {
counter = experimentNullMismatchCounter;
@VisibleForTesting
<T> void recordResult(final T expected, final T actual) {
if (expected instanceof Optional && actual instanceof Optional) {
recordResult(((Optional)expected).orElse(null), ((Optional)actual).orElse(null));
} else {
counter = bothPresentMismatchCounter;
}
final Counter counter;
counter.increment();
if (Objects.equals(expected, actual)) {
counter = matchCounter;
} else if (expected == null) {
counter = controlNullMismatchCounter;
} else if (actual == null) {
counter = experimentNullMismatchCounter;
} else {
counter = bothPresentMismatchCounter;
}
counter.increment();
}
}
}