Merge pull request #530 from DataDog/tyler/add-assert-super

Add assertTraces to AgentTestRunner with implied argument

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/DatadogClassLoaderTest.groovy

@@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit
 
 class DatadogClassLoaderTest extends Specification {
   @Timeout(value = 60, unit = TimeUnit.SECONDS)
-  def "DD classloader does not lock classloading around instance" () {
+  def "DD classloader does not lock classloading around instance"() {
     setup:
     def className1 = 'some/class/Name1'
     def className2 = 'some/class/Name2'

dd-java-agent/instrumentation/akka-http-10.0/src/lagomTest/groovy/LagomTest.groovy

@@ -14,7 +14,6 @@ import java.util.function.Function
 import static com.lightbend.lagom.javadsl.testkit.ServiceTest.TestServer
 import static com.lightbend.lagom.javadsl.testkit.ServiceTest.defaultSetup
 import static com.lightbend.lagom.javadsl.testkit.ServiceTest.startServer
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 class LagomTest extends AgentTestRunner {
   static {
@@ -61,7 +60,7 @@ class LagomTest extends AgentTestRunner {
     probe.cancel()
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -99,7 +98,7 @@ class LagomTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy

@@ -18,7 +18,6 @@ import spock.lang.Shared
 import java.util.concurrent.CompletionStage
 import java.util.concurrent.ExecutionException
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
@@ -70,7 +69,7 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
       message == expectedMessage
     }
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[1][0])
       trace(1, 1) {
         span(0) {
@@ -116,7 +115,7 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
 
     then:
     thrown ExecutionException
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           parent()
@@ -147,7 +146,7 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
 
     then:
     thrown NullPointerException
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           parent()
@@ -189,7 +188,7 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
       message == expectedMessage
     }
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[1][0])
       trace(1, 1) {
         span(0) {
@@ -236,7 +235,7 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
 
     then:
     thrown StreamTcpException
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           parent()

dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy

@@ -6,8 +6,6 @@ import io.opentracing.tag.Tags
 import okhttp3.Request
 import spock.lang.Shared
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class AkkaHttpServerInstrumentationTest extends AgentTestRunner {
 
   @Shared
@@ -43,7 +41,7 @@ class AkkaHttpServerInstrumentationTest extends AgentTestRunner {
     expect:
     response.code() == 200
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           traceId "123"
@@ -87,7 +85,7 @@ class AkkaHttpServerInstrumentationTest extends AgentTestRunner {
     expect:
     response.code() == 500
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -127,7 +125,7 @@ class AkkaHttpServerInstrumentationTest extends AgentTestRunner {
     expect:
     response.code() == 500
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -166,7 +164,7 @@ class AkkaHttpServerInstrumentationTest extends AgentTestRunner {
     expect:
     response.code() == 404
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/apache-httpclient-4/src/latestDepTest/groovy/ApacheHttpClientTest.groovy

@@ -16,7 +16,6 @@ import spock.lang.AutoCleanup
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 class ApacheHttpClientTest extends AgentTestRunner {
@@ -67,7 +66,7 @@ class ApacheHttpClientTest extends AgentTestRunner {
     then:
     response == "Hello."
     // one trace on the server, one trace on the client
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[1][1])
       trace(1, 2) {
         parentSpan(it, 0)
@@ -95,7 +94,7 @@ class ApacheHttpClientTest extends AgentTestRunner {
     then:
     response.getStatusLine().getStatusCode() == 200
     // two traces on the server, one trace on the client
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[2][1])
       server.distributedRequestTrace(it, 1, TEST_WRITER[2][1])
       trace(2, 2) {
@@ -120,7 +119,7 @@ class ApacheHttpClientTest extends AgentTestRunner {
     then:
     response.getStatusLine().getStatusCode() == 200
     // two traces on the server, one trace on the client
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[2][1])
       server.distributedRequestTrace(it, 1, TEST_WRITER[2][1])
       trace(2, 2) {
@@ -146,7 +145,7 @@ class ApacheHttpClientTest extends AgentTestRunner {
     then:
     def exception = thrown(ClientProtocolException)
     // two traces on the server, one trace on the client
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[2][1])
       server.distributedRequestTrace(it, 1, TEST_WRITER[2][1])
       trace(2, 2) {
@@ -169,7 +168,7 @@ class ApacheHttpClientTest extends AgentTestRunner {
     then:
     response.getStatusLine().getStatusCode() == 200
     // only one trace (client).
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         parentSpan(it, 0)
         successClientSpan(it, 1, span(0))

dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientTest.groovy

@@ -14,7 +14,6 @@ import spock.lang.AutoCleanup
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 class ApacheHttpClientTest extends AgentTestRunner {
@@ -64,7 +63,7 @@ class ApacheHttpClientTest extends AgentTestRunner {
     then:
     response == "Hello."
     // one trace on the server, one trace on the client
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[1][1])
       trace(1, 2) {
         parentSpan(it, 0)
@@ -89,7 +88,7 @@ class ApacheHttpClientTest extends AgentTestRunner {
     then:
     response.getStatusLine().getStatusCode() == 200
     // only one trace (client).
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         parentSpan(it, 0)
         successClientSpan(it, 1, span(0))

dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWSClientTest.groovy

@@ -15,7 +15,6 @@ import spock.lang.Shared
 
 import java.util.concurrent.atomic.AtomicReference
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 class AWSClientTest extends AgentTestRunner {
@@ -74,7 +73,7 @@ class AWSClientTest extends AgentTestRunner {
     client.requestHandler2s.size() == handlerCount
     client.requestHandler2s.get(0).getClass().getSimpleName() == "TracingRequestHandler"
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 1) {
         span(0) {
           operationName "http.request"

dd-java-agent/instrumentation/aws-java-sdk-1.11.106/src/test/groovy/AWSClientTest.groovy

@@ -20,7 +20,6 @@ import spock.lang.Shared
 
 import java.util.concurrent.atomic.AtomicReference
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 class AWSClientTest extends AgentTestRunner {
@@ -103,7 +102,7 @@ class AWSClientTest extends AgentTestRunner {
     client.requestHandler2s.size() == handlerCount
     client.requestHandler2s.get(0).getClass().getSimpleName() == "TracingRequestHandler"
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 1) {
         span(0) {
           operationName "http.request"

dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/CouchbaseClientTest.groovy

@@ -6,8 +6,6 @@ import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import util.AbstractCouchbaseTest
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class CouchbaseClientTest extends AbstractCouchbaseTest {
 
   def "test client #type"() {
@@ -15,7 +13,7 @@ class CouchbaseClientTest extends AbstractCouchbaseTest {
     manager.hasBucket(bucketSettings.name())
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"
@@ -41,7 +39,7 @@ class CouchbaseClientTest extends AbstractCouchbaseTest {
     def inserted = bkt.upsert(JsonDocument.create("helloworld", content))
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"
@@ -67,7 +65,7 @@ class CouchbaseClientTest extends AbstractCouchbaseTest {
     found.content().getString("hello") == "world"
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"
@@ -109,7 +107,7 @@ class CouchbaseClientTest extends AbstractCouchbaseTest {
     result.first().value().get("row") == "value"
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"

dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringRepositoryTest.groovy

@@ -10,8 +10,6 @@ import org.springframework.data.repository.CrudRepository
 import spock.lang.Shared
 import util.AbstractCouchbaseTest
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class CouchbaseSpringRepositoryTest extends AbstractCouchbaseTest {
   private static final Closure<Doc> FIND
   static {
@@ -75,7 +73,7 @@ class CouchbaseSpringRepositoryTest extends AbstractCouchbaseTest {
     !result.iterator().hasNext()
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"
@@ -104,7 +102,7 @@ class CouchbaseSpringRepositoryTest extends AbstractCouchbaseTest {
     repo.save(doc) == doc
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"
@@ -126,7 +124,7 @@ class CouchbaseSpringRepositoryTest extends AbstractCouchbaseTest {
     FIND(repo, "1") == doc
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"
@@ -151,7 +149,7 @@ class CouchbaseSpringRepositoryTest extends AbstractCouchbaseTest {
     repo.save(doc) == doc
     repo.findAll().asList() == [doc]
 
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"
@@ -204,7 +202,7 @@ class CouchbaseSpringRepositoryTest extends AbstractCouchbaseTest {
     !repo.findAll().iterator().hasNext()
 
     and:
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"

dd-java-agent/instrumentation/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy

@@ -8,8 +8,6 @@ import org.springframework.data.couchbase.core.CouchbaseTemplate
 import spock.lang.Shared
 import util.AbstractCouchbaseTest
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class CouchbaseSpringTemplateTest extends AbstractCouchbaseTest {
 
   @Shared
@@ -41,7 +39,7 @@ class CouchbaseSpringTemplateTest extends AbstractCouchbaseTest {
     template.findById("1", Doc) == null
 
     and:
-    assertTraces(TEST_WRITER, 4) {
+    assertTraces(4) {
       trace(0, 1) {
         span(0) {
           serviceName "couchbase"

dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy

@@ -18,8 +18,6 @@ import org.elasticsearch.node.Node
 import org.elasticsearch.transport.Netty4Plugin
 import spock.lang.Shared
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 @RetryOnFailure
 class Elasticsearch6RestClientTest extends AgentTestRunner {
   @Shared
@@ -80,7 +78,7 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
     expect:
     result.status == "green"
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy

@@ -19,7 +19,6 @@ import org.elasticsearch.node.internal.InternalSettingsPreparer
 import org.elasticsearch.transport.Netty3Plugin
 import spock.lang.Shared
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -84,7 +83,7 @@ class Elasticsearch5RestClientTest extends AgentTestRunner {
     expect:
     result.status == "green"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2NodeClientTest.groovy

@@ -13,7 +13,6 @@ import org.elasticsearch.node.NodeBuilder
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 @RetryOnFailure
 class Elasticsearch2NodeClientTest extends AgentTestRunner {
@@ -72,7 +71,7 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -100,7 +99,7 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -173,7 +172,7 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 6) {
+    assertTraces(6) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/Elasticsearch2TransportClientTest.groovy

@@ -16,7 +16,6 @@ import org.elasticsearch.transport.RemoteTransportException
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 @RetryOnFailure
 class Elasticsearch2TransportClientTest extends AgentTestRunner {
@@ -83,7 +82,7 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -114,7 +113,7 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -187,7 +186,7 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 6) {
+    assertTraces(6) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy

@@ -10,7 +10,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 @RetryOnFailure
 class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
@@ -37,7 +36,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     !result.iterator().hasNext()
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -71,7 +70,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     repo.index(doc) == doc
 
     and:
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 1) {
         span(0) {
           resourceName "IndexAction"
@@ -115,7 +114,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     repo.findOne("1") == doc
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -147,7 +146,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     repo.findOne("1") == doc
 
     and:
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       trace(0, 1) {
         span(0) {
           resourceName "IndexAction"
@@ -214,7 +213,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     !repo.findAll().iterator().hasNext()
 
     and:
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       trace(0, 1) {
         span(0) {
           resourceName "DeleteAction"

dd-java-agent/instrumentation/elasticsearch-transport-2/src/latestDepTest/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy

@@ -23,8 +23,6 @@ import spock.lang.Shared
 
 import java.util.concurrent.atomic.AtomicLong
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 @RetryOnFailure
 class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
   public static final long TIMEOUT = 10000; // 10 seconds
@@ -79,7 +77,7 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -141,7 +139,7 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 7) {
+    assertTraces(7) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -328,7 +326,7 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
     results[1] == [id: "1", data: "doc a"]
     bucketTags == [:]
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy

@@ -13,7 +13,6 @@ import org.elasticsearch.node.NodeBuilder
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 @RetryOnFailure
 class Elasticsearch2NodeClientTest extends AgentTestRunner {
@@ -72,7 +71,7 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -100,7 +99,7 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -173,7 +172,7 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 6) {
+    assertTraces(6) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy

@@ -16,7 +16,6 @@ import org.elasticsearch.transport.RemoteTransportException
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 @RetryOnFailure
 class Elasticsearch2TransportClientTest extends AgentTestRunner {
@@ -83,7 +82,7 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -114,7 +113,7 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -187,7 +186,7 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 6) {
+    assertTraces(6) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy

@@ -10,7 +10,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 @RetryOnFailure
 class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
@@ -37,7 +36,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     !result.iterator().hasNext()
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -71,7 +70,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     repo.index(doc) == doc
 
     and:
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 1) {
         span(0) {
           resourceName "IndexAction"
@@ -118,7 +117,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     repo.findOne("1") == doc
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -153,7 +152,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     repo.findOne("1") == doc
 
     and:
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       trace(0, 1) {
         span(0) {
           resourceName "IndexAction"
@@ -226,7 +225,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
     !repo.findAll().iterator().hasNext()
 
     and:
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       trace(0, 1) {
         span(0) {
           resourceName "DeleteAction"

dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringTemplateTest.groovy

@@ -23,8 +23,6 @@ import spock.lang.Shared
 
 import java.util.concurrent.atomic.AtomicLong
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 @RetryOnFailure
 class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
   public static final long TIMEOUT = 10000; // 10 seconds
@@ -79,7 +77,7 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -141,7 +139,7 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 7) {
+    assertTraces(7) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -331,7 +329,7 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
     results[1] == [id: "1", data: "doc a"]
     bucketTags == [:]
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53NodeClientTest.groovy

@@ -15,7 +15,6 @@ import org.elasticsearch.transport.Netty3Plugin
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -78,7 +77,7 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -106,7 +105,7 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -180,7 +179,7 @@ class Elasticsearch53NodeClientTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 6) {
+    assertTraces(6) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/Elasticsearch53TransportClientTest.groovy

@@ -19,7 +19,6 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -90,7 +89,7 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -121,7 +120,7 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -194,7 +193,7 @@ class Elasticsearch53TransportClientTest extends AgentTestRunner {
       TEST_WRITER[2] = TEST_WRITER[3]
       TEST_WRITER[3] = tmp
     }
-    assertTraces(TEST_WRITER, 5) {
+    assertTraces(5) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy

@@ -10,7 +10,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 @RetryOnFailure
 class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
@@ -37,7 +36,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
     !result.iterator().hasNext()
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -71,7 +70,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
     repo.index(doc) == doc
 
     and:
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 1) {
         span(0) {
           resourceName "IndexAction"
@@ -120,7 +119,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
     repo.findById("1").get() == doc
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -152,7 +151,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
     repo.findById("1").get() == doc
 
     and:
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       trace(0, 1) {
         span(0) {
           resourceName "IndexAction"
@@ -224,7 +223,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
     !repo.findAll().iterator().hasNext()
 
     and:
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       trace(0, 1) {
         span(0) {
           resourceName "DeleteAction"

dd-java-agent/instrumentation/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy

@@ -26,7 +26,6 @@ import spock.lang.Shared
 import java.util.concurrent.atomic.AtomicLong
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -92,7 +91,7 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -154,7 +153,7 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 7) {
+    assertTraces(7) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -345,7 +344,7 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
     results[1] == [id: "1", data: "doc a"]
     bucketTags == [:]
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5NodeClientTest.groovy

@@ -15,7 +15,6 @@ import org.elasticsearch.transport.Netty3Plugin
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -78,7 +77,7 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -106,7 +105,7 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -180,7 +179,7 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 6) {
+    assertTraces(6) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-5/src/latestDepTest/groovy/Elasticsearch5TransportClientTest.groovy

@@ -19,7 +19,6 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -91,7 +90,7 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -122,7 +121,7 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -195,7 +194,7 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
       TEST_WRITER[2] = TEST_WRITER[3]
       TEST_WRITER[3] = tmp
     }
-    assertTraces(TEST_WRITER, 5) {
+    assertTraces(5) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy

@@ -15,7 +15,6 @@ import org.elasticsearch.transport.Netty3Plugin
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -78,7 +77,7 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -106,7 +105,7 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -180,7 +179,7 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
       TEST_WRITER[3] = TEST_WRITER[4]
       TEST_WRITER[4] = tmp
     }
-    assertTraces(TEST_WRITER, 6) {
+    assertTraces(6) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy

@@ -19,7 +19,6 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -90,7 +89,7 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -121,7 +120,7 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -194,7 +193,7 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
       TEST_WRITER[2] = TEST_WRITER[3]
       TEST_WRITER[3] = tmp
     }
-    assertTraces(TEST_WRITER, 5) {
+    assertTraces(5) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy

@@ -14,7 +14,6 @@ import org.elasticsearch.transport.Netty4Plugin
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -75,7 +74,7 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -103,7 +102,7 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -176,7 +175,7 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
       TEST_WRITER[2] = TEST_WRITER[3]
       TEST_WRITER[3] = tmp
     }
-    assertTraces(TEST_WRITER, 5) {
+    assertTraces(5) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy

@@ -18,7 +18,6 @@ import org.elasticsearch.transport.client.PreBuiltTransportClient
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static org.elasticsearch.cluster.ClusterName.CLUSTER_NAME_SETTING
 
 @RetryOnFailure
@@ -87,7 +86,7 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
     expect:
     status.name() == "GREEN"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -118,7 +117,7 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
     thrown IndexNotFoundException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"
@@ -191,7 +190,7 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
       TEST_WRITER[2] = TEST_WRITER[3]
       TEST_WRITER[3] = tmp
     }
-    assertTraces(TEST_WRITER, 5) {
+    assertTraces(5) {
       trace(0, 1) {
         span(0) {
           serviceName "elasticsearch"

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy

@@ -15,8 +15,6 @@ import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicReference
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class GrpcStreamingTest extends AgentTestRunner {
   static {
     System.setProperty("dd.integration.grpc.enabled", "true")
@@ -87,7 +85,7 @@ class GrpcStreamingTest extends AgentTestRunner {
     then:
     error.get() == null
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, clientMessageCount + 1) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy

@@ -15,8 +15,6 @@ import io.opentracing.tag.Tags
 
 import java.util.concurrent.TimeUnit
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class GrpcTest extends AgentTestRunner {
   static {
     System.setProperty("dd.integration.grpc.enabled", "true")
@@ -43,7 +41,7 @@ class GrpcTest extends AgentTestRunner {
 
     then:
     response.message == "Hello $name"
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 2) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -134,7 +132,7 @@ class GrpcTest extends AgentTestRunner {
     then:
     thrown StatusRuntimeException
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 2) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -219,7 +217,7 @@ class GrpcTest extends AgentTestRunner {
     then:
     thrown StatusRuntimeException
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 2) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/http-url-connection/src/test/groovy/HttpUrlConnectionTest.groovy

@@ -8,7 +8,6 @@ import spock.lang.AutoCleanup
 import spock.lang.Shared
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 class HttpUrlConnectionTest extends AgentTestRunner {
@@ -56,7 +55,7 @@ class HttpUrlConnectionTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 3) {
+    assertTraces(3) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[2][2])
       server.distributedRequestTrace(it, 1, TEST_WRITER[2][1])
       trace(2, 3) {
@@ -134,7 +133,7 @@ class HttpUrlConnectionTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           operationName "someTrace"
@@ -194,7 +193,7 @@ class HttpUrlConnectionTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "someTrace"
@@ -236,7 +235,7 @@ class HttpUrlConnectionTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "someTrace"
@@ -296,7 +295,7 @@ class HttpUrlConnectionTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[1][1])
       trace(1, 3) {
         span(0) {
@@ -356,7 +355,7 @@ class HttpUrlConnectionTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           operationName "someTrace"
@@ -381,7 +380,7 @@ class HttpUrlConnectionTest extends AgentTestRunner {
     assert lines == [RESPONSE]
 
     expect:
-    assertTraces(TEST_WRITER, 0) {}
+    assertTraces(0) {}
   }
 
   def "rest template"() {
@@ -393,7 +392,7 @@ class HttpUrlConnectionTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       server.distributedRequestTrace(it, 0, TEST_WRITER[1][2])
       trace(1, 4) {
         span(0) {

dd-java-agent/instrumentation/http-url-connection/src/test/groovy/UrlConnectionTest.groovy

@@ -6,7 +6,6 @@ import io.opentracing.tag.Tags
 import io.opentracing.util.GlobalTracer
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 class UrlConnectionTest extends AgentTestRunner {
   static {
@@ -29,7 +28,7 @@ class UrlConnectionTest extends AgentTestRunner {
     thrown ConnectException
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "someTrace"

dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy

@@ -7,7 +7,6 @@ import java.util.concurrent.LinkedBlockingQueue
 
 import static com.netflix.hystrix.HystrixCommandGroupKey.Factory.asKey
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 class HystrixTest extends AgentTestRunner {
   // Uncomment for debugging:
@@ -36,7 +35,7 @@ class HystrixTest extends AgentTestRunner {
     TRANSFORMED_CLASSES.contains("HystrixTest\$1")
     result == "Hello!"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -108,7 +107,7 @@ class HystrixTest extends AgentTestRunner {
     TRANSFORMED_CLASSES.contains("HystrixTest\$2")
     result == "Fallback!"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/java-concurrent/src/slickTest/groovy/SlickTest.groovy

@@ -3,8 +3,6 @@ import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import io.opentracing.tag.Tags
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class SlickTest extends AgentTestRunner {
 
   // Can't be @Shared, otherwise the work queue is initialized before the instrumentation is applied
@@ -19,7 +17,7 @@ class SlickTest extends AgentTestRunner {
     expect:
     result == SlickUtils.TestValue()
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "SlickUtils.startQuery"
@@ -68,7 +66,7 @@ class SlickTest extends AgentTestRunner {
     result == SlickUtils.TestValue()
 
     // Expect two traces because two queries have been run
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 2, {
         span(0) {}
         span(1) {}

dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy

@@ -10,7 +10,6 @@ import javax.ws.rs.PUT
 import javax.ws.rs.Path
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
 
@@ -21,7 +20,7 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "test"
@@ -94,7 +93,7 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           operationName "test"

dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy

@@ -18,7 +18,6 @@ import javax.ws.rs.core.MediaType
 import javax.ws.rs.core.Response
 import java.util.concurrent.ExecutionException
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 class JaxRsClientTest extends AgentTestRunner {
@@ -52,7 +51,7 @@ class JaxRsClientTest extends AgentTestRunner {
     expect:
     response.readEntity(String) == "pong"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -103,7 +102,7 @@ class JaxRsClientTest extends AgentTestRunner {
     then:
     thrown async ? ExecutionException : ProcessingException
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy

@@ -17,7 +17,6 @@ import java.sql.ResultSet
 import java.sql.Statement
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 class JDBCInstrumentationTest extends AgentTestRunner {
 
@@ -150,7 +149,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
     expect:
     resultSet.next()
     resultSet.getInt(1) == 3
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "parent"
@@ -211,7 +210,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
     expect:
     resultSet.next()
     resultSet.getInt(1) == 3
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "parent"
@@ -267,7 +266,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
     expect:
     resultSet.next()
     resultSet.getInt(1) == 3
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "parent"
@@ -323,7 +322,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
       return !statement.execute(sql)
     }
     statement.updateCount == 0
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "parent"
@@ -382,7 +381,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
     runUnderTrace("parent") {
       return statement.executeUpdate() == 0
     }
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "parent"
@@ -454,7 +453,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
     then:
     rs.next()
     rs.getInt(1) == 3
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "parent"
@@ -535,7 +534,7 @@ class JDBCInstrumentationTest extends AgentTestRunner {
     for (int i = 0; i < numQueries; ++i) {
       res[i] == 3
     }
-    assertTraces(TEST_WRITER, 6) {
+    assertTraces(6) {
       trace(0, 1) {
         span(0) {
           operationName "${dbType}.query"

dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy

@@ -14,8 +14,6 @@ import javax.servlet.ServletException
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletResponse
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class JettyHandlerTest extends AgentTestRunner {
 
   static {
@@ -113,7 +111,7 @@ class JettyHandlerTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, numTraces) {
+    assertTraces(numTraces) {
       for (int i = 0; i < numTraces; ++i) {
         trace(i, 1) {
           span(0) {

dd-java-agent/instrumentation/jms/src/latestDepTest/groovy/JMS2Test.groovy

@@ -27,8 +27,6 @@ import javax.jms.TextMessage
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicReference
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class JMS2Test extends AgentTestRunner {
   @Shared
   String messageText = "a message"
@@ -83,7 +81,7 @@ class JMS2Test extends AgentTestRunner {
 
     expect:
     receivedMessage.text == messageText
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       producerTrace(it, 0, jmsResourceName)
       trace(1, 1) { // Consumer trace
         span(0) {
@@ -135,7 +133,7 @@ class JMS2Test extends AgentTestRunner {
     lock.countDown()
 
     expect:
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       producerTrace(it, 0, jmsResourceName)
       trace(1, 1) { // Consumer trace
         span(0) {
@@ -180,7 +178,7 @@ class JMS2Test extends AgentTestRunner {
 
     expect:
     receivedMessage == null
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) { // Consumer trace
         span(0) {
           parent()
@@ -219,7 +217,7 @@ class JMS2Test extends AgentTestRunner {
 
     expect:
     receivedMessage == null
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) { // Consumer trace
         span(0) {
           parent()

dd-java-agent/instrumentation/jms/src/test/groovy/JMS1Test.groovy

@@ -18,8 +18,6 @@ import javax.jms.TextMessage
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicReference
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class JMS1Test extends AgentTestRunner {
   @Shared
   String messageText = "a message"
@@ -49,7 +47,7 @@ class JMS1Test extends AgentTestRunner {
 
     expect:
     receivedMessage.text == messageText
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       producerTrace(it, 0, jmsResourceName)
       trace(1, 1) { // Consumer trace
         span(0) {
@@ -101,7 +99,7 @@ class JMS1Test extends AgentTestRunner {
     lock.countDown()
 
     expect:
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       producerTrace(it, 0, jmsResourceName)
       trace(1, 1) { // Consumer trace
         span(0) {
@@ -146,7 +144,7 @@ class JMS1Test extends AgentTestRunner {
 
     expect:
     receivedMessage == null
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) { // Consumer trace
         span(0) {
           parent()
@@ -185,7 +183,7 @@ class JMS1Test extends AgentTestRunner {
 
     expect:
     receivedMessage == null
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) { // Consumer trace
         span(0) {
           parent()
@@ -236,7 +234,7 @@ class JMS1Test extends AgentTestRunner {
     // This will result in a logged failure because we tried to
     // write properties in MessagePropertyTextMap when readOnlyProperties = true.
     // The consumer span will also not be linked to the parent.
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       producerTrace(it, 0, jmsResourceName)
       trace(1, 1) { // Consumer trace
         span(0) {

dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy

@@ -15,8 +15,6 @@ import org.eclipse.jetty.http.HttpStatus
 import spock.lang.Shared
 import spock.lang.Unroll
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class JSPInstrumentationBasicTests extends AgentTestRunner {
 
   static {
@@ -82,7 +80,7 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           parent()
@@ -161,7 +159,7 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           parent()
@@ -237,7 +235,7 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           parent()
@@ -310,7 +308,7 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           parent()
@@ -390,7 +388,7 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           parent()
@@ -462,7 +460,7 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 7) {
         span(0) {
           parent()
@@ -602,7 +600,7 @@ class JSPInstrumentationBasicTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           parent()

dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy

@@ -13,8 +13,6 @@ import org.eclipse.jetty.http.HttpStatus
 import spock.lang.Shared
 import spock.lang.Unroll
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class JSPInstrumentationForwardTests extends AgentTestRunner {
 
   static {
@@ -80,7 +78,7 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 5) {
         span(0) {
           parent()
@@ -192,7 +190,7 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           parent()
@@ -264,7 +262,7 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 9) {
         span(0) {
           parent()
@@ -441,7 +439,7 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 7) {
         span(0) {
           parent()
@@ -583,7 +581,7 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 4) {
         span(0) {
           parent()
@@ -677,7 +675,7 @@ class JSPInstrumentationForwardTests extends AgentTestRunner {
     Response res = client.newCall(req).execute()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           parent()

dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceAsyncClientTest.groovy

@@ -25,7 +25,6 @@ import java.util.function.BiFunction
 import java.util.function.Consumer
 import java.util.function.Function
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX
 
 class LettuceAsyncClientTest extends AgentTestRunner {
@@ -113,7 +112,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
 
     then:
     connection != null
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -154,7 +153,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
     then:
     connection == null
     thrown ExecutionException
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -187,7 +186,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
 
     expect:
     res == "OK"
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -226,7 +225,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
 
     then:
     conds.await()
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -279,7 +278,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
 
     then:
     conds.await()
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -318,7 +317,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
 
     then:
     conds.await()
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -376,7 +375,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
 
     then:
     conds.await()
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -440,7 +439,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
     conds.await()
     completedExceptionally == true
     thrown Exception
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -482,7 +481,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
     then:
     conds.await()
     cancelSuccess == true
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -509,7 +508,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
     asyncCommands.debugSegfault()
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -536,7 +535,7 @@ class LettuceAsyncClientTest extends AgentTestRunner {
     asyncCommands.shutdown(false)
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"

dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceReactiveClientTest.groovy

@@ -13,7 +13,6 @@ import spock.util.concurrent.AsyncConditions
 
 import java.util.function.Consumer
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX
 
 class LettuceReactiveClientTest extends AgentTestRunner {
@@ -86,7 +85,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
 
     then:
     conds.await()
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -116,7 +115,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
 
     then:
     conds.await()
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -154,7 +153,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
 
     then:
     conds.await()
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -190,7 +189,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
 
     then:
     conds.await()
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -216,7 +215,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
     reactiveCommands.command().subscribe()
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -243,7 +242,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
     reactiveCommands.command().take(2).subscribe()
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -283,7 +282,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
     reactiveCommands.debugSegfault().subscribe()
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -309,7 +308,7 @@ class LettuceReactiveClientTest extends AgentTestRunner {
     reactiveCommands.shutdown(false).subscribe()
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"

dd-java-agent/instrumentation/lettuce-5/src/test/groovy/LettuceSyncClientTest.groovy

@@ -12,7 +12,6 @@ import spock.lang.Shared
 
 import java.util.concurrent.CompletionException
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.instrumentation.lettuce.LettuceInstrumentationUtil.AGENT_CRASHING_COMMAND_PREFIX
 
 class LettuceSyncClientTest extends AgentTestRunner {
@@ -93,7 +92,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
     StatefulConnection connection = testConnectionClient.connect()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -131,7 +130,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
 
     then:
     thrown RedisConnectionException
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -163,7 +162,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
 
     expect:
     res == "OK"
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -190,7 +189,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
 
     expect:
     res == "TESTVAL"
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -217,7 +216,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
 
     expect:
     res == null
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -244,7 +243,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
 
     expect:
     keyRetrieved != null
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -271,7 +270,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
 
     expect:
     res == 1
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -298,7 +297,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
 
     expect:
     res == "OK"
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -325,7 +324,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
 
     expect:
     res == testHashMap
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -351,7 +350,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
     syncCommands.debugSegfault()
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"
@@ -377,7 +376,7 @@ class LettuceSyncClientTest extends AgentTestRunner {
     syncCommands.shutdown(false)
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "redis"

dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy

@@ -12,7 +12,6 @@ import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 import static org.asynchttpclient.Dsl.asyncHttpClient
 
@@ -44,7 +43,7 @@ class Netty40ClientTest extends AgentTestRunner {
     response.responseBody == "Hello World"
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -93,7 +92,7 @@ class Netty40ClientTest extends AgentTestRunner {
     throwable.cause instanceof ConnectException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "parent"

dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ServerTest.groovy

@@ -28,8 +28,6 @@ import io.opentracing.tag.Tags
 import okhttp3.OkHttpClient
 import okhttp3.Request
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class Netty40ServerTest extends AgentTestRunner {
 
   OkHttpClient client = OkHttpUtils.client()
@@ -48,7 +46,7 @@ class Netty40ServerTest extends AgentTestRunner {
     response.body().string() == "Hello World"
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -94,7 +92,7 @@ class Netty40ServerTest extends AgentTestRunner {
     response.body().string() == "Hello World"
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy

@@ -13,7 +13,6 @@ import java.util.concurrent.ExecutionException
 import java.util.concurrent.TimeUnit
 
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 import static org.asynchttpclient.Dsl.asyncHttpClient
 
@@ -45,7 +44,7 @@ class Netty41ClientTest extends AgentTestRunner {
     response.responseBody == "Hello World"
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -94,7 +93,7 @@ class Netty41ClientTest extends AgentTestRunner {
     throwable.cause instanceof ConnectException
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "parent"

dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ServerTest.groovy

@@ -28,8 +28,6 @@ import io.opentracing.tag.Tags
 import okhttp3.OkHttpClient
 import okhttp3.Request
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class Netty41ServerTest extends AgentTestRunner {
 
   OkHttpClient client = OkHttpUtils.client()
@@ -48,7 +46,7 @@ class Netty41ServerTest extends AgentTestRunner {
     response.body().string() == "Hello World"
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -94,7 +92,7 @@ class Netty41ServerTest extends AgentTestRunner {
     response.body().string() == "Hello World"
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/okhttp-3/src/test/groovy/OkHttp3Test.groovy

@@ -4,7 +4,6 @@ import io.opentracing.tag.Tags
 import okhttp3.OkHttpClient
 import okhttp3.Request
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 class OkHttp3Test extends AgentTestRunner {
@@ -27,7 +26,7 @@ class OkHttp3Test extends AgentTestRunner {
 
     expect:
     response.body.string() == "pong"
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "okhttp.http"

dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy

@@ -7,8 +7,6 @@ import play.api.test.TestServer
 import play.test.Helpers
 import spock.lang.Shared
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class Play26Test extends AgentTestRunner {
   static {
     System.setProperty("dd.integration.akka-http-server.enabled", "true")
@@ -45,7 +43,7 @@ class Play26Test extends AgentTestRunner {
     expect:
     response.code() == 200
     response.body().string() == "hello spock"
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           traceId "123"
@@ -98,7 +96,7 @@ class Play26Test extends AgentTestRunner {
 
     expect:
     response.code() == 500
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -149,7 +147,7 @@ class Play26Test extends AgentTestRunner {
     expect:
     testServer != null
     response.code() == 500
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -203,7 +201,7 @@ class Play26Test extends AgentTestRunner {
     expect:
     response.code() == 404
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/servlet-2/src/test/groovy/JettyServlet2Test.groovy

@@ -17,8 +17,6 @@ import org.eclipse.jetty.security.authentication.BasicAuthenticator
 import org.eclipse.jetty.server.Server
 import org.eclipse.jetty.servlet.ServletContextHandler
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class JettyServlet2Test extends AgentTestRunner {
 
   OkHttpClient client = OkHttpUtils.clientBuilder().addNetworkInterceptor(new Interceptor() {
@@ -72,7 +70,7 @@ class JettyServlet2Test extends AgentTestRunner {
     expect:
     response.body().string().trim() == expectedResponse
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "ctx"
@@ -115,7 +113,7 @@ class JettyServlet2Test extends AgentTestRunner {
     expect:
     response.body().string().trim() != expectedResponse
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "ctx"
@@ -156,7 +154,7 @@ class JettyServlet2Test extends AgentTestRunner {
     expect:
     response.body().string().trim() != expectedResponse
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "ctx"

dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServlet3Test.groovy

@@ -17,8 +17,6 @@ import org.eclipse.jetty.server.Server
 import org.eclipse.jetty.servlet.ServletContextHandler
 import org.eclipse.jetty.util.security.Constraint
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class JettyServlet3Test extends AgentTestRunner {
 
   OkHttpClient client = OkHttpUtils.clientBuilder().addNetworkInterceptor(new Interceptor() {
@@ -77,7 +75,7 @@ class JettyServlet3Test extends AgentTestRunner {
     expect:
     response.body().string().trim() == expectedResponse
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           if (distributedTracing) {
@@ -132,7 +130,7 @@ class JettyServlet3Test extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, numTraces) {
+    assertTraces(numTraces) {
       for (int i = 0; i < numTraces; ++i) {
         trace(i, 1) {
           span(0) {
@@ -156,7 +154,7 @@ class JettyServlet3Test extends AgentTestRunner {
     expect:
     response.body().string().trim() != expectedResponse
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"
@@ -197,7 +195,7 @@ class JettyServlet3Test extends AgentTestRunner {
     expect:
     response.body().string().trim() != expectedResponse
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "unnamed-java-app"

dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServlet3Test.groovy

@@ -11,8 +11,6 @@ import org.apache.catalina.startup.Tomcat
 import org.apache.tomcat.JarScanFilter
 import org.apache.tomcat.JarScanType
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class TomcatServlet3Test extends AgentTestRunner {
 
   OkHttpClient client = OkHttpUtils.client()
@@ -73,7 +71,7 @@ class TomcatServlet3Test extends AgentTestRunner {
     expect:
     response.body().string().trim() == expectedResponse
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           if (distributedTracing) {
@@ -121,7 +119,7 @@ class TomcatServlet3Test extends AgentTestRunner {
     expect:
     response.body().string().trim() != expectedResponse
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "my-context"
@@ -163,7 +161,7 @@ class TomcatServlet3Test extends AgentTestRunner {
     expect:
     response.body().string().trim() != expectedResponse
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "my-context"

dd-java-agent/instrumentation/spring-web/src/test/groovy/test/SpringBootBasedTest.groovy

@@ -13,8 +13,6 @@ import org.springframework.boot.test.web.client.TestRestTemplate
 import org.springframework.web.bind.MethodArgumentNotValidException
 import org.springframework.web.util.NestedServletException
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 class SpringBootBasedTest extends AgentTestRunner {
 
@@ -30,7 +28,7 @@ class SpringBootBasedTest extends AgentTestRunner {
     restTemplate.getForObject("http://localhost:$port/", String) == "Hello World"
 
     and:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "servlet.request"
@@ -58,7 +56,7 @@ class SpringBootBasedTest extends AgentTestRunner {
     expect:
     restTemplate.getForObject("http://localhost:$port/param/asdf1234/", String) == "Hello asdf1234"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "servlet.request"
@@ -90,7 +88,7 @@ class SpringBootBasedTest extends AgentTestRunner {
     response.get("status") == 404
     response.get("error") == "Not Found"
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 2) {
         span(0) {
           operationName "servlet.request"
@@ -144,7 +142,7 @@ class SpringBootBasedTest extends AgentTestRunner {
     response.get("exception") == "java.lang.RuntimeException"
     response.get("message") == "qwerty"
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 2) {
         span(0) {
           operationName "servlet.request"
@@ -194,7 +192,7 @@ class SpringBootBasedTest extends AgentTestRunner {
     expect:
     restTemplate.postForObject("http://localhost:$port/validated", new TestForm("bob", 20), String) == "Hello bob Person(Name: bob, Age: 20)"
 
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           operationName "servlet.request"
@@ -228,7 +226,7 @@ class SpringBootBasedTest extends AgentTestRunner {
     response.get("exception") == "org.springframework.web.bind.MethodArgumentNotValidException"
     response.get("message") == "Validation failed for object='testForm'. Error count: 1"
 
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 2) {
         span(0) {
           operationName "servlet.request"

dd-java-agent/instrumentation/spring-webflux/src/test/groovy/SpringWebfluxTest.groovy

@@ -15,8 +15,6 @@ import org.springframework.boot.web.server.LocalServerPort
 import org.springframework.web.server.ResponseStatusException
 import spock.lang.Unroll
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = SpringWebFluxTestApplication)
 class SpringWebfluxTest extends AgentTestRunner {
 
@@ -40,7 +38,7 @@ class SpringWebfluxTest extends AgentTestRunner {
     then:
     response.code == 200
     response.body().string() == expectedResponseBody
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           resourceNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
@@ -95,7 +93,7 @@ class SpringWebfluxTest extends AgentTestRunner {
     then:
     response.code == 200
     response.body().string() == expectedResponseBody
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           resourceName TestController.getSimpleName() + ".getFooModel"
@@ -146,7 +144,7 @@ class SpringWebfluxTest extends AgentTestRunner {
 
     then:
     response.code == 404
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           resourceName "404"
@@ -195,7 +193,7 @@ class SpringWebfluxTest extends AgentTestRunner {
     then:
     response.code() == 202
     response.body().string() == echoString
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           resourceName EchoHandlerFunction.getSimpleName() + ".handle"
@@ -243,7 +241,7 @@ class SpringWebfluxTest extends AgentTestRunner {
 
     then:
     response.code() == 500
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           resourceName "GET /failfoo/{id}"
@@ -294,7 +292,7 @@ class SpringWebfluxTest extends AgentTestRunner {
 
     then:
     response.code() == 500
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           resourceName "POST /fail-echo"
@@ -346,7 +344,7 @@ class SpringWebfluxTest extends AgentTestRunner {
 
     then:
     response.code == 200
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 2) {
         span(0) {
           resourceName "GET /double-greet-redirect"
@@ -432,7 +430,7 @@ class SpringWebfluxTest extends AgentTestRunner {
     then:
     response.code() == 200
     expectedResponseBodyStr == response.body().string()
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           resourceNameContains(SPRING_APP_CLASS_ANON_NESTED_CLASS_PREFIX, ".handle")
@@ -486,7 +484,7 @@ class SpringWebfluxTest extends AgentTestRunner {
     then:
     response.code() == 200
     expectedResponseBodyStr == response.body().string()
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         span(0) {
           resourceName TestController.getSimpleName() + ".getXFooModels"

dd-java-agent/instrumentation/spymemcached-2.12/src/test/groovy/datadog/trace/instrumentation/spymemcached/SpymemcachedTest.groovy

@@ -27,7 +27,6 @@ import static CompletionListener.COMPONENT_NAME
 import static CompletionListener.OPERATION_NAME
 import static CompletionListener.SERVICE_NAME
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static net.spy.memcached.ConnectionFactoryBuilder.Protocol.BINARY
 
 // Do not run tests locally on Java7 since testcontainers are not compatible with Java7
@@ -145,7 +144,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", null, "hit")
@@ -160,7 +159,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", null, "miss")
@@ -177,7 +176,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", "canceled")
@@ -201,7 +200,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         getSpan(it, 0, "get", "timeout")
       }
@@ -216,7 +215,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "getBulk", null, null)
@@ -231,7 +230,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "set")
@@ -248,7 +247,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "set", "canceled")
@@ -264,7 +263,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", null, "hit")
@@ -281,7 +280,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         getParentSpan(it, 0)
         getSpan(it, 1, "add")
@@ -298,7 +297,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", null, "miss")
@@ -314,7 +313,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "delete")
@@ -330,7 +329,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", null, "hit")
@@ -346,7 +345,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "replace")
@@ -363,7 +362,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 4) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", null, "hit")
@@ -382,7 +381,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 4) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", null, "hit")
@@ -400,7 +399,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         getParentSpan(it, 0)
         getSpan(it, 1, "cas")
@@ -416,7 +415,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "cas")
@@ -431,7 +430,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "touch")
@@ -446,7 +445,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "touch")
@@ -461,7 +460,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "getAndTouch")
@@ -476,7 +475,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "getAndTouch")
@@ -496,7 +495,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", null, "hit")
@@ -512,7 +511,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "decr")
@@ -526,7 +525,7 @@ class SpymemcachedTest extends AgentTestRunner {
 
     then:
     thrown IllegalArgumentException
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         getSpan(it, 0, "decr", "long key")
       }
@@ -545,7 +544,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         getParentSpan(it, 0)
         getSpan(it, 1, "get", null, "hit")
@@ -561,7 +560,7 @@ class SpymemcachedTest extends AgentTestRunner {
     }
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 2) {
         getParentSpan(it, 0)
         getSpan(it, 1, "incr")
@@ -575,7 +574,7 @@ class SpymemcachedTest extends AgentTestRunner {
 
     then:
     thrown IllegalArgumentException
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         getSpan(it, 0, "incr", "long key")
       }

dd-java-agent/instrumentation/trace-annotation/src/test/groovy/ConfiguredTraceAnnotationsTest.groovy

@@ -6,7 +6,6 @@ import java.util.concurrent.Callable
 
 import static TraceAnnotationsInstrumentation.DEFAULT_ANNOTATIONS
 import static datadog.trace.agent.test.TestUtils.withSystemProperty
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 class ConfiguredTraceAnnotationsTest extends AgentTestRunner {
 
@@ -35,7 +34,7 @@ class ConfiguredTraceAnnotationsTest extends AgentTestRunner {
     TEST_WRITER.waitForTraces(1)
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           resourceName "AnnotationTracedCallable.call"

dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceAnnotationsTest.groovy

@@ -5,8 +5,6 @@ import dd.test.trace.annotation.SayTracedHello
 
 import java.util.concurrent.Callable
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
-
 class TraceAnnotationsTest extends AgentTestRunner {
 
   static {
@@ -19,7 +17,7 @@ class TraceAnnotationsTest extends AgentTestRunner {
     SayTracedHello.sayHello()
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           serviceName "test"
@@ -41,7 +39,7 @@ class TraceAnnotationsTest extends AgentTestRunner {
     SayTracedHello.sayHELLOsayHA()
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 3) {
         span(0) {
           resourceName "NEW_TRACE"
@@ -90,7 +88,7 @@ class TraceAnnotationsTest extends AgentTestRunner {
     }
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           resourceName "ERROR"
@@ -111,7 +109,7 @@ class TraceAnnotationsTest extends AgentTestRunner {
     SayTracedHello.fromCallable()
 
     expect:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           resourceName "SayTracedHello\$1.call"
@@ -132,7 +130,7 @@ class TraceAnnotationsTest extends AgentTestRunner {
     TEST_WRITER.waitForTraces(2)
 
     then:
-    assertTraces(TEST_WRITER, 2) {
+    assertTraces(2) {
       trace(0, 1) {
         span(0) {
           resourceName "SayTracedHello\$1.call"

dd-java-agent/instrumentation/trace-annotation/src/test/groovy/TraceConfigTest.groovy

@@ -4,7 +4,6 @@ import datadog.trace.instrumentation.trace_annotation.TraceConfigInstrumentation
 import java.util.concurrent.Callable
 
 import static datadog.trace.agent.test.TestUtils.withSystemProperty
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 class TraceConfigTest extends AgentTestRunner {
 
@@ -31,7 +30,7 @@ class TraceConfigTest extends AgentTestRunner {
     TEST_WRITER.waitForTraces(1)
 
     then:
-    assertTraces(TEST_WRITER, 1) {
+    assertTraces(1) {
       trace(0, 1) {
         span(0) {
           resourceName "ConfigTracedCallable.call"

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

@@ -5,11 +5,14 @@ import ch.qos.logback.classic.Logger;
 import com.google.common.collect.Sets;
 import datadog.opentracing.DDSpan;
 import datadog.opentracing.DDTracer;
+import datadog.trace.agent.test.asserts.ListWriterAssert;
 import datadog.trace.agent.tooling.AgentInstaller;
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.api.GlobalTracer;
 import datadog.trace.common.writer.ListWriter;
 import datadog.trace.common.writer.Writer;
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
 import io.opentracing.Tracer;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.Instrumentation;
@@ -124,7 +127,8 @@ public abstract class AgentTestRunner extends Specification {
     final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
     try {
       Thread.currentThread().setContextClassLoader(AgentTestRunner.class.getClassLoader());
-      assert ServiceLoader.load(Instrumenter.class).iterator().hasNext();
+      assert ServiceLoader.load(Instrumenter.class).iterator().hasNext()
+          : "No instrumentation found";
       activeTransformer = AgentInstaller.installBytebuddyAgent(instrumentation, ERROR_LISTENER);
     } finally {
       Thread.currentThread().setContextClassLoader(contextLoader);
@@ -154,6 +158,13 @@ public abstract class AgentTestRunner extends Specification {
     }
   }
 
+  public static void assertTraces(
+      final int size,
+      @DelegatesTo(value = ListWriterAssert.class, strategy = Closure.DELEGATE_FIRST)
+          final Closure spec) {
+    ListWriterAssert.assertTraces(TEST_WRITER, size, spec);
+  }
+
   public static class ErrorCountingListener implements AgentBuilder.Listener {
     private static final List<AgentTestRunner> activeTests = new CopyOnWriteArrayList<>();
 

dd-java-agent/testing/src/test/groovy/muzzle/ReferenceCreatorTest.groovy

@@ -3,7 +3,9 @@ package muzzle
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.agent.tooling.muzzle.Reference
 import datadog.trace.agent.tooling.muzzle.ReferenceCreator
-import static muzzle.TestClasses.*
+
+import static muzzle.TestClasses.LdcAdvice
+import static muzzle.TestClasses.MethodBodyAdvice
 
 class ReferenceCreatorTest extends AgentTestRunner {
   def "method body creates references"() {
@@ -57,7 +59,7 @@ class ReferenceCreatorTest extends AgentTestRunner {
     findMethod(bMethods, "protectedMethod", "()V").getFlags().contains(Reference.Flag.PROTECTED_OR_HIGHER)
   }
 
-  def "ldc creates references" () {
+  def "ldc creates references"() {
     setup:
     Map<String, Reference> references = ReferenceCreator.createReferencesFrom(LdcAdvice.getName(), this.getClass().getClassLoader())
 

dd-java-agent/testing/src/test/groovy/muzzle/ReferenceMatcherTest.groovy

@@ -1,19 +1,25 @@
 package muzzle
 
-import static datadog.trace.agent.tooling.muzzle.Reference.Flag.*
-import static datadog.trace.agent.tooling.muzzle.Reference.Mismatch.*
-
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.agent.test.TestUtils
 import datadog.trace.agent.tooling.muzzle.Reference
 import datadog.trace.agent.tooling.muzzle.Reference.Source
 import datadog.trace.agent.tooling.muzzle.ReferenceCreator
 import datadog.trace.agent.tooling.muzzle.ReferenceMatcher
-
 import net.bytebuddy.jar.asm.Type
 import spock.lang.Shared
 
-import static muzzle.TestClasses.*
+import static datadog.trace.agent.tooling.muzzle.Reference.Flag.INTERFACE
+import static datadog.trace.agent.tooling.muzzle.Reference.Flag.NON_INTERFACE
+import static datadog.trace.agent.tooling.muzzle.Reference.Flag.NON_STATIC
+import static datadog.trace.agent.tooling.muzzle.Reference.Flag.PRIVATE_OR_HIGHER
+import static datadog.trace.agent.tooling.muzzle.Reference.Flag.PROTECTED_OR_HIGHER
+import static datadog.trace.agent.tooling.muzzle.Reference.Flag.STATIC
+import static datadog.trace.agent.tooling.muzzle.Reference.Mismatch.MissingClass
+import static datadog.trace.agent.tooling.muzzle.Reference.Mismatch.MissingField
+import static datadog.trace.agent.tooling.muzzle.Reference.Mismatch.MissingFlag
+import static datadog.trace.agent.tooling.muzzle.Reference.Mismatch.MissingMethod
+import static muzzle.TestClasses.MethodBodyAdvice
 
 class ReferenceMatcherTest extends AgentTestRunner {
 
@@ -45,7 +51,7 @@ class ReferenceMatcherTest extends AgentTestRunner {
     MuzzleWeakReferenceTest.classLoaderRefIsGarbageCollected()
   }
 
-  private static class CountingClassLoader extends URLClassLoader{
+  private static class CountingClassLoader extends URLClassLoader {
     int count = 0
 
     CountingClassLoader(URL[] urls, ClassLoader parent) {

dd-java-agent/testing/src/test/groovy/server/ServerTest.groovy

@@ -2,16 +2,17 @@ package server
 
 import datadog.opentracing.DDTracer
 import datadog.trace.agent.test.AgentTestRunner
+import datadog.trace.agent.test.asserts.ListWriterAssert
 import datadog.trace.agent.test.utils.OkHttpUtils
 import datadog.trace.common.writer.ListWriter
 import okhttp3.MultipartBody
 import okhttp3.Request
 import spock.lang.Shared
 
-import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 
 /* Don't actually need AgentTestRunner, but it messes up the classloader for AgentTestRunnerTest if this runs first. */
+
 class ServerTest extends AgentTestRunner {
   @Shared
   def client = OkHttpUtils.client()
@@ -314,7 +315,7 @@ class ServerTest extends AgentTestRunner {
     response.code() == 200
     response.body().string().trim() == "done"
 
-    assertTraces(writer, 1) {
+    ListWriterAssert.assertTraces(writer, 1) {
       server.distributedRequestTrace(it, 0)
     }
 

dd-trace-ot/src/test/groovy/datadog/opentracing/TraceInterceptorTest.groovy

@@ -1,9 +1,9 @@
 package datadog.opentracing
 
+import datadog.trace.api.GlobalTracer
 import datadog.trace.api.interceptor.MutableSpan
 import datadog.trace.api.interceptor.TraceInterceptor
 import datadog.trace.common.writer.ListWriter
-import datadog.trace.api.GlobalTracer
 import spock.lang.Specification
 
 import java.util.concurrent.atomic.AtomicBoolean
@@ -145,7 +145,7 @@ class TraceInterceptorTest extends Specification {
     tags.size() == 6
   }
 
-  def "register interceptor through bridge" () {
+  def "register interceptor through bridge"() {
     setup:
     GlobalTracer.registerIfAbsent(tracer)
     def interceptor = new TraceInterceptor() {