Fail fast on muzzle or instrumentation errors

Author: deejgregor

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/ListWriterAssert.groovy

@@ -2,6 +2,8 @@ package datadog.trace.agent.test.asserts
 
 import static TraceAssert.assertTrace
 
+import datadog.trace.agent.tooling.muzzle.MuzzleCheck
+import datadog.trace.bootstrap.InstrumentationErrors
 import datadog.trace.common.writer.ListWriter
 import datadog.trace.core.DDSpan
 import groovy.transform.stc.ClosureParams
@@ -47,7 +49,15 @@ class ListWriterAssert {
     @ClosureParams(value = SimpleType, options = ['datadog.trace.agent.test.asserts.ListWriterAssert'])
     @DelegatesTo(value = ListWriterAssert, strategy = Closure.DELEGATE_FIRST) Closure spec) {
     try {
-      writer.waitForTraces(expectedSize)
+      // Fail fast if we see any muzzle errors or instrumentation errors
+      for (int timeoutRemaining = ListWriter.WAIT_FOR_TRACES_TIMEOUT_SECONDS; timeoutRemaining > 0; timeoutRemaining--) {
+        if (writer.waitForTracesMax(expectedSize, 1)) {
+          break
+        }
+        assertNoErrors()
+      }
+      assertNoErrors() // even if we break immediately above, make sure we check for errors at least once
+      writer.waitForTraces(expectedSize, 0)
       def array = writer.toArray()
       assert array.length == expectedSize
       def traces = (Arrays.asList(array) as List<List<DDSpan>>)
@@ -91,6 +101,12 @@ class ListWriterAssert {
     }
   }
 
+  static void assertNoErrors() {
+    assert InstrumentationErrors.getErrors().size() == 0 : "Instrumentation errors were seen, failing fast"
+    assert MuzzleCheck.getErrors().size() == 0 : "Muzzle errors were seen, failing fast"
+    // InstrumentationSpecification.{cleanup,cleanupAfterAgent} will provide details later
+  }
+
   void sortSpansByStart() {
     traces = traces.collect {
       return new ArrayList<DDSpan>(it).sort { a, b ->

dd-trace-core/src/main/java/datadog/trace/common/writer/ListWriter.java

@@ -18,6 +18,8 @@
 
 /** List writer used by tests mostly */
 public class ListWriter extends CopyOnWriteArrayList<List<DDSpan>> implements Writer {
+  public static final int WAIT_FOR_TRACES_TIMEOUT_SECONDS = 20;
+
   private static final Logger log = LoggerFactory.getLogger(ListWriter.class);
   private static final Filter ACCEPT_ALL = trace -> true;
 
@@ -85,7 +87,12 @@ public boolean waitForTracesMax(final int number, int seconds) throws Interrupte
   }
 
   public void waitForTraces(final int number) throws InterruptedException, TimeoutException {
-    if (!waitForTracesMax(number, 20)) {
+    waitForTraces(number, WAIT_FOR_TRACES_TIMEOUT_SECONDS);
+  }
+
+  public void waitForTraces(final int number, final int seconds)
+      throws InterruptedException, TimeoutException {
+    if (!waitForTracesMax(number, seconds)) {
       String msg =
           "Timeout waiting for "
               + number