Allow users to configure a custom OkHttpClient

Author: lauzadis

runtime/protocol/http-client-engines/http-client-engine-okhttp/api/http-client-engine-okhttp.api

@@ -53,6 +53,7 @@ public final class aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine : a
 	public static final field Companion Laws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine$Companion;
 	public fun <init> ()V
 	public fun <init> (Laws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConfig;)V
+	public fun <init> (Lokhttp3/OkHttpClient;)V
 	public synthetic fun getConfig ()Laws/smithy/kotlin/runtime/http/engine/HttpClientEngineConfig;
 	public fun getConfig ()Laws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConfig;
 	public fun roundTrip (Laws/smithy/kotlin/runtime/operation/ExecutionContext;Laws/smithy/kotlin/runtime/http/request/HttpRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/src/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngine.kt

@@ -38,6 +38,27 @@ public class OkHttpEngine(
     override val config: OkHttpEngineConfig,
 ) : HttpClientEngineBase("OkHttp") {
     public constructor() : this(OkHttpEngineConfig.Default)
+    public constructor(client: OkHttpClient) : this(OkHttpEngineConfig.Default) {
+        this.manageClient = false
+
+        // destroy our client
+        this.client.apply {
+            connectionPool.evictAll()
+            dispatcher.executorService.shutdown()
+        }
+
+        // use the user-provided client, configured with metrics collection
+        this.client = client.newBuilder().apply {
+            eventListenerFactory { call ->
+                EventListenerChain(
+                    listOf(
+                        HttpEngineEventListener(client.connectionPool, config.hostResolver, client.dispatcher, metrics, call)
+                    )
+                )
+            }
+            addInterceptor(MetricsInterceptor)
+        }.build()
+    }
 
     public companion object : EngineFactory<OkHttpEngineConfig.Builder, OkHttpEngine> {
         /**
@@ -57,7 +78,8 @@ public class OkHttpEngine(
         }
 
     private val metrics = HttpClientMetrics(TELEMETRY_SCOPE, config.telemetryProvider)
-    private val client = config.buildClient(metrics, connectionMonitoringListener)
+    private var client = config.buildClient(metrics, connectionMonitoringListener)
+    private var manageClient = true // whether the SDK should manage the underlying OkHttpClient client
 
     @OptIn(ExperimentalCoroutinesApi::class)
     override suspend fun roundTrip(context: ExecutionContext, request: HttpRequest): HttpCall {
@@ -85,9 +107,11 @@ public class OkHttpEngine(
 
     override fun shutdown() {
         connectionMonitoringListener?.closeIfCloseable()
-        client.connectionPool.evictAll()
-        client.dispatcher.executorService.shutdown()
         metrics.close()
+        if (manageClient) {
+            client.connectionPool.evictAll()
+            client.dispatcher.executorService.shutdown()
+        }
     }
 }
 

runtime/protocol/http-client-engines/http-client-engine-okhttp/jvm/test/aws/smithy/kotlin/runtime/http/engine/okhttp/OkHttpEngineConfigTest.kt

@@ -6,43 +6,38 @@ package aws.smithy.kotlin.runtime.http.engine.okhttp
 
 import aws.smithy.kotlin.runtime.content.ByteStream
 import aws.smithy.kotlin.runtime.http.Headers
+import aws.smithy.kotlin.runtime.http.HttpException
 import aws.smithy.kotlin.runtime.http.HttpMethod
-import aws.smithy.kotlin.runtime.http.engine.internal.HttpClientMetrics
+import aws.smithy.kotlin.runtime.http.SdkHttpClient
 import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.http.toHttpBody
 import aws.smithy.kotlin.runtime.net.url.Url
-import aws.smithy.kotlin.runtime.operation.ExecutionContext
-import aws.smithy.kotlin.runtime.telemetry.TelemetryProvider
 import kotlinx.coroutines.test.runTest
-import okhttp3.coroutines.executeAsync
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
+import okhttp3.OkHttpClient
+import java.io.IOException
 import kotlin.test.Test
 import kotlin.test.assertFailsWith
+import kotlin.test.assertTrue
 
 class OkHttpEngineConfigTest {
     @Test
-    fun testExecutorService() = runTest {
-        val config = OkHttpEngineConfig {
-            executorService = DummyExecutorService
-        }
+    fun testUserClient() = runTest {
+        val userClient = OkHttpClient.Builder().apply {
+            addInterceptor { throw DummyOkHttpClientException() }
+        }.build()
 
-        val metrics = HttpClientMetrics("foo", TelemetryProvider.None)
-        val engine = config.buildClient(metrics)
+        val engine = OkHttpEngine(userClient)
+        val sdkClient = SdkHttpClient(engine)
 
         val data = "a".repeat(100)
         val url = Url.parse("https://aws.amazon.com")
         val request = HttpRequest(HttpMethod.POST, url, Headers.Empty, ByteStream.fromString(data).toHttpBody())
-        val okRequest = request.toOkHttpRequest(ExecutionContext(), coroutineContext, metrics)
 
-        assertFailsWith<DummyExecutorException> {
-            engine.newCall(okRequest).executeAsync()
+        val ex = assertFailsWith<HttpException> {
+            sdkClient.call(request)
         }
+        assertTrue(ex.cause is DummyOkHttpClientException)
     }
 
-    private object DummyExecutorService : ExecutorService by Executors.newSingleThreadExecutor() {
-        override fun execute(command: Runnable?) = throw DummyExecutorException()
-    }
-
-    private class DummyExecutorException : Exception()
+    private class DummyOkHttpClientException : IOException("Custom OkHttpClient interceptor was called")
 }