Fixup Https results to use targetName

Author: swankjesse

okhttp-dnsoverhttps/src/main/kotlin/okhttp3/dnsoverhttps/internal/-DnsOverHttpsCall.kt

@@ -120,7 +120,7 @@ internal class DnsOverHttpsCall(
         when (resourceRecord) {
           is ResourceRecord.Https -> {
             Dns.Record.ServiceMetadata(
-              hostname = request.hostname,
+              hostname = resourceRecord.targetName.takeIf { it != "" } ?: request.hostname,
               alpnIds =
                 resourceRecord.alpnIds?.mapNotNull { alpnId ->
                   try {

okhttp-dnsoverhttps/src/test/java/okhttp3/dnsoverhttps/DnsOverHttpsTest.kt

@@ -347,6 +347,7 @@ class DnsOverHttpsTest(
         ResourceRecord.Https(
           name = "lysine.dev",
           timeToLive = 5,
+          targetName = "cdn.lysine.dev",
           alpnIds = listOf(Protocol.HTTP_2.toString()),
           port = 8843,
           ipAddressHints =
@@ -367,7 +368,7 @@ class DnsOverHttpsTest(
         records =
           listOf(
             Dns.Record.ServiceMetadata(
-              hostname = "lysine.dev",
+              hostname = "cdn.lysine.dev",
               alpnIds = listOf(Protocol.HTTP_2),
               port = 8843,
               ipAddressHints =
@@ -406,6 +407,55 @@ class DnsOverHttpsTest(
     )
   }
 
+  @Test
+  fun serviceMetadataEmptyTargetNameAliasesToRequestHostname() {
+    assumeTrue(entryPoint == EntryPoint.NewCall)
+
+    dns = buildLocalhost(bootstrapClient, includeIPv6 = true, includeHttps = true)
+    server["lysine.dev"] =
+      listOf(
+        ResourceRecord.IpAddress(
+          name = "lysine.dev",
+          timeToLive = 5,
+          address = InetAddress.getByName("10.20.30.40"),
+        ),
+        ResourceRecord.Https(
+          name = "lysine.dev",
+          timeToLive = 5,
+          targetName = "",
+          alpnIds = listOf(Protocol.HTTP_2.toString()),
+        ),
+      )
+
+    val call = dns.newCall(Dns.Request("lysine.dev"))
+    val dnsEvents = call.toEventsQueue()
+
+    assertThat(dnsEvents.take()).isEqualTo(
+      DnsEvent.Records(
+        last = false,
+        records =
+          listOf(
+            Dns.Record.ServiceMetadata(
+              hostname = "lysine.dev",
+              alpnIds = listOf(Protocol.HTTP_2),
+            ),
+          ),
+      ),
+    )
+    assertThat(dnsEvents.take()).isEqualTo(
+      DnsEvent.Records(
+        last = true,
+        records =
+          listOf(
+            Dns.Record.IpAddress(
+              hostname = "lysine.dev",
+              address = InetAddress.getByName("10.20.30.40"),
+            ),
+          ),
+      ),
+    )
+  }
+
   /** An HTTPS error is received before the IPv4 results, but the error is delivered last. */
   @Test
   fun httpsFailureIsDeliveredAfterIpv6AndIpv4Records() {