Convert vertx http client 3.0 groovy tests to java (#10093)

instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/groovy/client/VertxHttpClientTest.groovy

@@ -1,108 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package client
-
-import io.opentelemetry.api.common.AttributeKey
-import io.opentelemetry.instrumentation.test.AgentTestTrait
-import io.opentelemetry.instrumentation.test.base.HttpClientTest
-import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult
-import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection
-import io.opentelemetry.semconv.SemanticAttributes
-import io.vertx.core.Vertx
-import io.vertx.core.VertxOptions
-import io.vertx.core.http.HttpClientOptions
-import io.vertx.core.http.HttpClientRequest
-import io.vertx.core.http.HttpMethod
-import spock.lang.Shared
-
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.TimeUnit
-
-class VertxHttpClientTest extends HttpClientTest<HttpClientRequest> implements AgentTestTrait {
-
-  @Shared
-  def vertx = Vertx.vertx(new VertxOptions())
-  @Shared
-  def clientOptions = new HttpClientOptions().setConnectTimeout(CONNECT_TIMEOUT_MS)
-  @Shared
-  def httpClient = vertx.createHttpClient(clientOptions)
-
-  @Override
-  HttpClientRequest buildRequest(String method, URI uri, Map<String, String> headers) {
-    def request = httpClient.requestAbs(HttpMethod.valueOf(method), "$uri")
-    headers.each { request.putHeader(it.key, it.value) }
-    return request
-  }
-
-  CompletableFuture<Integer> sendRequest(HttpClientRequest request) {
-    CompletableFuture<Integer> future = new CompletableFuture<>()
-
-    request.handler { response ->
-      future.complete(response.statusCode())
-    }.exceptionHandler { throwable ->
-      future.completeExceptionally(throwable)
-    }
-    request.end()
-
-    return future
-  }
-
-  @Override
-  int sendRequest(HttpClientRequest request, String method, URI uri, Map<String, String> headers) {
-    // Vertx doesn't seem to provide any synchronous API so bridge through a callback
-    return sendRequest(request).get(30, TimeUnit.SECONDS)
-  }
-
-  @Override
-  void sendRequestWithCallback(HttpClientRequest request, String method, URI uri, Map<String, String> headers, HttpClientResult requestResult) {
-    sendRequest(request).whenComplete { status, throwable ->
-      requestResult.complete({ status }, throwable)
-    }
-  }
-
-  @Override
-  boolean testRedirects() {
-    false
-  }
-
-  @Override
-  boolean testReusedRequest() {
-    // vertx requests can't be reused
-    false
-  }
-
-  @Override
-  boolean testHttps() {
-    false
-  }
-
-  @Override
-  boolean testReadTimeout() {
-    false
-  }
-
-  @Override
-  boolean testNonStandardHttpMethod() {
-    false
-  }
-
-  @Override
-  Set<AttributeKey<?>> httpAttributes(URI uri) {
-    def attributes = super.httpAttributes(uri)
-    attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION)
-    attributes.remove(SemanticAttributes.SERVER_ADDRESS)
-    attributes.remove(SemanticAttributes.SERVER_PORT)
-    return attributes
-  }
-
-  @Override
-  SingleConnection createSingleConnection(String host, int port) {
-    //This test fails on Vert.x 3.0 and only works starting from 3.1
-    //Most probably due to https://github.com/eclipse-vertx/vert.x/pull/1126
-    boolean shouldRun = Boolean.getBoolean("testLatestDeps")
-    return shouldRun ? new VertxSingleConnection(host, port) : null
-  }
-}

instrumentation/vertx/vertx-http-client/vertx-http-client-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v3_0/client/VertxHttpClientTest.java

@@ -0,0 +1,107 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.vertx.v3_0.client;
+
+import client.VertxSingleConnection;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult;
+import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions;
+import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection;
+import io.opentelemetry.semconv.SemanticAttributes;
+import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+import io.vertx.core.http.HttpClient;
+import io.vertx.core.http.HttpClientOptions;
+import io.vertx.core.http.HttpClientRequest;
+import io.vertx.core.http.HttpMethod;
+import java.net.URI;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+class VertxHttpClientTest extends AbstractHttpClientTest<HttpClientRequest> {
+
+  @RegisterExtension
+  static final InstrumentationExtension testing = HttpClientInstrumentationExtension.forAgent();
+
+  private final HttpClient httpClient = buildClient();
+
+  private static HttpClient buildClient() {
+    Vertx vertx = Vertx.vertx(new VertxOptions());
+    HttpClientOptions clientOptions =
+        new HttpClientOptions().setConnectTimeout(Math.toIntExact(CONNECTION_TIMEOUT.toMillis()));
+    return vertx.createHttpClient(clientOptions);
+  }
+
+  @Override
+  public HttpClientRequest buildRequest(String method, URI uri, Map<String, String> headers) {
+    HttpClientRequest request = httpClient.requestAbs(HttpMethod.valueOf(method), uri.toString());
+    headers.forEach(request::putHeader);
+    return request;
+  }
+
+  private static CompletableFuture<Integer> sendRequest(HttpClientRequest request) {
+    CompletableFuture<Integer> future = new CompletableFuture<>();
+    request
+        .handler(response -> future.complete(response.statusCode()))
+        .exceptionHandler(future::completeExceptionally)
+        .end();
+    return future;
+  }
+
+  @Override
+  public int sendRequest(
+      HttpClientRequest request, String method, URI uri, Map<String, String> headers)
+      throws Exception {
+    // Vertx doesn't seem to provide any synchronous API so bridge through a callback
+    return sendRequest(request).get(30, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void sendRequestWithCallback(
+      HttpClientRequest request,
+      String method,
+      URI uri,
+      Map<String, String> headers,
+      HttpClientResult httpClientResult) {
+    sendRequest(request)
+        .whenComplete((status, throwable) -> httpClientResult.complete(() -> status, throwable));
+  }
+
+  @Override
+  protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
+    optionsBuilder.disableTestRedirects();
+    optionsBuilder.disableTestReusedRequest();
+    optionsBuilder.disableTestHttps();
+    optionsBuilder.disableTestReadTimeout();
+    optionsBuilder.disableTestNonStandardHttpMethod();
+
+    optionsBuilder.setHttpAttributes(
+        uri -> {
+          Set<AttributeKey<?>> attributes =
+              new HashSet<>(HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES);
+          attributes.remove(SemanticAttributes.NETWORK_PROTOCOL_VERSION);
+          attributes.remove(SemanticAttributes.SERVER_ADDRESS);
+          attributes.remove(SemanticAttributes.SERVER_PORT);
+          return attributes;
+        });
+
+    optionsBuilder.setSingleConnectionFactory(VertxHttpClientTest::createSingleConnection);
+  }
+
+  private static SingleConnection createSingleConnection(String host, int port) {
+    // This test fails on Vert.x 3.0 and only works starting from 3.1
+    // Most probably due to https://github.com/eclipse-vertx/vert.x/pull/1126
+    boolean shouldRun = Boolean.getBoolean("testLatestDeps");
+    return shouldRun ? new VertxSingleConnection(host, port) : null;
+  }
+}