diff --git a/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy b/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy index 2d598d4d1f..1c80e017da 100644 --- a/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy +++ b/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy @@ -11,12 +11,13 @@ import akka.http.javadsl.model.HttpMethods import akka.http.javadsl.model.HttpRequest import akka.http.javadsl.model.headers.RawHeader import akka.stream.ActorMaterializer +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class AkkaHttpClientInstrumentationTest extends HttpClientTest { +class AkkaHttpClientInstrumentationTest extends HttpClientTest implements AgentTestTrait { @Shared ActorSystem system = ActorSystem.create() diff --git a/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy b/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy index 9ae8412e92..88f410ee94 100644 --- a/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy +++ b/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy @@ -3,9 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest -abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest { +abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest implements AgentTestTrait { @Override boolean testExceptionBody() { diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy index 2dd5395258..cbbf42ecc8 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientCallbackTest.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.CompletableFuture import org.apache.http.HttpResponse @@ -15,7 +16,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class ApacheHttpAsyncClientCallbackTest extends HttpClientTest { +class ApacheHttpAsyncClientCallbackTest extends HttpClientTest implements AgentTestTrait { @Shared RequestConfig requestConfig = RequestConfig.custom() diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy index 126bf9d9ba..397bebaedf 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientNullCallbackTest.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.Future import org.apache.http.client.config.RequestConfig @@ -13,7 +14,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class ApacheHttpAsyncClientNullCallbackTest extends HttpClientTest { +class ApacheHttpAsyncClientNullCallbackTest extends HttpClientTest implements AgentTestTrait { @Shared RequestConfig requestConfig = RequestConfig.custom() diff --git a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientTest.groovy b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientTest.groovy index 0b0a63e40d..4678dc96e7 100644 --- a/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientTest.groovy +++ b/instrumentation/apache-httpasyncclient-4.1/javaagent/src/test/groovy/ApacheHttpAsyncClientTest.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.CountDownLatch import org.apache.http.HttpResponse @@ -15,7 +16,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class ApacheHttpAsyncClientTest extends HttpClientTest { +class ApacheHttpAsyncClientTest extends HttpClientTest implements AgentTestTrait { @Shared RequestConfig requestConfig = RequestConfig.custom() diff --git a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/test/groovy/CommonsHttpClientTest.groovy b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/test/groovy/CommonsHttpClientTest.groovy index 5f7b7d6813..ee2f615d84 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/test/groovy/CommonsHttpClientTest.groovy +++ b/instrumentation/apache-httpclient/apache-httpclient-2.0/javaagent/src/test/groovy/CommonsHttpClientTest.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import org.apache.commons.httpclient.HttpClient import org.apache.commons.httpclient.HttpMethod @@ -17,7 +18,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class CommonsHttpClientTest extends HttpClientTest { +class CommonsHttpClientTest extends HttpClientTest implements AgentTestTrait { @Shared HttpClient client = new HttpClient() diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy index f508ec0ff1..246b14632c 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy +++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientResponseHandlerTest.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import org.apache.http.HttpResponse import org.apache.http.client.ResponseHandler @@ -14,7 +15,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class ApacheHttpClientResponseHandlerTest extends HttpClientTest { +class ApacheHttpClientResponseHandlerTest extends HttpClientTest implements AgentTestTrait { @Shared def client = new DefaultHttpClient() diff --git a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientTest.groovy b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientTest.groovy index e4bc2fa5cc..3f85e7fd53 100644 --- a/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientTest.groovy +++ b/instrumentation/apache-httpclient/apache-httpclient-4.0/javaagent/src/test/groovy/ApacheHttpClientTest.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import org.apache.http.HttpHost import org.apache.http.HttpRequest @@ -16,7 +17,7 @@ import org.apache.http.protocol.BasicHttpContext import spock.lang.Shared import spock.lang.Timeout -abstract class ApacheHttpClientTest extends HttpClientTest { +abstract class ApacheHttpClientTest extends HttpClientTest implements AgentTestTrait { @Shared def client = new DefaultHttpClient() diff --git a/instrumentation/async-http-client-1.9/javaagent/src/test/groovy/AsyncHttpClientTest.groovy b/instrumentation/async-http-client-1.9/javaagent/src/test/groovy/AsyncHttpClientTest.groovy index 6fedc3e551..acc23e17c4 100644 --- a/instrumentation/async-http-client-1.9/javaagent/src/test/groovy/AsyncHttpClientTest.groovy +++ b/instrumentation/async-http-client-1.9/javaagent/src/test/groovy/AsyncHttpClientTest.groovy @@ -9,11 +9,12 @@ import com.ning.http.client.Request import com.ning.http.client.RequestBuilder import com.ning.http.client.Response import com.ning.http.client.uri.Uri +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import spock.lang.AutoCleanup import spock.lang.Shared -class AsyncHttpClientTest extends HttpClientTest { +class AsyncHttpClientTest extends HttpClientTest implements AgentTestTrait { @AutoCleanup @Shared diff --git a/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy b/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy index 75542bc956..549e852440 100644 --- a/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy +++ b/instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy @@ -18,18 +18,19 @@ import io.dropwizard.setup.Bootstrap import io.dropwizard.setup.Environment import io.dropwizard.testing.ConfigOverride import io.dropwizard.testing.DropwizardTestSupport -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.instrumentation.test.utils.PortUtils import io.opentelemetry.sdk.trace.data.SpanData +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import javax.ws.rs.GET import javax.ws.rs.Path import javax.ws.rs.PathParam import javax.ws.rs.QueryParam import javax.ws.rs.core.Response -class DropwizardTest extends HttpServerTest { +class DropwizardTest extends HttpServerTest implements AgentTestTrait { @Override DropwizardTestSupport startServer(int port) { diff --git a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/groovy/FinatraServerLatestTest.groovy b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/groovy/FinatraServerLatestTest.groovy index caa1da4d8d..b225035c49 100644 --- a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/groovy/FinatraServerLatestTest.groovy +++ b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/groovy/FinatraServerLatestTest.groovy @@ -13,11 +13,12 @@ import com.twitter.util.Await import com.twitter.util.Closable import com.twitter.util.Duration import com.twitter.util.Promise +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData -class FinatraServerLatestTest extends HttpServerTest { +class FinatraServerLatestTest extends HttpServerTest implements AgentTestTrait { private static final Duration TIMEOUT = Duration.fromSeconds(5) private static final Duration STARTUP_TIMEOUT = Duration.fromSeconds(20) diff --git a/instrumentation/finatra-2.9/javaagent/src/test/groovy/FinatraServerTest.groovy b/instrumentation/finatra-2.9/javaagent/src/test/groovy/FinatraServerTest.groovy index 4e6aace5ce..04ef2c205a 100644 --- a/instrumentation/finatra-2.9/javaagent/src/test/groovy/FinatraServerTest.groovy +++ b/instrumentation/finatra-2.9/javaagent/src/test/groovy/FinatraServerTest.groovy @@ -10,12 +10,13 @@ import com.twitter.finatra.http.HttpServer import com.twitter.util.Await import com.twitter.util.Closable import com.twitter.util.Duration +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData import java.util.concurrent.TimeoutException -class FinatraServerTest extends HttpServerTest { +class FinatraServerTest extends HttpServerTest implements AgentTestTrait { private static final Duration TIMEOUT = Duration.fromSeconds(5) private static final long STARTUP_TIMEOUT = 40 * 1000 diff --git a/instrumentation/google-http-client-1.19/javaagent/src/test/groovy/AbstractGoogleHttpClientTest.groovy b/instrumentation/google-http-client-1.19/javaagent/src/test/groovy/AbstractGoogleHttpClientTest.groovy index 050902899f..bc004912ac 100644 --- a/instrumentation/google-http-client-1.19/javaagent/src/test/groovy/AbstractGoogleHttpClientTest.groovy +++ b/instrumentation/google-http-client-1.19/javaagent/src/test/groovy/AbstractGoogleHttpClientTest.groovy @@ -9,11 +9,12 @@ import com.google.api.client.http.GenericUrl import com.google.api.client.http.HttpRequest import com.google.api.client.http.HttpResponse import com.google.api.client.http.javanet.NetHttpTransport -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import spock.lang.Shared -abstract class AbstractGoogleHttpClientTest extends HttpClientTest { +abstract class AbstractGoogleHttpClientTest extends HttpClientTest implements AgentTestTrait { @Shared def requestFactory = new NetHttpTransport().createRequestFactory() diff --git a/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy b/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy index feaa11959e..315ef2acf3 100644 --- a/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy +++ b/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy @@ -16,6 +16,7 @@ import static java.nio.charset.Charset.defaultCharset import static java.util.concurrent.TimeUnit.MILLISECONDS import static org.glassfish.grizzly.memory.Buffers.wrap +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import java.util.concurrent.Executors import org.glassfish.grizzly.filterchain.BaseFilter @@ -36,7 +37,7 @@ import org.glassfish.grizzly.nio.transport.TCPNIOTransportBuilder import org.glassfish.grizzly.utils.DelayedExecutor import org.glassfish.grizzly.utils.IdleTimeoutFilter -class GrizzlyFilterchainServerTest extends HttpServerTest { +class GrizzlyFilterchainServerTest extends HttpServerTest implements AgentTestTrait { private TCPNIOTransport transport private TCPNIOServerConnection serverConnection diff --git a/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyTest.groovy b/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyTest.groovy index ee5cd0f787..7f94cd6379 100644 --- a/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyTest.groovy +++ b/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyTest.groovy @@ -9,6 +9,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import javax.ws.rs.GET import javax.ws.rs.NotFoundException @@ -22,7 +23,7 @@ import org.glassfish.grizzly.http.server.Request import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory import org.glassfish.jersey.server.ResourceConfig -class GrizzlyTest extends HttpServerTest { +class GrizzlyTest extends HttpServerTest implements AgentTestTrait { @Override HttpServer startServer(int port) { diff --git a/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionResponseCodeOnlyTest.groovy b/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionResponseCodeOnlyTest.groovy index 8c7f2c72e9..23d1f7b14b 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionResponseCodeOnlyTest.groovy +++ b/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionResponseCodeOnlyTest.groovy @@ -3,11 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import spock.lang.Timeout @Timeout(5) -class HttpUrlConnectionResponseCodeOnlyTest extends HttpClientTest { +class HttpUrlConnectionResponseCodeOnlyTest extends HttpClientTest implements AgentTestTrait { @Override int doRequest(String method, URI uri, Map headers, Closure callback) { diff --git a/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionTest.groovy b/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionTest.groovy index bea837aca6..d39cb410b8 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionTest.groovy +++ b/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionTest.groovy @@ -7,15 +7,16 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace import io.opentelemetry.api.trace.Span -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import spock.lang.Ignore import spock.lang.Requires import spock.lang.Timeout import sun.net.www.protocol.https.HttpsURLConnectionImpl @Timeout(5) -class HttpUrlConnectionTest extends HttpClientTest { +class HttpUrlConnectionTest extends HttpClientTest implements AgentTestTrait { static final RESPONSE = "Hello." static final STATUS = 200 diff --git a/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionUseCachesFalseTest.groovy b/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionUseCachesFalseTest.groovy index 822c0ea508..d75f298a99 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionUseCachesFalseTest.groovy +++ b/instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionUseCachesFalseTest.groovy @@ -4,11 +4,12 @@ */ import io.opentelemetry.api.trace.Span +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import spock.lang.Timeout @Timeout(5) -class HttpUrlConnectionUseCachesFalseTest extends HttpClientTest { +class HttpUrlConnectionUseCachesFalseTest extends HttpClientTest implements AgentTestTrait { @Override int doRequest(String method, URI uri, Map headers, Closure callback) { diff --git a/instrumentation/http-url-connection/javaagent/src/test/groovy/SpringRestTemplateTest.groovy b/instrumentation/http-url-connection/javaagent/src/test/groovy/SpringRestTemplateTest.groovy index b33910846c..7b7020978d 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/groovy/SpringRestTemplateTest.groovy +++ b/instrumentation/http-url-connection/javaagent/src/test/groovy/SpringRestTemplateTest.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import org.springframework.http.HttpEntity import org.springframework.http.HttpHeaders @@ -15,7 +16,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class SpringRestTemplateTest extends HttpClientTest { +class SpringRestTemplateTest extends HttpClientTest implements AgentTestTrait { @Shared ClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory() diff --git a/instrumentation/java-httpclient/javaagent/src/test/groovy/JdkHttpClientTest.groovy b/instrumentation/java-httpclient/javaagent/src/test/groovy/JdkHttpClientTest.groovy index 980d41fe77..c67f07bccb 100644 --- a/instrumentation/java-httpclient/javaagent/src/test/groovy/JdkHttpClientTest.groovy +++ b/instrumentation/java-httpclient/javaagent/src/test/groovy/JdkHttpClientTest.groovy @@ -5,8 +5,9 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import java.net.http.HttpClient import java.net.http.HttpRequest import java.net.http.HttpResponse @@ -17,7 +18,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -abstract class JdkHttpClientTest extends HttpClientTest { +abstract class JdkHttpClientTest extends HttpClientTest implements AgentTestTrait { @Shared def client = HttpClient.newBuilder().connectTimeout(Duration.of(CONNECT_TIMEOUT_MS, diff --git a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy index 7411649e61..11b3b700a1 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-1.1/javaagent/src/test/groovy/JaxRsClientV1Test.groovy @@ -7,12 +7,13 @@ import com.sun.jersey.api.client.Client import com.sun.jersey.api.client.ClientResponse import com.sun.jersey.api.client.filter.GZIPContentEncodingFilter import com.sun.jersey.api.client.filter.LoggingFilter +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class JaxRsClientV1Test extends HttpClientTest { +class JaxRsClientV1Test extends HttpClientTest implements AgentTestTrait { @Shared Client client = Client.create() diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientAsyncTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientAsyncTest.groovy index 6c2f3d63b1..07758eb935 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientAsyncTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientAsyncTest.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit @@ -21,7 +22,7 @@ import org.glassfish.jersey.client.JerseyClientBuilder import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder import spock.lang.Timeout -abstract class JaxRsClientAsyncTest extends HttpClientTest { +abstract class JaxRsClientAsyncTest extends HttpClientTest implements AgentTestTrait { @Override int doRequest(String method, URI uri, Map headers, Closure callback) { diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientTest.groovy index d952a4edc4..1e4d47726b 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientTest.groovy @@ -5,8 +5,9 @@ import static io.opentelemetry.api.trace.SpanKind.CLIENT -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import java.util.concurrent.TimeUnit import javax.ws.rs.client.Client import javax.ws.rs.client.ClientBuilder @@ -23,7 +24,7 @@ import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder import spock.lang.Timeout import spock.lang.Unroll -abstract class JaxRsClientTest extends HttpClientTest { +abstract class JaxRsClientTest extends HttpClientTest implements AgentTestTrait { @Override int doRequest(String method, URI uri, Map headers, Closure callback) { diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/ResteasyProxyClientTest.groovy b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/ResteasyProxyClientTest.groovy index 747a4aad71..9765640aa3 100644 --- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/ResteasyProxyClientTest.groovy +++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/ResteasyProxyClientTest.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.nio.charset.StandardCharsets import javax.ws.rs.GET @@ -16,7 +17,7 @@ import org.apache.http.client.utils.URLEncodedUtils import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder import org.jboss.resteasy.specimpl.ResteasyUriBuilder -class ResteasyProxyClientTest extends HttpClientTest { +class ResteasyProxyClientTest extends HttpClientTest implements AgentTestTrait { @Override int doRequest(String method, URI uri, Map headers, Closure callback) { def proxyMethodName = "${method}_${uri.path}".toLowerCase() diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsHttpServerTest.groovy index 3083ea41f7..b8a2bfca2b 100644 --- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsHttpServerTest.groovy +++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-testing/src/main/groovy/JaxRsHttpServerTest.groovy @@ -11,10 +11,11 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static java.util.concurrent.TimeUnit.SECONDS import static org.junit.Assume.assumeTrue -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData +import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import java.util.concurrent.CompletableFuture import okhttp3.Call import okhttp3.Callback @@ -24,7 +25,7 @@ import okhttp3.Response import spock.lang.Timeout import spock.lang.Unroll -abstract class JaxRsHttpServerTest extends HttpServerTest { +abstract class JaxRsHttpServerTest extends HttpServerTest implements AgentTestTrait { @Timeout(10) @Unroll def "should handle #desc AsyncResponse"() { diff --git a/instrumentation/jetty-8.0/javaagent/src/test/groovy/JettyHandlerTest.groovy b/instrumentation/jetty-8.0/javaagent/src/test/groovy/JettyHandlerTest.groovy index f731ce7aa6..d6ba2663d7 100644 --- a/instrumentation/jetty-8.0/javaagent/src/test/groovy/JettyHandlerTest.groovy +++ b/instrumentation/jetty-8.0/javaagent/src/test/groovy/JettyHandlerTest.groovy @@ -10,6 +10,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import javax.servlet.DispatcherType @@ -23,7 +24,7 @@ import org.eclipse.jetty.server.handler.AbstractHandler import org.eclipse.jetty.server.handler.ErrorHandler import spock.lang.Shared -class JettyHandlerTest extends HttpServerTest { +class JettyHandlerTest extends HttpServerTest implements AgentTestTrait { @Shared ErrorHandler errorHandler = new ErrorHandler() { diff --git a/instrumentation/khttp-0.1/javaagent/src/test/groovy/KHttpClientTest.groovy b/instrumentation/khttp-0.1/javaagent/src/test/groovy/KHttpClientTest.groovy index 4e834317c5..5111c33296 100644 --- a/instrumentation/khttp-0.1/javaagent/src/test/groovy/KHttpClientTest.groovy +++ b/instrumentation/khttp-0.1/javaagent/src/test/groovy/KHttpClientTest.groovy @@ -3,10 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import khttp.KHttp -class KHttpClientTest extends HttpClientTest { +class KHttpClientTest extends HttpClientTest implements AgentTestTrait { @Override int doRequest(String method, URI uri, Map headers, Closure callback) { diff --git a/instrumentation/netty/netty-3.8/javaagent/src/latestDepTest/groovy/Netty38ClientTest.groovy b/instrumentation/netty/netty-3.8/javaagent/src/latestDepTest/groovy/Netty38ClientTest.groovy index 2915a1c7fe..4929505a13 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/latestDepTest/groovy/Netty38ClientTest.groovy +++ b/instrumentation/netty/netty-3.8/javaagent/src/latestDepTest/groovy/Netty38ClientTest.groovy @@ -11,13 +11,14 @@ import com.ning.http.client.AsyncCompletionHandler import com.ning.http.client.AsyncHttpClient import com.ning.http.client.AsyncHttpClientConfig import com.ning.http.client.Response +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.ExecutionException import java.util.concurrent.TimeUnit import spock.lang.AutoCleanup import spock.lang.Shared -class Netty38ClientTest extends HttpClientTest { +class Netty38ClientTest extends HttpClientTest implements AgentTestTrait { @Shared def clientConfig = new AsyncHttpClientConfig.Builder() diff --git a/instrumentation/netty/netty-3.8/javaagent/src/latestDepTest/groovy/Netty38ServerTest.groovy b/instrumentation/netty/netty-3.8/javaagent/src/latestDepTest/groovy/Netty38ServerTest.groovy index e840594142..c9ea70b683 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/latestDepTest/groovy/Netty38ServerTest.groovy +++ b/instrumentation/netty/netty-3.8/javaagent/src/latestDepTest/groovy/Netty38ServerTest.groovy @@ -15,6 +15,7 @@ import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.LOCATION import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1 +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import org.jboss.netty.bootstrap.ServerBootstrap import org.jboss.netty.buffer.ChannelBuffer @@ -41,7 +42,7 @@ import org.jboss.netty.logging.InternalLoggerFactory import org.jboss.netty.logging.Slf4JLoggerFactory import org.jboss.netty.util.CharsetUtil -class Netty38ServerTest extends HttpServerTest { +class Netty38ServerTest extends HttpServerTest implements AgentTestTrait { static final LoggingHandler LOGGING_HANDLER static { diff --git a/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ClientTest.groovy b/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ClientTest.groovy index 0523040ad5..ba05b2b099 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ClientTest.groovy +++ b/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ClientTest.groovy @@ -11,13 +11,14 @@ import com.ning.http.client.AsyncCompletionHandler import com.ning.http.client.AsyncHttpClient import com.ning.http.client.AsyncHttpClientConfig import com.ning.http.client.Response +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.ExecutionException import java.util.concurrent.TimeUnit import spock.lang.AutoCleanup import spock.lang.Shared -class Netty38ClientTest extends HttpClientTest { +class Netty38ClientTest extends HttpClientTest implements AgentTestTrait { @Shared def clientConfig = new AsyncHttpClientConfig.Builder() diff --git a/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ServerTest.groovy b/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ServerTest.groovy index 670deffebe..2f97c594e2 100644 --- a/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ServerTest.groovy +++ b/instrumentation/netty/netty-3.8/javaagent/src/test/groovy/Netty38ServerTest.groovy @@ -15,6 +15,7 @@ import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONTENT_TYPE import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.LOCATION import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1 +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import org.jboss.netty.bootstrap.ServerBootstrap import org.jboss.netty.buffer.ChannelBuffer @@ -41,7 +42,7 @@ import org.jboss.netty.logging.InternalLoggerFactory import org.jboss.netty.logging.Slf4JLoggerFactory import org.jboss.netty.util.CharsetUtil -class Netty38ServerTest extends HttpServerTest { +class Netty38ServerTest extends HttpServerTest implements AgentTestTrait { static final LoggingHandler LOGGING_HANDLER static { diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientTest.groovy b/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientTest.groovy index 45c0cf9892..50ff88bf32 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientTest.groovy +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ClientTest.groovy @@ -8,6 +8,7 @@ import static io.opentelemetry.instrumentation.test.utils.TraceUtils.basicSpan import static io.opentelemetry.instrumentation.test.utils.TraceUtils.runUnderTrace import static org.asynchttpclient.Dsl.asyncHttpClient +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.ExecutionException import java.util.concurrent.TimeUnit @@ -20,7 +21,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class Netty40ClientTest extends HttpClientTest { +class Netty40ClientTest extends HttpClientTest implements AgentTestTrait { @Shared def clientConfig = DefaultAsyncHttpClientConfig.Builder.newInstance().setRequestTimeout(TimeUnit.SECONDS.toMillis(10).toInteger()) diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ServerTest.groovy b/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ServerTest.groovy index 248274945a..9e1b6fa99d 100644 --- a/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ServerTest.groovy +++ b/instrumentation/netty/netty-4.0/javaagent/src/test/groovy/Netty40ServerTest.groovy @@ -34,9 +34,10 @@ import io.netty.handler.codec.http.HttpResponseStatus import io.netty.handler.logging.LogLevel import io.netty.handler.logging.LoggingHandler import io.netty.util.CharsetUtil +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest -class Netty40ServerTest extends HttpServerTest { +class Netty40ServerTest extends HttpServerTest implements AgentTestTrait { static final LoggingHandler LOGGING_HANDLER = new LoggingHandler(SERVER_LOGGER.name, LogLevel.DEBUG) diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientTest.groovy index 418f1101d7..c84a6d2ed5 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientTest.groovy @@ -26,6 +26,7 @@ import io.netty.handler.codec.http.HttpClientCodec import io.netty.handler.codec.http.HttpHeaderNames import io.netty.handler.codec.http.HttpMethod import io.netty.handler.codec.http.HttpVersion +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.opentelemetry.javaagent.instrumentation.netty.v4_1.client.HttpClientTracingHandler import java.util.concurrent.ExecutionException @@ -40,7 +41,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class Netty41ClientTest extends HttpClientTest { +class Netty41ClientTest extends HttpClientTest implements AgentTestTrait { @Shared def clientConfig = DefaultAsyncHttpClientConfig.Builder.newInstance().setRequestTimeout(TimeUnit.SECONDS.toMillis(10).toInteger()) diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ServerTest.groovy b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ServerTest.groovy index 3ca957e980..af0fcb80f0 100644 --- a/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ServerTest.groovy +++ b/instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ServerTest.groovy @@ -33,9 +33,10 @@ import io.netty.handler.codec.http.HttpServerCodec import io.netty.handler.logging.LogLevel import io.netty.handler.logging.LoggingHandler import io.netty.util.CharsetUtil +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest -class Netty41ServerTest extends HttpServerTest { +class Netty41ServerTest extends HttpServerTest implements AgentTestTrait { static final LoggingHandler LOGGING_HANDLER = new LoggingHandler(SERVER_LOGGER.name, LogLevel.DEBUG) diff --git a/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/groovy/OkHttp2Test.groovy b/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/groovy/OkHttp2Test.groovy index b15a9e7756..37b9907543 100644 --- a/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/groovy/OkHttp2Test.groovy +++ b/instrumentation/okhttp/okhttp-2.2/javaagent/src/test/groovy/OkHttp2Test.groovy @@ -9,13 +9,14 @@ import com.squareup.okhttp.OkHttpClient import com.squareup.okhttp.Request import com.squareup.okhttp.RequestBody import com.squareup.okhttp.internal.http.HttpMethod +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.TimeUnit import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class OkHttp2Test extends HttpClientTest { +class OkHttp2Test extends HttpClientTest implements AgentTestTrait { @Shared def client = new OkHttpClient() diff --git a/instrumentation/okhttp/okhttp-3.0/javaagent/src/test/groovy/OkHttp3Test.groovy b/instrumentation/okhttp/okhttp-3.0/javaagent/src/test/groovy/OkHttp3Test.groovy index 10bc2bace1..38e91b931c 100644 --- a/instrumentation/okhttp/okhttp-3.0/javaagent/src/test/groovy/OkHttp3Test.groovy +++ b/instrumentation/okhttp/okhttp-3.0/javaagent/src/test/groovy/OkHttp3Test.groovy @@ -3,6 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.TimeUnit import okhttp3.Headers @@ -14,7 +15,7 @@ import okhttp3.internal.http.HttpMethod import spock.lang.Timeout @Timeout(5) -class OkHttp3Test extends HttpClientTest { +class OkHttp3Test extends HttpClientTest implements AgentTestTrait { def client = new OkHttpClient.Builder() .connectTimeout(CONNECT_TIMEOUT_MS, TimeUnit.MILLISECONDS) diff --git a/instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBase.groovy b/instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBase.groovy index b484db026e..bb35cbabb0 100644 --- a/instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBase.groovy +++ b/instrumentation/play-ws/play-ws-testing/src/main/groovy/PlayWsClientTestBase.groovy @@ -6,6 +6,7 @@ import akka.actor.ActorSystem import akka.stream.ActorMaterializer import akka.stream.ActorMaterializerSettings +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import play.shaded.ahc.org.asynchttpclient.AsyncHttpClient import play.shaded.ahc.org.asynchttpclient.AsyncHttpClientConfig @@ -13,7 +14,7 @@ import play.shaded.ahc.org.asynchttpclient.DefaultAsyncHttpClient import play.shaded.ahc.org.asynchttpclient.DefaultAsyncHttpClientConfig import spock.lang.Shared -abstract class PlayWsClientTestBase extends HttpClientTest { +abstract class PlayWsClientTestBase extends HttpClientTest implements AgentTestTrait { @Shared ActorSystem system diff --git a/instrumentation/play/play-2.3/javaagent/src/test/groovy/client/PlayWsClientTest.groovy b/instrumentation/play/play-2.3/javaagent/src/test/groovy/client/PlayWsClientTest.groovy index 874b3da30b..c8d6cd15d8 100644 --- a/instrumentation/play/play-2.3/javaagent/src/test/groovy/client/PlayWsClientTest.groovy +++ b/instrumentation/play/play-2.3/javaagent/src/test/groovy/client/PlayWsClientTest.groovy @@ -5,6 +5,7 @@ package client +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.util.concurrent.TimeUnit import play.GlobalSettings @@ -13,7 +14,7 @@ import play.test.FakeApplication import play.test.Helpers import spock.lang.Shared -class PlayWsClientTest extends HttpClientTest { +class PlayWsClientTest extends HttpClientTest implements AgentTestTrait { @Shared def application = new FakeApplication( new File("."), diff --git a/instrumentation/play/play-2.3/javaagent/src/test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-2.3/javaagent/src/test/groovy/server/PlayServerTest.groovy index 25e1653067..f609f5d820 100644 --- a/instrumentation/play/play-2.3/javaagent/src/test/groovy/server/PlayServerTest.groovy +++ b/instrumentation/play/play-2.3/javaagent/src/test/groovy/server/PlayServerTest.groovy @@ -9,12 +9,13 @@ import static io.opentelemetry.api.trace.SpanKind.INTERNAL import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.EXCEPTION import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData import play.api.test.TestServer -class PlayServerTest extends HttpServerTest { +class PlayServerTest extends HttpServerTest implements AgentTestTrait { @Override TestServer startServer(int port) { def server = SyncServer.server(port) diff --git a/instrumentation/play/play-2.4/javaagent/src/test/groovy/client/PlayWsClientTest.groovy b/instrumentation/play/play-2.4/javaagent/src/test/groovy/client/PlayWsClientTest.groovy index 829e23715f..c54255708b 100644 --- a/instrumentation/play/play-2.4/javaagent/src/test/groovy/client/PlayWsClientTest.groovy +++ b/instrumentation/play/play-2.4/javaagent/src/test/groovy/client/PlayWsClientTest.groovy @@ -5,6 +5,7 @@ package client +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import play.libs.ws.WS import spock.lang.AutoCleanup @@ -15,7 +16,7 @@ import spock.lang.Timeout // Play 2.6+ uses a separately versioned client that shades the underlying dependency // This means our built in instrumentation won't work. @Timeout(5) -class PlayWsClientTest extends HttpClientTest { +class PlayWsClientTest extends HttpClientTest implements AgentTestTrait { @Subject @Shared @AutoCleanup diff --git a/instrumentation/play/play-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy index c50910ce9c..8a425a7aef 100644 --- a/instrumentation/play/play-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy +++ b/instrumentation/play/play-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy @@ -12,6 +12,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData @@ -20,7 +21,7 @@ import play.mvc.Results import play.routing.RoutingDsl import play.server.Server -class PlayServerTest extends HttpServerTest { +class PlayServerTest extends HttpServerTest implements AgentTestTrait { @Override Server startServer(int port) { def router = diff --git a/instrumentation/play/play-2.6/javaagent/src/test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-2.6/javaagent/src/test/groovy/server/PlayServerTest.groovy index 16ad7f5870..80edfb5991 100644 --- a/instrumentation/play/play-2.6/javaagent/src/test/groovy/server/PlayServerTest.groovy +++ b/instrumentation/play/play-2.6/javaagent/src/test/groovy/server/PlayServerTest.groovy @@ -12,6 +12,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData @@ -22,7 +23,7 @@ import play.mvc.Results import play.routing.RoutingDsl import play.server.Server -class PlayServerTest extends HttpServerTest { +class PlayServerTest extends HttpServerTest implements AgentTestTrait { @Override Server startServer(int port) { return Server.forRouter(Mode.TEST, port) { BuiltInComponents components -> diff --git a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy index 083a2a917d..c234b4d946 100644 --- a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy +++ b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy @@ -5,6 +5,7 @@ package client +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import java.time.Duration import ratpack.exec.ExecResult @@ -15,7 +16,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(5) -class RatpackHttpClientTest extends HttpClientTest { +class RatpackHttpClientTest extends HttpClientTest implements AgentTestTrait { @AutoCleanup @Shared diff --git a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/server/RatpackHttpServerTest.groovy b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/server/RatpackHttpServerTest.groovy index 41c5b1ad6f..2e0ffd2d2b 100644 --- a/instrumentation/ratpack-1.4/javaagent/src/test/groovy/server/RatpackHttpServerTest.groovy +++ b/instrumentation/ratpack-1.4/javaagent/src/test/groovy/server/RatpackHttpServerTest.groovy @@ -13,6 +13,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData @@ -21,7 +22,7 @@ import ratpack.groovy.test.embed.GroovyEmbeddedApp import ratpack.handling.Context import ratpack.test.embed.EmbeddedApp -class RatpackHttpServerTest extends HttpServerTest { +class RatpackHttpServerTest extends HttpServerTest implements AgentTestTrait { @Override EmbeddedApp startServer(int bindPort) { diff --git a/instrumentation/reactor-netty-0.9/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy b/instrumentation/reactor-netty-0.9/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy index 1266fd8dce..675b99b427 100644 --- a/instrumentation/reactor-netty-0.9/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy +++ b/instrumentation/reactor-netty-0.9/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy @@ -3,11 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import reactor.netty.http.client.HttpClient import reactor.netty.http.client.HttpClientResponse -class ReactorNettyHttpClientTest extends HttpClientTest { +class ReactorNettyHttpClientTest extends HttpClientTest implements AgentTestTrait { @Override boolean testRedirects() { diff --git a/instrumentation/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy b/instrumentation/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy index ade6bcd37f..a1f623a27e 100644 --- a/instrumentation/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy +++ b/instrumentation/reactor-netty-1.0/javaagent/src/test/groovy/ReactorNettyHttpClientTest.groovy @@ -3,11 +3,12 @@ * SPDX-License-Identifier: Apache-2.0 */ +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import reactor.netty.http.client.HttpClient import reactor.netty.http.client.HttpClientResponse -class ReactorNettyHttpClientTest extends HttpClientTest { +class ReactorNettyHttpClientTest extends HttpClientTest implements AgentTestTrait { @Override boolean testRedirects() { diff --git a/instrumentation/servlet/glassfish-testing/src/test/groovy/GlassFishServerTest.groovy b/instrumentation/servlet/glassfish-testing/src/test/groovy/GlassFishServerTest.groovy index 92880c84d4..fe6cc8141b 100644 --- a/instrumentation/servlet/glassfish-testing/src/test/groovy/GlassFishServerTest.groovy +++ b/instrumentation/servlet/glassfish-testing/src/test/groovy/GlassFishServerTest.groovy @@ -7,6 +7,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.NOT_FOUND import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import org.glassfish.embeddable.BootstrapProperties @@ -21,7 +22,7 @@ import org.glassfish.embeddable.archive.ScatteredArchive * OSGi setup that requires {@link io.opentelemetry.javaagent.instrumentation.javaclassloader.ClassloadingInstrumentation}. */ // TODO: Figure out a better way to test with OSGi included. -class GlassFishServerTest extends HttpServerTest { +class GlassFishServerTest extends HttpServerTest implements AgentTestTrait { @Override URI buildAddress() { diff --git a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy index b7620e706b..7a881364d2 100644 --- a/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy +++ b/instrumentation/servlet/servlet-2.2/javaagent/src/test/groovy/JettyServlet2Test.groovy @@ -11,6 +11,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData @@ -19,7 +20,7 @@ import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.ErrorHandler import org.eclipse.jetty.servlet.ServletContextHandler -class JettyServlet2Test extends HttpServerTest { +class JettyServlet2Test extends HttpServerTest implements AgentTestTrait { private static final CONTEXT = "ctx" diff --git a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy index a6e0313085..d0513eb732 100644 --- a/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy +++ b/instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/AbstractServlet3Test.groovy @@ -10,13 +10,14 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import javax.servlet.Servlet import okhttp3.Request import okhttp3.RequestBody -abstract class AbstractServlet3Test extends HttpServerTest { +abstract class AbstractServlet3Test extends HttpServerTest implements AgentTestTrait { @Override URI buildAddress() { return new URI("http://localhost:$port$contextPath/") diff --git a/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy b/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy index fb8b9b9458..8e260a1834 100644 --- a/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy +++ b/instrumentation/spring/spring-webflux-5.0/javaagent/src/test/groovy/client/SpringWebfluxHttpClientTest.groovy @@ -5,6 +5,7 @@ package client +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import org.springframework.http.HttpMethod import org.springframework.web.reactive.function.client.ClientResponse @@ -12,7 +13,7 @@ import org.springframework.web.reactive.function.client.WebClient import spock.lang.Timeout @Timeout(5) -class SpringWebfluxHttpClientTest extends HttpClientTest { +class SpringWebfluxHttpClientTest extends HttpClientTest implements AgentTestTrait { @Override int doRequest(String method, URI uri, Map headers, Closure callback) { diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy index bed62e2d49..144fef2f9f 100644 --- a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy +++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/boot/SpringBootBasedTest.groovy @@ -14,6 +14,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData @@ -24,7 +25,7 @@ import org.springframework.boot.SpringApplication import org.springframework.context.ConfigurableApplicationContext import org.springframework.web.servlet.view.RedirectView -class SpringBootBasedTest extends HttpServerTest { +class SpringBootBasedTest extends HttpServerTest implements AgentTestTrait { @Override ConfigurableApplicationContext startServer(int port) { diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/filter/ServletFilterTest.groovy b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/filter/ServletFilterTest.groovy index ddc889b7ab..df7186098c 100644 --- a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/filter/ServletFilterTest.groovy +++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/test/groovy/test/filter/ServletFilterTest.groovy @@ -12,6 +12,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData @@ -19,7 +20,7 @@ import org.springframework.boot.SpringApplication import org.springframework.context.ConfigurableApplicationContext import test.boot.SecurityConfig -class ServletFilterTest extends HttpServerTest { +class ServletFilterTest extends HttpServerTest implements AgentTestTrait { @Override ConfigurableApplicationContext startServer(int port) { diff --git a/instrumentation/struts-2.3/javaagent/src/test/groovy/Struts2ActionSpanTest.groovy b/instrumentation/struts-2.3/javaagent/src/test/groovy/Struts2ActionSpanTest.groovy index 5ca6b0e000..a66e143962 100644 --- a/instrumentation/struts-2.3/javaagent/src/test/groovy/Struts2ActionSpanTest.groovy +++ b/instrumentation/struts-2.3/javaagent/src/test/groovy/Struts2ActionSpanTest.groovy @@ -9,6 +9,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import io.opentelemetry.api.trace.SpanKind +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData @@ -21,7 +22,7 @@ import org.eclipse.jetty.servlet.DefaultServlet import org.eclipse.jetty.servlet.ServletContextHandler import org.eclipse.jetty.util.resource.FileResource -class Struts2ActionSpanTest extends HttpServerTest { +class Struts2ActionSpanTest extends HttpServerTest implements AgentTestTrait { @Override boolean testNotFound() { diff --git a/instrumentation/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatHandlerTest.groovy b/instrumentation/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatHandlerTest.groovy index 1a4cab6cf6..91c314146a 100644 --- a/instrumentation/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatHandlerTest.groovy +++ b/instrumentation/tomcat-7.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/tomcat7/TomcatHandlerTest.groovy @@ -11,6 +11,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.opentelemetry.sdk.trace.data.SpanData @@ -18,7 +19,7 @@ import org.apache.catalina.Context import org.apache.catalina.startup.Tomcat import org.apache.tomcat.util.descriptor.web.ErrorPage -class TomcatHandlerTest extends HttpServerTest { +class TomcatHandlerTest extends HttpServerTest implements AgentTestTrait { def "Tomcat starts"() { expect: diff --git a/instrumentation/undertow/javaagent/src/test/groovy/UndertowServerTest.groovy b/instrumentation/undertow/javaagent/src/test/groovy/UndertowServerTest.groovy index 27b0d8501f..8f4cf43aa0 100644 --- a/instrumentation/undertow/javaagent/src/test/groovy/UndertowServerTest.groovy +++ b/instrumentation/undertow/javaagent/src/test/groovy/UndertowServerTest.groovy @@ -9,6 +9,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.undertow.Handlers import io.undertow.Undertow @@ -16,7 +17,7 @@ import io.undertow.util.Headers import io.undertow.util.StatusCodes //TODO make test which mixes handlers and servlets -class UndertowServerTest extends HttpServerTest { +class UndertowServerTest extends HttpServerTest implements AgentTestTrait { @Override Undertow startServer(int port) { diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy index 6e822ba01a..bb082d0cc3 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy +++ b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy @@ -5,6 +5,7 @@ package client +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.vertx.circuitbreaker.CircuitBreakerOptions import io.vertx.core.VertxOptions @@ -18,7 +19,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(10) -class VertxRxCircuitBreakerWebClientTest extends HttpClientTest { +class VertxRxCircuitBreakerWebClientTest extends HttpClientTest implements AgentTestTrait { @Shared Vertx vertx = Vertx.vertx(new VertxOptions()) diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxWebClientTest.groovy b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxWebClientTest.groovy index 7808460faa..0974ba3fcd 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxWebClientTest.groovy +++ b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/client/VertxRxWebClientTest.groovy @@ -5,6 +5,7 @@ package client +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.vertx.core.VertxOptions import io.vertx.core.http.HttpMethod @@ -15,7 +16,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(10) -class VertxRxWebClientTest extends HttpClientTest { +class VertxRxWebClientTest extends HttpClientTest implements AgentTestTrait { @Shared Vertx vertx = Vertx.vertx(new VertxOptions()) diff --git a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/server/VertxRxHttpServerTest.groovy b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/server/VertxRxHttpServerTest.groovy index e92df5d2d9..0826df91db 100644 --- a/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/server/VertxRxHttpServerTest.groovy +++ b/instrumentation/vertx-reactive-3.5/javaagent/src/test/groovy/server/VertxRxHttpServerTest.groovy @@ -12,6 +12,7 @@ import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEn import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.REDIRECT import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.SUCCESS +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.vertx.core.DeploymentOptions import io.vertx.core.Future @@ -23,7 +24,7 @@ import io.vertx.reactivex.ext.web.Router import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit -class VertxRxHttpServerTest extends HttpServerTest { +class VertxRxHttpServerTest extends HttpServerTest implements AgentTestTrait { public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port" @Override diff --git a/instrumentation/vertx-web-3.0/src/test/groovy/client/VertxHttpClientTest.groovy b/instrumentation/vertx-web-3.0/src/test/groovy/client/VertxHttpClientTest.groovy index 7bb112f6f2..de9c6bdb6e 100644 --- a/instrumentation/vertx-web-3.0/src/test/groovy/client/VertxHttpClientTest.groovy +++ b/instrumentation/vertx-web-3.0/src/test/groovy/client/VertxHttpClientTest.groovy @@ -5,6 +5,7 @@ package client +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpClientTest import io.vertx.core.Vertx import io.vertx.core.VertxOptions @@ -16,7 +17,7 @@ import spock.lang.Shared import spock.lang.Timeout @Timeout(10) -class VertxHttpClientTest extends HttpClientTest { +class VertxHttpClientTest extends HttpClientTest implements AgentTestTrait { @Shared def vertx = Vertx.vertx(new VertxOptions()) diff --git a/instrumentation/vertx-web-3.0/src/test/groovy/server/VertxHttpServerTest.groovy b/instrumentation/vertx-web-3.0/src/test/groovy/server/VertxHttpServerTest.groovy index c5024adde3..c7188f2e91 100644 --- a/instrumentation/vertx-web-3.0/src/test/groovy/server/VertxHttpServerTest.groovy +++ b/instrumentation/vertx-web-3.0/src/test/groovy/server/VertxHttpServerTest.groovy @@ -7,6 +7,7 @@ package server import static io.opentelemetry.instrumentation.test.base.HttpServerTest.ServerEndpoint.PATH_PARAM +import io.opentelemetry.instrumentation.test.AgentTestTrait import io.opentelemetry.instrumentation.test.base.HttpServerTest import io.vertx.core.AbstractVerticle import io.vertx.core.DeploymentOptions @@ -16,9 +17,7 @@ import io.vertx.core.json.JsonObject import java.util.concurrent.CompletableFuture import java.util.concurrent.TimeUnit -class VertxHttpServerTest extends HttpServerTest { - public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port" - +class VertxHttpServerTest extends HttpServerTest implements AgentTestTrait { @Override Vertx startServer(int port) { Vertx server = Vertx.vertx(new VertxOptions() @@ -28,7 +27,7 @@ class VertxHttpServerTest extends HttpServerTest { CompletableFuture future = new CompletableFuture<>() server.deployVerticle(verticle().getName(), new DeploymentOptions() - .setConfig(new JsonObject().put(CONFIG_HTTP_SERVER_PORT, port)) + .setConfig(new JsonObject().put(VertxWebServer.CONFIG_HTTP_SERVER_PORT, port)) .setInstances(3)) { res -> if (!res.succeeded()) { throw new RuntimeException("Cannot deploy server Verticle", res.cause()) diff --git a/instrumentation/vertx-web-3.0/src/test/groovy/server/VertxWebServer.java b/instrumentation/vertx-web-3.0/src/test/java/server/VertxWebServer.java similarity index 96% rename from instrumentation/vertx-web-3.0/src/test/groovy/server/VertxWebServer.java rename to instrumentation/vertx-web-3.0/src/test/java/server/VertxWebServer.java index a6ac404904..603894ba15 100644 --- a/instrumentation/vertx-web-3.0/src/test/groovy/server/VertxWebServer.java +++ b/instrumentation/vertx-web-3.0/src/test/java/server/VertxWebServer.java @@ -20,10 +20,11 @@ import io.vertx.ext.web.Router; import io.vertx.ext.web.RoutingContext; public class VertxWebServer extends AbstractVerticle { + public static final String CONFIG_HTTP_SERVER_PORT = "http.server.port"; @Override public void start(Future startFuture) { - int port = config().getInteger(VertxHttpServerTest.CONFIG_HTTP_SERVER_PORT); + int port = config().getInteger(CONFIG_HTTP_SERVER_PORT); Router router = Router.router(vertx); //noinspection Convert2Lambda diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy index db43c6f4cc..867aba191b 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpClientTest.groovy @@ -16,7 +16,7 @@ import static org.junit.Assume.assumeTrue import groovy.transform.stc.ClosureParams import groovy.transform.stc.SimpleType import io.opentelemetry.api.trace.Span -import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification +import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.AttributesAssert import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData @@ -30,7 +30,7 @@ import spock.lang.Shared import spock.lang.Unroll @Unroll -abstract class HttpClientTest extends AgentInstrumentationSpecification { +abstract class HttpClientTest extends InstrumentationSpecification { protected static final BODY_METHODS = ["POST", "PUT"] protected static final CONNECT_TIMEOUT_MS = 5000 protected static final BASIC_AUTH_KEY = "custom-authorization-header" @@ -498,7 +498,7 @@ abstract class HttpClientTest extends AgentInstrumentationSpecification { } else { childOf((SpanData) parentSpan) } - if(additionAttributesAssert != null){ + if (additionAttributesAssert != null) { attributes(additionAttributesAssert) } } diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy index 6b445047c3..5d61c97965 100644 --- a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy +++ b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy @@ -17,7 +17,7 @@ import static org.junit.Assume.assumeTrue import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanKind -import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification +import io.opentelemetry.instrumentation.test.InstrumentationSpecification import io.opentelemetry.instrumentation.test.asserts.TraceAssert import io.opentelemetry.sdk.trace.data.SpanData import io.opentelemetry.semconv.trace.attributes.SemanticAttributes @@ -29,7 +29,7 @@ import okhttp3.Response import spock.lang.Unroll @Unroll -abstract class HttpServerTest extends AgentInstrumentationSpecification implements HttpServerTestTrait { +abstract class HttpServerTest extends InstrumentationSpecification implements HttpServerTestTrait { String expectedServerSpanName(ServerEndpoint endpoint) { return endpoint == PATH_PARAM ? getContextPath() + "/path/:id/param" : endpoint.resolvePath(address).path