Comments

Author: heyams

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

@@ -6,12 +6,10 @@
 package io.opentelemetry.javaagent.instrumentation.playws.v2_1;
 
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult;
-import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import play.libs.ws.StandaloneWSClient;
 import play.libs.ws.StandaloneWSRequest;
@@ -34,18 +32,6 @@ void setup() {
     autoCleanup.deferCleanup(wsClientWithReadTimeout);
   }
 
-  @AfterEach
-  @Override
-  void tearDown() throws IOException {
-    if (wsClient != null) {
-      wsClient.close();
-    }
-    if (wsClientWithReadTimeout != null) {
-      wsClientWithReadTimeout.close();
-    }
-    super.tearDown();
-  }
-
   @Override
   public StandaloneWSRequest buildRequest(String method, URI uri, Map<String, String> headers) {
     StandaloneWSRequest request = getClient(uri).url(uri.toString()).setFollowRedirects(true);

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

@@ -6,11 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.playws.v2_1;
 
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult;
-import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import play.libs.ws.StandaloneWSClient;
 import play.libs.ws.StandaloneWSRequest;
@@ -32,18 +30,6 @@ void setup() {
     autoCleanup.deferCleanup(wsClientWithReadTimeout);
   }
 
-  @AfterEach
-  @Override
-  void tearDown() throws IOException {
-    if (wsClient != null) {
-      wsClient.close();
-    }
-    if (wsClientWithReadTimeout != null) {
-      wsClientWithReadTimeout.close();
-    }
-    super.tearDown();
-  }
-
   @Override
   public StandaloneWSRequest buildRequest(String method, URI uri, Map<String, String> headers) {
     StandaloneWSRequest request = getClient(uri).url(uri.toString()).setFollowRedirects(true);

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

@@ -6,11 +6,9 @@
 package io.opentelemetry.javaagent.instrumentation.playws.v2_1;
 
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult;
-import java.io.IOException;
 import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import play.api.libs.ws.StandaloneWSClient;
 import play.api.libs.ws.StandaloneWSRequest;
@@ -40,18 +38,6 @@ void setup() {
     autoCleanup.deferCleanup(wsClientWithReadTimeout);
   }
 
-  @AfterEach
-  @Override
-  void tearDown() throws IOException {
-    if (wsClient != null) {
-      wsClient.close();
-    }
-    if (wsClientWithReadTimeout != null) {
-      wsClientWithReadTimeout.close();
-    }
-    super.tearDown();
-  }
-
   @Override
   public StandaloneWSRequest buildRequest(String method, URI uri, Map<String, String> headers)
       throws Exception {

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

@@ -6,12 +6,10 @@
 package io.opentelemetry.javaagent.instrumentation.playws.v2_1;
 
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import play.api.libs.ws.StandaloneWSClient;
 import play.api.libs.ws.StandaloneWSRequest;
@@ -41,18 +39,6 @@ void setup() {
     autoCleanup.deferCleanup(wsClientWithReadTimeout);
   }
 
-  @AfterEach
-  @Override
-  void tearDown() throws IOException {
-    if (wsClient != null) {
-      wsClient.close();
-    }
-    if (wsClientWithReadTimeout != null) {
-      wsClientWithReadTimeout.close();
-    }
-    super.tearDown();
-  }
-
   @Override
   public StandaloneWSRequest buildRequest(String method, URI uri, Map<String, String> headers)
       throws MalformedURLException {

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

@@ -15,7 +15,6 @@
 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;
@@ -24,7 +23,6 @@
 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;
@@ -67,19 +65,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 {