Log errors from experiments.
This commit is contained in:
parent
933ce42d5a
commit
dcb11f7606
|
@ -3,6 +3,8 @@ package org.whispersystems.textsecuregcm.experiment;
|
||||||
import com.google.common.annotations.VisibleForTesting;
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
import io.micrometer.core.instrument.Counter;
|
import io.micrometer.core.instrument.Counter;
|
||||||
import io.micrometer.core.instrument.Metrics;
|
import io.micrometer.core.instrument.Metrics;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.concurrent.CompletionStage;
|
import java.util.concurrent.CompletionStage;
|
||||||
|
@ -15,6 +17,8 @@ import static com.codahale.metrics.MetricRegistry.name;
|
||||||
*/
|
*/
|
||||||
public class Experiment {
|
public class Experiment {
|
||||||
|
|
||||||
|
private final String name;
|
||||||
|
|
||||||
private final Counter matchCounter;
|
private final Counter matchCounter;
|
||||||
private final Counter errorCounter;
|
private final Counter errorCounter;
|
||||||
|
|
||||||
|
@ -32,8 +36,11 @@ public class Experiment {
|
||||||
private static final String CONTROL_NULL_MISMATCH = "controlResultNull";
|
private static final String CONTROL_NULL_MISMATCH = "controlResultNull";
|
||||||
private static final String EXPERIMENT_NULL_MISMATCH = "experimentResultNull";
|
private static final String EXPERIMENT_NULL_MISMATCH = "experimentResultNull";
|
||||||
|
|
||||||
|
private static final Logger log = LoggerFactory.getLogger(Experiment.class);
|
||||||
|
|
||||||
public Experiment(final String... names) {
|
public Experiment(final String... names) {
|
||||||
this(Metrics.counter(name(Experiment.class, names), OUTCOME_TAG, MATCH_OUTCOME),
|
this(name(Experiment.class, names),
|
||||||
|
Metrics.counter(name(Experiment.class, names), OUTCOME_TAG, MATCH_OUTCOME),
|
||||||
Metrics.counter(name(Experiment.class, names), OUTCOME_TAG, ERROR_OUTCOME),
|
Metrics.counter(name(Experiment.class, names), OUTCOME_TAG, ERROR_OUTCOME),
|
||||||
Metrics.counter(name(Experiment.class, names), OUTCOME_TAG, MISMATCH_OUTCOME, MISMATCH_TYPE_TAG, BOTH_PRESENT_MISMATCH),
|
Metrics.counter(name(Experiment.class, names), OUTCOME_TAG, MISMATCH_OUTCOME, MISMATCH_TYPE_TAG, BOTH_PRESENT_MISMATCH),
|
||||||
Metrics.counter(name(Experiment.class, names), OUTCOME_TAG, MISMATCH_OUTCOME, MISMATCH_TYPE_TAG, CONTROL_NULL_MISMATCH),
|
Metrics.counter(name(Experiment.class, names), OUTCOME_TAG, MISMATCH_OUTCOME, MISMATCH_TYPE_TAG, CONTROL_NULL_MISMATCH),
|
||||||
|
@ -41,7 +48,9 @@ public class Experiment {
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
Experiment(final Counter matchCounter, final Counter errorCounter, final Counter bothPresentMismatchCounter, final Counter controlNullMismatchCounter, final Counter experimentNullMismatchCounter) {
|
Experiment(final String name, final Counter matchCounter, final Counter errorCounter, final Counter bothPresentMismatchCounter, final Counter controlNullMismatchCounter, final Counter experimentNullMismatchCounter) {
|
||||||
|
this.name = name;
|
||||||
|
|
||||||
this.matchCounter = matchCounter;
|
this.matchCounter = matchCounter;
|
||||||
this.errorCounter = errorCounter;
|
this.errorCounter = errorCounter;
|
||||||
|
|
||||||
|
@ -53,7 +62,7 @@ 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) {
|
||||||
experimentStage.whenComplete((actual, cause) -> {
|
experimentStage.whenComplete((actual, cause) -> {
|
||||||
if (cause != null) {
|
if (cause != null) {
|
||||||
errorCounter.increment();
|
recordError(cause);
|
||||||
} else {
|
} else {
|
||||||
recordResult(expected, actual);
|
recordResult(expected, actual);
|
||||||
}
|
}
|
||||||
|
@ -64,10 +73,15 @@ public class Experiment {
|
||||||
try {
|
try {
|
||||||
recordResult(expected, experimentSupplier.get());
|
recordResult(expected, experimentSupplier.get());
|
||||||
} catch (final Exception e) {
|
} catch (final Exception e) {
|
||||||
errorCounter.increment();
|
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) {
|
private <T> void recordResult(final T expected, final T actual) {
|
||||||
final Counter counter;
|
final Counter counter;
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ public class ExperimentTest {
|
||||||
controlNullMismatchCounter = mock(Counter.class);
|
controlNullMismatchCounter = mock(Counter.class);
|
||||||
experimentNullMismatchCounter = mock(Counter.class);
|
experimentNullMismatchCounter = mock(Counter.class);
|
||||||
|
|
||||||
experiment = new Experiment(matchCounter, errorCounter, bothPresentMismatchCounter, controlNullMismatchCounter, experimentNullMismatchCounter);
|
experiment = new Experiment("test", matchCounter, errorCounter, bothPresentMismatchCounter, controlNullMismatchCounter, experimentNullMismatchCounter);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue