Comments

Author: heyams

instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayJavaStreamedWsClientTest.java

@@ -16,7 +16,7 @@
 import play.libs.ws.StandaloneWSResponse;
 import play.libs.ws.ahc.StandaloneAhcWSClient;
 
-public class PlayJavaStreamedWsClientTest extends PlayWsClientBaseTest<StandaloneWSRequest> {
+class PlayJavaStreamedWsClientTest extends PlayWsClientBaseTest<StandaloneWSRequest> {
 
   private static StandaloneWSClient wsClient;
   private static StandaloneWSClient wsClientWithReadTimeout;

instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayJavaWsClientTest.java

@@ -14,7 +14,7 @@
 import play.libs.ws.StandaloneWSRequest;
 import play.libs.ws.ahc.StandaloneAhcWSClient;
 
-public class PlayJavaWsClientTest extends PlayWsClientBaseTest<StandaloneWSRequest> {
+class PlayJavaWsClientTest extends PlayWsClientBaseTest<StandaloneWSRequest> {
 
   private static StandaloneWSClient wsClient;
   private static StandaloneWSClient wsClientWithReadTimeout;

instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayScalaStreamedWsClientTest.java

@@ -22,7 +22,7 @@
 import scala.jdk.javaapi.CollectionConverters;
 import scala.util.Try;
 
-public class PlayScalaStreamedWsClientTest extends PlayWsClientBaseTest<StandaloneWSRequest> {
+class PlayScalaStreamedWsClientTest extends PlayWsClientBaseTest<StandaloneWSRequest> {
 
   private static StandaloneWSClient wsClient;
   private static StandaloneWSClient wsClientWithReadTimeout;

instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayScalaWsClientTest.java

@@ -23,7 +23,7 @@
 import scala.jdk.javaapi.CollectionConverters;
 import scala.util.Try;
 
-public class PlayScalaWsClientTest extends PlayWsClientBaseTest<StandaloneWSRequest> {
+class PlayScalaWsClientTest extends PlayWsClientBaseTest<StandaloneWSRequest> {
 
   private static StandaloneWSClient wsClient;
   private static StandaloneWSClient wsClientWithReadTimeout;

instrumentation/play/play-ws/play-ws-2.1/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/playws/v2_1/PlayWsClientBaseTest.java

@@ -16,14 +16,11 @@
 import io.opentelemetry.semconv.NetworkAttributes;
 import io.opentelemetry.semconv.ServerAttributes;
 import java.net.InetAddress;
-import java.net.URI;
 import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import play.shaded.ahc.io.netty.resolver.InetNameResolver;
 import play.shaded.ahc.io.netty.util.concurrent.EventExecutor;
@@ -47,7 +44,6 @@ abstract class PlayWsClientBaseTest<REQUEST> extends AbstractHttpClientTest<REQU
   protected static AsyncHttpClient asyncHttpClientWithReadTimeout;
   protected static Materializer materializer;
 
-  @BeforeEach
   void setup() {
     String name = "play-ws";
     system = ActorSystem.create(name);
@@ -65,18 +61,6 @@ void setup() {
     autoCleanup.deferCleanup(asyncHttpClientWithReadTimeout);
   }
 
-  @Override
-  public REQUEST buildRequest(String method, URI uri, Map<String, String> headers)
-      throws Exception {
-    return null;
-  }
-
-  @Override
-  public int sendRequest(REQUEST request, String method, URI uri, Map<String, String> headers)
-      throws Exception {
-    return 0;
-  }
-
   @Override
   protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     super.configure(optionsBuilder);

instrumentation/play/play-ws/play-ws-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/playws/PlayWsClientBaseTest.java

@@ -16,16 +16,12 @@
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions;
 import io.opentelemetry.semconv.NetworkAttributes;
 import io.opentelemetry.semconv.ServerAttributes;
-import java.io.IOException;
 import java.net.InetAddress;
-import java.net.URI;
 import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import play.shaded.ahc.io.netty.resolver.InetNameResolver;
@@ -68,31 +64,6 @@ void setup() {
     autoCleanup.deferCleanup(asyncHttpClientWithReadTimeout);
   }
 
-  @AfterEach
-  void tearDown() throws IOException {
-    if (system != null) {
-      system.terminate();
-    }
-    if (asyncHttpClient != null) {
-      asyncHttpClient.close();
-    }
-    if (asyncHttpClientWithReadTimeout != null) {
-      asyncHttpClientWithReadTimeout.close();
-    }
-  }
-
-  @Override
-  public REQUEST buildRequest(String method, URI uri, Map<String, String> headers)
-      throws Exception {
-    return null;
-  }
-
-  @Override
-  public int sendRequest(REQUEST request, String method, URI uri, Map<String, String> headers)
-      throws Exception {
-    return 0;
-  }
-
   @Override
   protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     super.configure(optionsBuilder);