feat(rt): add configurable DNS implementation (#774)

Author: aajtodd

.changes/add3f718-9b80-4db3-b2fb-ac8d6cf1336d.json

@@ -0,0 +1,8 @@
+{
+    "id": "add3f718-9b80-4db3-b2fb-ac8d6cf1336d",
+    "type": "feature",
+    "description": "Add KMP DNS resolver",
+    "issues": [
+        "awslabs/smithy-kotlin#745"
+    ]
+}

runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultCanonicalizerTest.kt

@@ -8,8 +8,8 @@ import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awssigning.tests.testCredentialsProvider
 import aws.smithy.kotlin.runtime.http.*
 import aws.smithy.kotlin.runtime.http.request.*
+import aws.smithy.kotlin.runtime.net.Host
 import aws.smithy.kotlin.runtime.time.Instant
-import aws.smithy.kotlin.runtime.util.net.Host
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test

runtime/auth/aws-signing-default/common/test/aws/smithy/kotlin/runtime/auth/awssigning/DefaultRequestMutatorTest.kt

@@ -11,8 +11,8 @@ import aws.smithy.kotlin.runtime.http.HttpBody
 import aws.smithy.kotlin.runtime.http.HttpMethod
 import aws.smithy.kotlin.runtime.http.parameters
 import aws.smithy.kotlin.runtime.http.request.*
+import aws.smithy.kotlin.runtime.net.Host
 import aws.smithy.kotlin.runtime.time.Instant
-import aws.smithy.kotlin.runtime.util.net.Host
 import kotlin.test.Test
 import kotlin.test.assertEquals
 

runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/BasicSigningTestBase.kt

@@ -14,8 +14,8 @@ import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.request.headers
 import aws.smithy.kotlin.runtime.http.request.url
+import aws.smithy.kotlin.runtime.net.Host
 import aws.smithy.kotlin.runtime.time.Instant
-import aws.smithy.kotlin.runtime.util.net.Host
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestResult
 import kotlinx.coroutines.test.runTest

runtime/auth/aws-signing-tests/common/src/aws/smithy/kotlin/runtime/auth/awssigning/tests/MiddlewareSigningTestBase.kt

@@ -16,9 +16,9 @@ import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.response.HttpCall
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.io.SdkByteReadChannel
+import aws.smithy.kotlin.runtime.net.Host
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.util.get
-import aws.smithy.kotlin.runtime.util.net.Host
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestResult
 import kotlinx.coroutines.test.runTest

runtime/crt-util/common/test/aws/smithy/kotlin/runtime/crt/HttpTest.kt

@@ -12,7 +12,7 @@ import aws.smithy.kotlin.runtime.http.parameters
 import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.request.headers
 import aws.smithy.kotlin.runtime.http.request.url
-import aws.smithy.kotlin.runtime.util.net.Host
+import aws.smithy.kotlin.runtime.net.Host
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue

runtime/protocol/http-client-engines/http-client-engine-crt/common/src/aws/smithy/kotlin/runtime/http/engine/crt/CrtHttpEngine.kt

@@ -19,6 +19,7 @@ import aws.smithy.kotlin.runtime.http.request.HttpRequest
 import aws.smithy.kotlin.runtime.http.response.HttpCall
 import aws.smithy.kotlin.runtime.io.internal.SdkDispatchers
 import aws.smithy.kotlin.runtime.logging.Logger
+import aws.smithy.kotlin.runtime.net.HostResolver
 import aws.smithy.kotlin.runtime.time.Instant
 import kotlinx.coroutines.job
 import kotlinx.coroutines.sync.Mutex
@@ -59,6 +60,11 @@ public class CrtHttpEngine(public val config: CrtHttpEngineConfig) : HttpClientE
         if (config.socketWriteTimeout != CrtHttpEngineConfig.Default.socketWriteTimeout) {
             logger.warn { "CrtHttpEngine does not support socketWriteTimeout(${config.socketWriteTimeout}); ignoring" }
         }
+
+        if (config.hostResolver !== HostResolver.Default) {
+            // FIXME - there is no way to currently plugin a JVM based host resolver to CRT. (see V804672153)
+            logger.warn { "CrtHttpEngine does not support custom HostResolver implementations; ignoring" }
+        }
     }
 
     private val options = HttpClientConnectionManagerOptionsBuilder().apply {

runtime/protocol/http-client-engines/http-client-engine-crt/jvm/test/aws/smithy/kotlin/runtime/http/engine/crt/AsyncStressTest.kt

@@ -12,8 +12,8 @@ import aws.smithy.kotlin.runtime.http.request.url
 import aws.smithy.kotlin.runtime.http.response.complete
 import aws.smithy.kotlin.runtime.http.sdkHttpClient
 import aws.smithy.kotlin.runtime.httptest.TestWithLocalServer
+import aws.smithy.kotlin.runtime.net.Host
 import aws.smithy.kotlin.runtime.testing.IgnoreWindows
-import aws.smithy.kotlin.runtime.util.net.Host
 import io.ktor.server.application.*
 import io.ktor.server.cio.*
 import io.ktor.server.engine.*

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

@@ -4,6 +4,8 @@
  */
 package aws.smithy.kotlin.runtime.http.engine.okhttp
 
+import aws.smithy.kotlin.runtime.net.HostResolver
+import aws.smithy.kotlin.runtime.net.toHostAddress
 import aws.smithy.kotlin.runtime.tracing.NoOpTraceSpan
 import aws.smithy.kotlin.runtime.tracing.logger
 import okhttp3.*
@@ -12,7 +14,11 @@ import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Proxy
 
-internal class HttpEngineEventListener(private val pool: ConnectionPool, call: Call) : EventListener() {
+internal class HttpEngineEventListener(
+    private val pool: ConnectionPool,
+    private val hr: HostResolver,
+    call: Call,
+) : EventListener() {
     private val traceSpan = call.request().tag<SdkRequestTag>()?.traceSpan?.child("HTTP") ?: NoOpTraceSpan
     private val logger = traceSpan.logger<HttpEngineEventListener>()
 
@@ -50,7 +56,10 @@ internal class HttpEngineEventListener(private val pool: ConnectionPool, call: C
         proxy: Proxy,
         protocol: Protocol?,
         ioe: IOException,
-    ) = trace(ioe) { "connect failed: addr=$inetSocketAddress; proxy=$proxy; protocol=$protocol" }
+    ) {
+        trace(ioe) { "connect failed: addr=$inetSocketAddress; proxy=$proxy; protocol=$protocol" }
+        hr.reportFailure(inetSocketAddress.address.toHostAddress())
+    }
 
     override fun connectionAcquired(call: Call, connection: Connection) {
         val connId = System.identityHashCode(connection)

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

@@ -85,7 +85,7 @@ private fun OkHttpEngineConfig.buildClient(): OkHttpClient {
         connectionPool(pool)
 
         // Log events coming from okhttp. Allocate a new listener per-call to facilitate dedicated trace spans.
-        eventListenerFactory { call -> HttpEngineEventListener(pool, call) }
+        eventListenerFactory { call -> HttpEngineEventListener(pool, config.hostResolver, call) }
 
         // map protocols
         if (config.alpn.isNotEmpty()) {
@@ -101,5 +101,7 @@ private fun OkHttpEngineConfig.buildClient(): OkHttpClient {
 
         proxySelector(OkHttpProxySelector(config.proxySelector))
         proxyAuthenticator(OkHttpProxyAuthenticator(config.proxySelector))
+
+        dns(OkHttpDns(config.hostResolver))
     }.build()
 }