Migrate HttpClientTest test server to Armeria

instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle

@@ -1,12 +1,5 @@
 apply from: "$rootDir/gradle/instrumentation.gradle"
 apply from: "$rootDir/gradle/test-with-scala.gradle"
-apply plugin: 'org.unbroken-dome.test-sets'
-
-testSets {
-  version101Test {
-    dirName = 'test'
-  }
-}
 
 muzzle {
   pass {
@@ -51,16 +44,9 @@ dependencies {
   library "com.typesafe.akka:akka-http_2.11:10.0.0"
   library "com.typesafe.akka:akka-stream_2.11:2.4.14"
 
-  // There are some internal API changes in 10.1 that we would like to test separately for
-  version101TestImplementation "com.typesafe.akka:akka-http_2.11:10.1.0"
-  version101TestImplementation "com.typesafe.akka:akka-stream_2.11:2.5.11"
-}
-
-test.dependsOn version101Test
-
-compileVersion101TestGroovy {
-  classpath = classpath.plus(files(compileVersion101TestScala.destinationDir))
-  dependsOn compileVersion101TestScala
+  // 10.0.x has some bugs making it incompatible with our test server.
+  testLibrary "com.typesafe.akka:akka-http_2.11:10.1.0"
+  testLibrary "com.typesafe.akka:akka-stream_2.11:2.5.11"
 }
 
 tasks.withType(Test).configureEach {

instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy

@@ -15,6 +15,7 @@ import akka.stream.ActorMaterializer
 import io.opentelemetry.instrumentation.test.AgentTestTrait
 import io.opentelemetry.instrumentation.test.base.HttpClientTest
 import io.opentelemetry.instrumentation.test.base.SingleConnection
+import java.util.concurrent.TimeUnit
 import spock.lang.Shared
 
 class AkkaHttpClientInstrumentationTest extends HttpClientTest<HttpRequest> implements AgentTestTrait {
@@ -36,7 +37,7 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest<HttpRequest> impl
     return Http.get(system)
       .singleRequest(request, materializer)
       .toCompletableFuture()
-      .get()
+      .get(10, TimeUnit.SECONDS)
       .status()
       .intValue()
   }

instrumentation/google-http-client-1.19/javaagent/src/test/groovy/AbstractGoogleHttpClientTest.groovy

@@ -63,7 +63,7 @@ abstract class AbstractGoogleHttpClientTest extends HttpClientTest<HttpRequest>
 
   def "error traces when exception is not thrown"() {
     given:
-    def uri = server.address.resolve("/error")
+    def uri = resolveAddress("/error")
 
     when:
     def responseCode = doRequest(method, uri)
@@ -85,7 +85,7 @@ abstract class AbstractGoogleHttpClientTest extends HttpClientTest<HttpRequest>
             "${SemanticAttributes.HTTP_FLAVOR.key}" "1.1"
           }
         }
-        server.distributedRequestSpan(it, 1, span(0))
+        serverSpan(it, 1, span(0))
       }
     }
 

instrumentation/http-url-connection/javaagent/src/test/groovy/HttpUrlConnectionTest.groovy

