Merge changes I354e3908,I35130071
* changes:
TraceContext: Make wording of end log consistent with Timer metrics
Write debug log when timer metric is started
diff --git a/javatests/com/google/gerrit/acceptance/rest/TraceIT.java b/javatests/com/google/gerrit/acceptance/rest/TraceIT.java
index f8d3c6c..8f267db 100644
--- a/javatests/com/google/gerrit/acceptance/rest/TraceIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/TraceIT.java
@@ -1046,6 +1046,7 @@
}
@Test
+ @GerritConfig(name = "retry.timeout", value = "1s")
@GerritConfig(name = "retry.retryWithTraceOnFailure", value = "true")
public void noAutoRetryIfExceptionCausesNormalRetrying() throws Exception {
String changeId = createChange().getChangeId();
