Fix missing port from DnsResolver host override value (#2111)

Author: JamesNK

build/dependencies.props

@@ -3,7 +3,7 @@
     <BenchmarkDotNetPackageVersion>0.13.1</BenchmarkDotNetPackageVersion>
     <GoogleApisAuthPackageVersion>1.46.0</GoogleApisAuthPackageVersion>
     <GoogleProtobufPackageVersion>3.22.0</GoogleProtobufPackageVersion>
-    <GrpcDotNetPackageVersion>2.49.0</GrpcDotNetPackageVersion>  <!-- Used by example projects -->
+    <GrpcDotNetPackageVersion>2.52.0</GrpcDotNetPackageVersion>  <!-- Used by example projects -->
     <GrpcPackageVersion>2.46.6</GrpcPackageVersion>
     <GrpcToolsPackageVersion>2.53.0</GrpcToolsPackageVersion>
     <MicrosoftAspNetCoreAppPackageVersion>7.0.0</MicrosoftAspNetCoreAppPackageVersion>

src/Grpc.Net.Client/Balancer/DnsResolver.cs

@@ -1,4 +1,4 @@
-#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -103,10 +103,11 @@ protected override async Task ResolveAsync(CancellationToken cancellationToken)
 
             DnsResolverLog.ReceivedDnsResults(_logger, addresses.Length, _dnsAddress, addresses);
 
+            var hostOverride = $"{_dnsAddress}:{_port}";
             var endpoints = addresses.Select(a =>
             {
                 var address = new BalancerAddress(a.ToString(), _port);
-                address.Attributes.Set(ConnectionManager.HostOverrideKey, _dnsAddress);
+                address.Attributes.Set(ConnectionManager.HostOverrideKey, hostOverride);
                 return address;
             }).ToArray();
             var resolverResult = ResolverResult.ForResult(endpoints);

test/FunctionalTests/Balancer/DnsResolverTests.cs

@@ -1,4 +1,4 @@
-#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -52,7 +52,43 @@ public async Task Refresh_HasStarted_HasResult()
 
         // Assert
         var result = await tcs.Task.DefaultTimeout();
+
+        Logger.LogInformation($"Resolver result returned {result.Addresses!.Count} addresses.");
+
+        Assert.Greater(result.Addresses!.Count, 0);
+        foreach (var address in result.Addresses)
+        {
+            Assert.True(address.Attributes.TryGetValue(ConnectionManager.HostOverrideKey, out var host));
+            Assert.AreEqual("localhost:80", host);
+        }
+    }
+
+    [Test]
+    public async Task Refresh_CustomPort_InHostOverride()
+    {
+        // Arranged
+        var tcs = new TaskCompletionSource<ResolverResult>(TaskCreationOptions.RunContinuationsAsynchronously);
+
+        var dnsResolver = CreateDnsResolver(new Uri("dns:///localhost:5001"));
+        dnsResolver.Start(r =>
+        {
+            tcs.SetResult(r);
+        });
+
+        // Act
+        dnsResolver.Refresh();
+
+        // Assert
+        var result = await tcs.Task.DefaultTimeout();
+
+        Logger.LogInformation($"Resolver result returned {result.Addresses!.Count} addresses.");
+
         Assert.Greater(result.Addresses!.Count, 0);
+        foreach (var address in result.Addresses)
+        {
+            Assert.True(address.Attributes.TryGetValue(ConnectionManager.HostOverrideKey, out var host));
+            Assert.AreEqual("localhost:5001", host);
+        }
     }
 
     [Test]
@@ -298,6 +334,9 @@ public async Task DNS_Port_Works()
 
             Logger.LogInformation($"Address: {address}");
             Assert.AreEqual(specifiedPort, address.EndPoint.Port);
+
+            Assert.True(address.Attributes.TryGetValue(ConnectionManager.HostOverrideKey, out var host));
+            Assert.AreEqual($"localhost:{specifiedPort}", host);
         }
     }
 
@@ -331,6 +370,9 @@ public async Task DefaultPort_Localhost_AddressesHaveDefaultPort()
 
             Logger.LogInformation($"Address: {address}");
             Assert.AreEqual(defaultPort, address.EndPoint.Port);
+
+            Assert.True(address.Attributes.TryGetValue(ConnectionManager.HostOverrideKey, out var host));
+            Assert.AreEqual($"localhost:{defaultPort}", host);
         }
     }
 
@@ -345,4 +387,4 @@ public TestSystemClock(DateTime utcNow)
     }
 }
 
-#endif
+#endif