fix ut

Author: shalk

instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/CxfClientTest.java

@@ -44,10 +44,5 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     optionsBuilder.setTestReadTimeout(false);
     optionsBuilder.setTestWithClientParent(!Boolean.getBoolean("testLatestDeps"));
     optionsBuilder.setClientSpanErrorMapper((uri, exception) -> clientSpanError(uri, exception));
-    // CXF JAX-RS client uses HttpURLConnection internally, which does not support pipelining nor
-    // waiting for a connection in the pool to become available. Therefore a high concurrency test
-    // would require manually doing requests one after another which is not meaningful for a high
-    // concurrency test.
-    optionsBuilder.setSingleConnectionFactory((host, port) -> null);
   }
 }

instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/JaxMultithreadedClientTest.java

@@ -28,7 +28,7 @@ class JaxMultithreadedClientTest {
   @RegisterExtension
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
-  public static ServerExtension server =
+  static ServerExtension server =
       new ServerExtension() {
         @Override
         protected void configure(ServerBuilder sb) {

instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/JaxRsClientTest.java

@@ -5,28 +5,16 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrsclient;
 
-import static io.opentelemetry.api.trace.SpanKind.CLIENT;
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
 import static java.util.Arrays.asList;
-import static org.assertj.core.api.Assertions.assertThat;
 
 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.sdk.trace.data.StatusData;
-import io.opentelemetry.semconv.ErrorAttributes;
-import io.opentelemetry.semconv.HttpAttributes;
-import io.opentelemetry.semconv.NetworkAttributes;
-import io.opentelemetry.semconv.ServerAttributes;
-import io.opentelemetry.semconv.UrlAttributes;
 import java.net.URI;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 import javax.ws.rs.ProcessingException;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
@@ -37,9 +25,6 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
 
 abstract class JaxRsClientTest extends AbstractHttpClientTest<Invocation.Builder> {
 
@@ -50,13 +35,15 @@ abstract class JaxRsClientTest extends AbstractHttpClientTest<Invocation.Builder
   protected static final int CONNECT_TIMEOUT_MS = 5000;
   protected static final int READ_TIMEOUT_MS = 2000;
 
-  static Stream<Arguments> preparedPathStream() {
-    return Stream.of(Arguments.of("/client-error", 400), Arguments.of("/error", 500));
-  }
-
   @Override
   public Invocation.Builder buildRequest(String method, URI uri, Map<String, String> headers) {
-    return internalBuildRequest(uri, headers);
+    Client client = builder().build();
+    WebTarget service = client.target(uri);
+    Invocation.Builder requestBuilder = service.request(MediaType.TEXT_PLAIN);
+    for (Map.Entry<String, String> entry : headers.entrySet()) {
+      requestBuilder.header(entry.getKey(), entry.getValue());
+    }
+    return requestBuilder;
   }
 
   abstract ClientBuilder builder();
@@ -68,19 +55,10 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     optionsBuilder.setTestNonStandardHttpMethod(false);
   }
 
-  private Invocation.Builder internalBuildRequest(URI uri, Map<String, String> headers) {
-    Client client = builder().build();
-    WebTarget service = client.target(uri);
-    Invocation.Builder requestBuilder = service.request(MediaType.TEXT_PLAIN);
-    for (Map.Entry<String, String> entry : headers.entrySet()) {
-      requestBuilder.header(entry.getKey(), entry.getValue());
-    }
-    return requestBuilder;
-  }
-
   @Override
   public int sendRequest(
-      Invocation.Builder request, String method, URI uri, Map<String, String> headers) {
+      Invocation.Builder request, String method, URI uri, Map<String, String> headers)
+      throws Exception {
     try {
       Entity<String> body = BODY_METHODS.contains(method) ? Entity.text("") : null;
       Response response = request.build(method, body).invoke();
@@ -89,6 +67,9 @@ public int sendRequest(
       response.close();
       return response.getStatus();
     } catch (ProcessingException exception) {
+      if (exception.getCause() instanceof Exception) {
+        throw (Exception) exception.getCause();
+      }
       throw exception;
     }
   }
@@ -124,35 +105,4 @@ public void failed(Throwable throwable) {
               }
             });
   }
-
-  @ParameterizedTest
-  @MethodSource("preparedPathStream")
-  void testError(String path, int statusCode) throws Throwable {
-    String method = "GET";
-    URI uri = resolveAddress(path);
-    int actualStatusCode =
-        sendRequest(
-            buildRequest(method, uri, Collections.emptyMap()), method, uri, Collections.emptyMap());
-    assertThat(actualStatusCode).isEqualTo(statusCode);
-
-    testing.waitAndAssertTraces(
-        trace ->
-            trace.hasSpansSatisfyingExactly(
-                span ->
-                    span.hasName(method)
-                        .hasKind(CLIENT)
-                        .hasStatus(StatusData.error())
-                        .hasAttributesSatisfying(
-                            equalTo(NetworkAttributes.NETWORK_PROTOCOL_VERSION, "1.1"),
-                            equalTo(ServerAttributes.SERVER_ADDRESS, uri.getHost()),
-                            satisfies(ServerAttributes.SERVER_PORT, val -> val.isIn(null, 443)),
-                            satisfies(
-                                NetworkAttributes.NETWORK_PEER_ADDRESS,
-                                val -> val.isIn(null, "127.0.0.1")),
-                            equalTo(UrlAttributes.URL_FULL, uri.getHost()),
-                            equalTo(HttpAttributes.HTTP_REQUEST_METHOD, method),
-                            equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, statusCode),
-                            equalTo(ErrorAttributes.ERROR_TYPE, "$statusCode")),
-                span -> span.hasParent(trace.getSpan(0)).hasName(method)));
-  }
 }

instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/JerseyClientTest.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.jaxrsclient;
 
-import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions;
 import javax.ws.rs.client.ClientBuilder;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
@@ -20,14 +19,4 @@ public ClientBuilder builder() {
     config.property(ClientProperties.READ_TIMEOUT, READ_TIMEOUT_MS);
     return new JerseyClientBuilder().withConfig(config);
   }
-
-  @Override
-  protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
-    super.configure(optionsBuilder);
-    // Jersey JAX-RS client uses HttpURLConnection internally, which does not support pipelining nor
-    // waiting for a connection in the pool to become available. Therefore a high concurrency test
-    // would require manually doing requests one after another which is not meaningful for a high
-    // concurrency test.
-    optionsBuilder.setSingleConnectionFactory((host, port) -> null);
-  }
 }

instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/ResteasyClientTest.java

@@ -22,7 +22,6 @@ ClientBuilder builder() {
   @Override
   protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     super.configure(optionsBuilder);
-    optionsBuilder.setSingleConnectionFactory(
-        (host, port) -> new ResteasySingleConnection(host, port));
+    optionsBuilder.setSingleConnectionFactory(ResteasySingleConnection::new);
   }
 }

instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/ResteasySingleConnection.java

@@ -20,7 +20,7 @@
 import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 
-public class ResteasySingleConnection implements SingleConnection {
+class ResteasySingleConnection implements SingleConnection {
   private final ResteasyClient client;
   private final String host;
   private final int port;