address review comment

Author: laurit

instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/AbstractKtorHttpClientTest.kt

@@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES
 import io.opentelemetry.semconv.NetworkAttributes
 import kotlinx.coroutines.*
+import org.junit.jupiter.api.AfterAll
 import java.net.URI
 
 abstract class AbstractKtorHttpClientTest : AbstractHttpClientTest<HttpRequestBuilder>() {
@@ -27,6 +28,19 @@ abstract class AbstractKtorHttpClientTest : AbstractHttpClientTest<HttpRequestBu
 
     installTracing()
   }
+  private val singleConnectionClient = HttpClient(CIO) {
+    engine {
+      maxConnectionsCount = 1
+    }
+
+    installTracing()
+  }
+
+  @AfterAll
+  fun tearDown() {
+    client.close()
+    singleConnectionClient.close()
+  }
 
   abstract fun HttpClientConfig<*>.installTracing()
 
@@ -67,7 +81,7 @@ abstract class AbstractKtorHttpClientTest : AbstractHttpClientTest<HttpRequestBu
       setHttpAttributes { DEFAULT_HTTP_ATTRIBUTES - setOf(NetworkAttributes.NETWORK_PROTOCOL_VERSION) }
 
       setSingleConnectionFactory { host, port ->
-        KtorHttpClientSingleConnection(host, port) { installTracing() }
+        KtorHttpClientSingleConnection(singleConnectionClient, host, port)
       }
     }
   }

instrumentation/ktor/ktor-2.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientSingleConnection.kt

@@ -12,23 +12,11 @@ import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection
 import kotlinx.coroutines.runBlocking
 
 class KtorHttpClientSingleConnection(
+  private val client: HttpClient,
   private val host: String,
-  private val port: Int,
-  private val installTracing: HttpClientConfig<*>.() -> Unit,
+  private val port: Int
 ) : SingleConnection {
 
-  private val client: HttpClient
-
-  init {
-    val engine = CIO.create {
-      maxConnectionsCount = 1
-    }
-
-    client = HttpClient(engine) {
-      installTracing()
-    }
-  }
-
   override fun doRequest(path: String, requestHeaders: MutableMap<String, String>) = runBlocking {
     val request = HttpRequestBuilder(
       scheme = "http",

instrumentation/ktor/ktor-3.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v3_0/client/AbstractKtorHttpClientTest.kt

@@ -18,6 +18,7 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES
 import io.opentelemetry.semconv.NetworkAttributes
 import kotlinx.coroutines.*
+import org.junit.jupiter.api.AfterAll
 import java.net.URI
 
 abstract class AbstractKtorHttpClientTest : AbstractHttpClientTest<HttpRequestBuilder>() {
@@ -27,6 +28,19 @@ abstract class AbstractKtorHttpClientTest : AbstractHttpClientTest<HttpRequestBu
 
     installTracing()
   }
+  private val singleConnectionClient = HttpClient(CIO) {
+    engine {
+      maxConnectionsCount = 1
+    }
+
+    installTracing()
+  }
+
+  @AfterAll
+  fun tearDown() {
+    client.close()
+    singleConnectionClient.close()
+  }
 
   abstract fun HttpClientConfig<*>.installTracing()
 
@@ -67,7 +81,7 @@ abstract class AbstractKtorHttpClientTest : AbstractHttpClientTest<HttpRequestBu
       setHttpAttributes { DEFAULT_HTTP_ATTRIBUTES - setOf(NetworkAttributes.NETWORK_PROTOCOL_VERSION) }
 
       setSingleConnectionFactory { host, port ->
-        KtorHttpClientSingleConnection(host, port) { installTracing() }
+        KtorHttpClientSingleConnection(singleConnectionClient, host, port)
       }
     }
   }

instrumentation/ktor/ktor-3.0/testing/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v3_0/client/KtorHttpClientSingleConnection.kt

@@ -12,23 +12,11 @@ import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection
 import kotlinx.coroutines.runBlocking
 
 class KtorHttpClientSingleConnection(
+  private val client: HttpClient,
   private val host: String,
-  private val port: Int,
-  private val installTracing: HttpClientConfig<*>.() -> Unit,
+  private val port: Int
 ) : SingleConnection {
 
-  private val client: HttpClient
-
-  init {
-    val engine = CIO.create {
-      maxConnectionsCount = 1
-    }
-
-    client = HttpClient(engine) {
-      installTracing()
-    }
-  }
-
   override fun doRequest(path: String, requestHeaders: MutableMap<String, String>) = runBlocking {
     val request = HttpRequestBuilder(
       scheme = "http",