@@ -69,7 +69,7 @@ class HttpUrlConnectionTest extends HttpClientTest<HttpURLConnection> implements
   @Unroll
   def "trace request (useCaches: #useCaches)"() {
     setup:
-    def url = server.address.resolve("/success").toURL()
+    def url = resolveAddress("/success").toURL()
     runUnderTrace("someTrace") {
       HttpURLConnection connection = url.openConnection()
       connection.useCaches = useCaches
@@ -109,7 +109,7 @@ class HttpUrlConnectionTest extends HttpClientTest<HttpURLConnection> implements
           attributes {
             "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
             "${SemanticAttributes.NET_PEER_NAME.key}" "localhost"
-            "${SemanticAttributes.NET_PEER_PORT.key}" server.address.port
+            "${SemanticAttributes.NET_PEER_PORT.key}" server.httpPort()
             "${SemanticAttributes.HTTP_URL.key}" "$url"
             "${SemanticAttributes.HTTP_METHOD.key}" "GET"
             "${SemanticAttributes.HTTP_STATUS_CODE.key}" STATUS
@@ -130,7 +130,7 @@ class HttpUrlConnectionTest extends HttpClientTest<HttpURLConnection> implements
           attributes {
             "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
             "${SemanticAttributes.NET_PEER_NAME.key}" "localhost"
-            "${SemanticAttributes.NET_PEER_PORT.key}" server.address.port
+            "${SemanticAttributes.NET_PEER_PORT.key}" server.httpPort()
             "${SemanticAttributes.HTTP_URL.key}" "$url"
             "${SemanticAttributes.HTTP_METHOD.key}" "GET"
             "${SemanticAttributes.HTTP_STATUS_CODE.key}" STATUS
@@ -153,7 +153,7 @@ class HttpUrlConnectionTest extends HttpClientTest<HttpURLConnection> implements
 
   def "test broken API usage"() {
     setup:
-    def url = server.address.resolve("/success").toURL()
+    def url = resolveAddress("/success").toURL()
     HttpURLConnection connection = runUnderTrace("someTrace") {
       HttpURLConnection connection = url.openConnection()
       connection.setRequestProperty("Connection", "close")
@@ -177,7 +177,7 @@ class HttpUrlConnectionTest extends HttpClientTest<HttpURLConnection> implements
           childOf span(0)
           attributes {
             "${SemanticAttributes.NET_PEER_NAME.key}" "localhost"
-            "${SemanticAttributes.NET_PEER_PORT.key}" server.address.port
+            "${SemanticAttributes.NET_PEER_PORT.key}" server.httpPort()
             "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
             "${SemanticAttributes.HTTP_URL.key}" "$url"
             "${SemanticAttributes.HTTP_METHOD.key}" "GET"
@@ -198,7 +198,7 @@ class HttpUrlConnectionTest extends HttpClientTest<HttpURLConnection> implements
 
   def "test post request"() {
     setup:
-    def url = server.address.resolve("/success").toURL()
+    def url = resolveAddress("/success").toURL()
     runUnderTrace("someTrace") {
       HttpURLConnection connection = url.openConnection()
       connection.setRequestMethod("POST")
@@ -236,7 +236,7 @@ class HttpUrlConnectionTest extends HttpClientTest<HttpURLConnection> implements
           attributes {
             "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
             "${SemanticAttributes.NET_PEER_NAME.key}" "localhost"
-            "${SemanticAttributes.NET_PEER_PORT.key}" server.address.port
+            "${SemanticAttributes.NET_PEER_PORT.key}" server.httpPort()
             "${SemanticAttributes.HTTP_URL.key}" "$url"
             "${SemanticAttributes.HTTP_METHOD.key}" "POST"
             "${SemanticAttributes.HTTP_STATUS_CODE.key}" STATUS

instrumentation/java-http-client/javaagent/src/test/groovy/JdkHttpClientTest.groovy

@@ -3,25 +3,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import static io.opentelemetry.api.trace.SpanKind.CLIENT
-import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NetTransportValues.IP_TCP
-
 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
 import java.time.Duration
 import java.time.temporal.ChronoUnit
-import spock.lang.Requires
 import spock.lang.Shared
 
 class JdkHttpClientTest extends HttpClientTest<HttpRequest> implements AgentTestTrait {
 
   @Shared
-  def client = HttpClient.newBuilder().connectTimeout(Duration.of(CONNECT_TIMEOUT_MS,
-    ChronoUnit.MILLIS)).followRedirects(HttpClient.Redirect.NORMAL).build()
+  def client = HttpClient.newBuilder()
+    .version(HttpClient.Version.HTTP_1_1)
+    .connectTimeout(Duration.of(CONNECT_TIMEOUT_MS, ChronoUnit.MILLIS))
+    .followRedirects(HttpClient.Redirect.NORMAL)
+    .build()
 
   @Override
   HttpRequest buildRequest(String method, URI uri, Map<String, String> headers) {
@@ -64,40 +62,4 @@ class JdkHttpClientTest extends HttpClientTest<HttpRequest> implements AgentTest
   boolean testErrorWithCallback() {
     return false
   }
-
-  @Requires({ !System.getProperty("java.vm.name").contains("IBM J9 VM") })
-  def "test https request"() {
-    given:
-    def uri = new URI("https://www.google.com/")
-
-    when:
-    def responseCode = doRequest(method, uri)
-
-    then:
-    responseCode == 200
-    assertTraces(1) {
-      trace(0, 1) {
-        span(0) {
-          hasNoParent()
-          name expectedOperationName(method)
-          kind CLIENT
-          attributes {
-            "${SemanticAttributes.NET_TRANSPORT.key}" IP_TCP
-            "${SemanticAttributes.NET_PEER_NAME.key}" uri.host
-            "${SemanticAttributes.NET_PEER_IP.key}" { it == null || it == "127.0.0.1" }
-            // Optional
-            "${SemanticAttributes.NET_PEER_PORT.key}" uri.port > 0 ? uri.port : { it == null || it == 443 }
-            "${SemanticAttributes.HTTP_URL.key}" { it == "${uri}" || it == "${removeFragment(uri)}" }
-            "${SemanticAttributes.HTTP_METHOD.key}" method
-            "${SemanticAttributes.HTTP_FLAVOR.key}" "2.0"
-            "${SemanticAttributes.HTTP_STATUS_CODE.key}" responseCode
-          }
-        }
-      }
-    }
-
-    where:
-    method = "HEAD"
-  }
-
 }

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/JaxRsClientTest.groovy

@@ -79,7 +79,7 @@ abstract class JaxRsClientTest extends HttpClientTest<Invocation.Builder> implem
   def "should properly convert HTTP status #statusCode to span error status"() {
     given:
     def method = "GET"
-    def uri = server.address.resolve(path)
+    def uri = resolveAddress(path)
 
     when:
     def actualStatusCode = doRequest(method, uri)

instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-common/javaagent/src/test/groovy/ResteasyProxyClientTest.groovy

@@ -23,7 +23,7 @@ class ResteasyProxyClientTest extends HttpClientTest<ResteasyProxyResource> impl
   ResteasyProxyResource buildRequest(String method, URI uri, Map<String, String> headers) {
     return new ResteasyClientBuilder()
       .build()
-      .target(new ResteasyUriBuilder().uri(server.address))
+      .target(new ResteasyUriBuilder().uri(resolveAddress("")))
       .proxy(ResteasyProxyResource)
   }
 

instrumentation/netty/netty-4.1/javaagent/src/test/groovy/Netty41ClientTest.groovy

@@ -145,14 +145,14 @@ class Netty41ClientTest extends HttpClientTest<DefaultFullHttpRequest> implement
           pipeline.addLast(new HttpClientCodec())
         }
       })
-    def request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, server.address.resolve("/success").toString(), Unpooled.EMPTY_BUFFER)
-    request.headers().set(HttpHeaderNames.HOST, server.address.host)
+    def request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, resolveAddress("/success").toString(), Unpooled.EMPTY_BUFFER)
+    request.headers().set(HttpHeaderNames.HOST, "localhost")
     Channel ch = null
 
     when:
     // note that this is a purely asynchronous request
     runUnderTrace("parent1") {
-      ch = b.connect(server.address.host, server.address.port).sync().channel()
+      ch = b.connect("localhost", server.httpPort()).sync().channel()
       ch.write(request)
       ch.flush()
     }
@@ -285,7 +285,7 @@ class Netty41ClientTest extends HttpClientTest<DefaultFullHttpRequest> implement
           }
         }
         clientSpan(it, 2, span(1), method)
-        server.distributedRequestSpan(it, 3, span(2))
+        serverSpan(it, 3, span(2))
       }
     }
 
@@ -295,8 +295,9 @@ class Netty41ClientTest extends HttpClientTest<DefaultFullHttpRequest> implement
 
   class TracedClass {
     int tracedMethod(String method) {
+      def uri = resolveAddress("/success")
       runUnderTrace("tracedMethod") {
-        doRequest(method, server.address.resolve("/success"))
+        doRequest(method, uri)
       }
     }
   }

instrumentation/ratpack-1.4/javaagent/src/test/groovy/client/RatpackHttpClientTest.groovy

@@ -99,7 +99,7 @@ class RatpackHttpClientTest extends HttpClientTest<Void> implements AgentTestTra
     return new SingleConnection() {
       @Override
       int doRequest(String path, Map<String, String> headers) throws ExecutionException, InterruptedException, TimeoutException {
-        def uri = server.address.resolve(path)
+        def uri = resolveAddress(path)
         return exec.yield {
           internalSendRequest(singleConnectionClient, "GET", uri, headers)
         }.valueOrThrow

instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/AbstractReactorNettyHttpClientTest.groovy

@@ -40,7 +40,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli
     return createHttpClient()
       .followRedirect(true)
       .headers({ h -> headers.each { k, v -> h.add(k, v) } })
-      .baseUrl(server.address.toString())
+      .baseUrl(resolveAddress("").toString())
       ."${method.toLowerCase()}"()
       .uri(uri.toString())
   }
@@ -112,7 +112,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli
 
     when:
     runUnderTrace("parent") {
-      httpClient.baseUrl(server.address.toString())
+      httpClient.baseUrl(resolveAddress("").toString())
         .get()
         .uri("/success")
         .response()
@@ -126,7 +126,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli
         def nettyClientSpan = span(1)
 
         basicSpan(it, 0, "parent")
-        clientSpan(it, 1, parentSpan, "GET", server.address.resolve("/success"))
+        clientSpan(it, 1, parentSpan, "GET", resolveAddress("/success"))
         serverSpan(it, 2, nettyClientSpan)
 
         assertSameSpan(parentSpan, onRequestSpan)

instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/AbstractReactorNettyHttpClientTest.groovy

@@ -45,7 +45,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli
     return createHttpClient()
       .followRedirect(true)
       .headers({ h -> headers.each { k, v -> h.add(k, v) } })
-      .baseUrl(server.address.toString())
+      .baseUrl(resolveAddress("").toString())
       ."${method.toLowerCase()}"()
       .uri(uri.toString())
   }
@@ -121,7 +121,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli
 
     when:
     runUnderTrace("parent") {
-      httpClient.baseUrl(server.address.toString())
+      httpClient.baseUrl(resolveAddress("").toString())
         .get()
         .uri("/success")
         .response()
@@ -135,7 +135,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli
         def nettyClientSpan = span(1)
 
         basicSpan(it, 0, "parent")
-        clientSpan(it, 1, parentSpan, "GET", server.address.resolve("/success"))
+        clientSpan(it, 1, parentSpan, "GET", resolveAddress("/success"))
         serverSpan(it, 2, nettyClientSpan)
 
         assertSameSpan(parentSpan, onRequestSpan)

settings.gradle

@@ -72,6 +72,7 @@ include ':javaagent-api'
 include ':dependencyManagement'
 include ':testing:agent-exporter'
 include ':testing:agent-for-testing'
+include ':testing:armeria-shaded-for-testing'
 include ':testing-common'
 include ':testing-common:integration-tests'
 include ':testing-common:library-for-integration-tests'