Improve diag tracing for NameResolution (dotnet/corefx#42428)

* WIP

* update

* update

* update

* cleanup

* fix windows

* disable GetHostEntryAsync_InvalidHost_LogsError on Windows

* feedback from review

Commit migrated from https://github.com/dotnet/corefx/commit/fe68ec506c7e2c5c104f912d8899778d022905d0

diff --git a/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs b/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs
index 69dc680..191cdb8 100644 (file)
--- a/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs
+++ b/src/libraries/Common/src/System/Net/Logging/NetEventSource.Common.cs
@@ -253,7 +253,7 @@ namespace System.Net
             if (IsEnabled) Log.ErrorMessage(IdOf(thisOrContextObject), memberName, Format(message).ToString());
         }
 
-        [Event(ErrorEventId, Level = EventLevel.Warning, Keywords = Keywords.Default)]
+        [Event(ErrorEventId, Level = EventLevel.Error, Keywords = Keywords.Default)]
         private void ErrorMessage(string thisOrContextObject, string? memberName, string? message) =>
             WriteEvent(ErrorEventId, thisOrContextObject, memberName ?? MissingMember, message);
         #endregion

diff --git a/src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs b/src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs
index b6a4909..63f74b7 100644 (file)
--- a/src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs
+++ b/src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs
@@ -16,15 +16,16 @@ namespace System.Net
         /// <summary>Gets the host name of the local machine.</summary>
         public static string GetHostName()
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Info(null, null);
             NameResolutionPal.EnsureSocketsAreInitialized();
 
-            return NameResolutionPal.GetHostName();
+            string name = NameResolutionPal.GetHostName();
+            if (NetEventSource.IsEnabled) NetEventSource.Info(null, name);
+            return name;
         }
 
         public static IPHostEntry GetHostEntry(IPAddress address)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, address);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(address, address);
             NameResolutionPal.EnsureSocketsAreInitialized();
 
             if (address is null)
@@ -34,18 +35,19 @@ namespace System.Net
 
             if (address.Equals(IPAddress.Any) || address.Equals(IPAddress.IPv6Any))
             {
+                if (NetEventSource.IsEnabled) NetEventSource.Error(address, $"Invalid address '{address}'");
                 throw new ArgumentException(SR.Format(SR.net_invalid_ip_addr, nameof(address)));
             }
 
             IPHostEntry ipHostEntry = GetHostEntryCore(address);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(address, $"{ipHostEntry} with {ipHostEntry.AddressList.Length} entries");
             return ipHostEntry;
         }
 
         public static IPHostEntry GetHostEntry(string hostNameOrAddress)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostNameOrAddress);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(hostNameOrAddress, hostNameOrAddress);
             NameResolutionPal.EnsureSocketsAreInitialized();
 
             if (hostNameOrAddress is null)
@@ -59,6 +61,7 @@ namespace System.Net
             {
                 if (address.Equals(IPAddress.Any) || address.Equals(IPAddress.IPv6Any))
                 {
+                    if (NetEventSource.IsEnabled) NetEventSource.Error(address, $"Invalid address '{address}'");
                     throw new ArgumentException(SR.Format(SR.net_invalid_ip_addr, nameof(hostNameOrAddress)));
                 }
 
@@ -69,16 +72,30 @@ namespace System.Net
                 ipHostEntry = GetHostEntryCore(hostNameOrAddress);
             }
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(hostNameOrAddress, $"{ipHostEntry} with {ipHostEntry.AddressList.Length} entries");
             return ipHostEntry;
         }
 
-        public static Task<IPHostEntry> GetHostEntryAsync(string hostNameOrAddress) =>
-            GetHostEntryCoreAsync(hostNameOrAddress, justReturnParsedIp: false, throwOnIIPAny: true);
+        public static Task<IPHostEntry> GetHostEntryAsync(string hostNameOrAddress)
+        {
+            if (NetEventSource.IsEnabled)
+            {
+                NetEventSource.Enter(hostNameOrAddress, hostNameOrAddress);
+                Task<IPHostEntry> t = GetHostEntryCoreAsync(hostNameOrAddress, justReturnParsedIp: false, throwOnIIPAny: true);
+                t.ContinueWith((t, s) => NetEventSource.Exit((string)s, $"{t.Result} with {((IPHostEntry)t.Result).AddressList.Length} entries"),
+                    hostNameOrAddress, CancellationToken.None, TaskContinuationOptions.ExecuteSynchronously | TaskContinuationOptions.OnlyOnRanToCompletion, TaskScheduler.Default);
+                return t;
+            }
+            else
+            {
+                return GetHostEntryCoreAsync(hostNameOrAddress, justReturnParsedIp: false, throwOnIIPAny: true);
+            }
+        }
 
         public static Task<IPHostEntry> GetHostEntryAsync(IPAddress address)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Info(null, address);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(address, address);
+
             NameResolutionPal.EnsureSocketsAreInitialized();
 
             if (address is null)
@@ -88,45 +105,50 @@ namespace System.Net
 
             if (address.Equals(IPAddress.Any) || address.Equals(IPAddress.IPv6Any))
             {
+                if (NetEventSource.IsEnabled) NetEventSource.Error(address, $"Invalid address '{address}'");
                 throw new ArgumentException(SR.net_invalid_ip_addr, nameof(address));
             }
 
-            return RunAsync(s => GetHostEntryCore((IPAddress)s), address);
+            return RunAsync(s => {
+                    IPHostEntry ipHostEntry = GetHostEntryCore((IPAddress)s);
+                    if (NetEventSource.IsEnabled) NetEventSource.Exit((IPAddress)s, $"{ipHostEntry} with {ipHostEntry.AddressList.Length} entries");
+                    return ipHostEntry;
+                }, address);
         }
 
         public static IAsyncResult BeginGetHostEntry(IPAddress address, AsyncCallback requestCallback, object stateObject)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, address);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(address, address);
 
             IAsyncResult asyncResult = TaskToApm.Begin(GetHostEntryAsync(address), requestCallback, stateObject);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, asyncResult);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(address, asyncResult);
             return asyncResult;
         }
 
         public static IAsyncResult BeginGetHostEntry(string hostNameOrAddress, AsyncCallback requestCallback, object stateObject)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostNameOrAddress);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(hostNameOrAddress, hostNameOrAddress);
 
             IAsyncResult asyncResult = TaskToApm.Begin(GetHostEntryAsync(hostNameOrAddress), requestCallback, stateObject);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, asyncResult);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(asyncResult, asyncResult);
             return asyncResult;
         }
 
         public static IPHostEntry EndGetHostEntry(IAsyncResult asyncResult)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, asyncResult);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(asyncResult, asyncResult);
 
             IPHostEntry ipHostEntry = TaskToApm.End<IPHostEntry>(asyncResult ?? throw new ArgumentNullException(nameof(asyncResult)));
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(asyncResult, $"{ipHostEntry} with {ipHostEntry.AddressList.Length} entries" );
             return ipHostEntry;
         }
 
         public static IPAddress[] GetHostAddresses(string hostNameOrAddress)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostNameOrAddress);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(hostNameOrAddress, hostNameOrAddress);
             NameResolutionPal.EnsureSocketsAreInitialized();
 
             if (hostNameOrAddress is null)
@@ -140,6 +162,7 @@ namespace System.Net
             {
                 if (address.Equals(IPAddress.Any) || address.Equals(IPAddress.IPv6Any))
                 {
+                    if (NetEventSource.IsEnabled) NetEventSource.Error(address, $"Invalid address '{address}'");
                     throw new ArgumentException(SR.Format(SR.net_invalid_ip_addr, nameof(hostNameOrAddress)));
                 }
 
@@ -150,7 +173,7 @@ namespace System.Net
                 addresses = GetHostAddressesCore(hostNameOrAddress);
             }
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, addresses);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(hostNameOrAddress, addresses);
             return addresses;
         }
 
@@ -159,21 +182,21 @@ namespace System.Net
 
         public static IAsyncResult BeginGetHostAddresses(string hostNameOrAddress, AsyncCallback requestCallback, object state)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostNameOrAddress);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(hostNameOrAddress, hostNameOrAddress);
 
             IAsyncResult asyncResult = TaskToApm.Begin(GetHostAddressesAsync(hostNameOrAddress), requestCallback, state);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, asyncResult);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(hostNameOrAddress, asyncResult);
             return asyncResult;
         }
 
         public static IPAddress[] EndGetHostAddresses(IAsyncResult asyncResult)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, asyncResult);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(asyncResult, asyncResult);
 
             IPAddress[] addresses = TaskToApm.End<IPAddress[]>(asyncResult ?? throw new ArgumentNullException(nameof(asyncResult)));
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, addresses);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(asyncResult, addresses);
             return addresses;
         }
 
@@ -198,29 +221,29 @@ namespace System.Net
         [Obsolete("BeginGetHostByName is obsoleted for this type, please use BeginGetHostEntry instead. https://go.microsoft.com/fwlink/?linkid=14202")]
         public static IAsyncResult BeginGetHostByName(string hostName, AsyncCallback requestCallback, object stateObject)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostName);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(hostName, hostName);
 
             IAsyncResult asyncResult = TaskToApm.Begin(GetHostEntryCoreAsync(hostName, justReturnParsedIp: true, throwOnIIPAny: true), requestCallback, stateObject);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, asyncResult);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(hostName, asyncResult);
             return asyncResult;
         }
 
         [Obsolete("EndGetHostByName is obsoleted for this type, please use EndGetHostEntry instead. https://go.microsoft.com/fwlink/?linkid=14202")]
         public static IPHostEntry EndGetHostByName(IAsyncResult asyncResult)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, asyncResult);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(asyncResult, asyncResult);
 
             IPHostEntry ipHostEntry = TaskToApm.End<IPHostEntry>(asyncResult ?? throw new ArgumentNullException(nameof(asyncResult)));
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(asyncResult, ipHostEntry);
             return ipHostEntry;
         }
 
         [Obsolete("GetHostByAddress is obsoleted for this type, please use GetHostEntry instead. https://go.microsoft.com/fwlink/?linkid=14202")]
         public static IPHostEntry GetHostByAddress(string address)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, address);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(address, address);
             NameResolutionPal.EnsureSocketsAreInitialized();
 
             if (address is null)
@@ -230,14 +253,14 @@ namespace System.Net
 
             IPHostEntry ipHostEntry = GetHostEntryCore(IPAddress.Parse(address));
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(address, ipHostEntry);
             return ipHostEntry;
         }
 
         [Obsolete("GetHostByAddress is obsoleted for this type, please use GetHostEntry instead. https://go.microsoft.com/fwlink/?linkid=14202")]
         public static IPHostEntry GetHostByAddress(IPAddress address)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, address);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(address, address);
             NameResolutionPal.EnsureSocketsAreInitialized();
 
             if (address is null)
@@ -247,14 +270,14 @@ namespace System.Net
 
             IPHostEntry ipHostEntry = GetHostEntryCore(address);
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(address, ipHostEntry);
             return ipHostEntry;
         }
 
         [Obsolete("Resolve is obsoleted for this type, please use GetHostEntry instead. https://go.microsoft.com/fwlink/?linkid=14202")]
         public static IPHostEntry Resolve(string hostName)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostName);
+            if (NetEventSource.IsEnabled) NetEventSource.Enter(hostName, hostName);
             NameResolutionPal.EnsureSocketsAreInitialized();
 
             if (hostName is null)
@@ -273,7 +296,7 @@ namespace System.Net
                 }
                 catch (SocketException ex)
                 {
-                    if (NetEventSource.IsEnabled) NetEventSource.Error(null, ex);
+                    if (NetEventSource.IsEnabled) NetEventSource.Error(hostName, ex);
                     ipHostEntry = CreateHostEntryForAddress(address);
                 }
             }
@@ -282,7 +305,7 @@ namespace System.Net
                 ipHostEntry = GetHostEntryCore(hostName);
             }
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, ipHostEntry);
+            if (NetEventSource.IsEnabled) NetEventSource.Exit(hostName, ipHostEntry);
             return ipHostEntry;
         }
 
@@ -335,12 +358,13 @@ namespace System.Net
 
         private static object GetHostEntryOrAddressesCore(string hostName, bool justAddresses)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Enter(null, hostName);
             ValidateHostName(hostName);
 
-            SocketError errorCode = NameResolutionPal.TryGetAddrInfo(hostName, justAddresses, out hostName, out string[] aliases, out IPAddress[] addresses, out int nativeErrorCode);
+            SocketError errorCode = NameResolutionPal.TryGetAddrInfo(hostName, justAddresses, out string newHostName, out string[] aliases, out IPAddress[] addresses, out int nativeErrorCode);
+
             if (errorCode != SocketError.Success)
             {
+                if (NetEventSource.IsEnabled) NetEventSource.Error(hostName, $"{hostName} DNS lookup failed with {errorCode}");
                 throw SocketExceptionFactory.CreateSocketException(errorCode, nativeErrorCode);
             }
 
@@ -349,11 +373,10 @@ namespace System.Net
                 new IPHostEntry
                 {
                     AddressList = addresses,
-                    HostName = hostName,
+                    HostName = newHostName,
                     Aliases = aliases
                 };
 
-            if (NetEventSource.IsEnabled) NetEventSource.Exit(null, result);
             return result;
         }
 
@@ -366,8 +389,6 @@ namespace System.Net
         // Does internal IPAddress reverse and then forward lookups (for Legacy and current public methods).
         private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAddresses)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Info(null, address);
-
             // Try to get the data for the host from its address.
             // We need to call getnameinfo first, because getaddrinfo w/ the ipaddress string
             // will only return that address and not the full list.
@@ -376,6 +397,7 @@ namespace System.Net
             string name = NameResolutionPal.TryGetNameInfo(address, out SocketError errorCode, out int nativeErrorCode);
             if (errorCode != SocketError.Success)
             {
+                if (NetEventSource.IsEnabled) NetEventSource.Error(address, $"{address} DNS lookup failed with {errorCode}");
                 throw SocketExceptionFactory.CreateSocketException(errorCode, nativeErrorCode);
             }
 
@@ -384,7 +406,7 @@ namespace System.Net
 
             if (errorCode != SocketError.Success)
             {
-                if (NetEventSource.IsEnabled) NetEventSource.Error(null, SocketExceptionFactory.CreateSocketException(errorCode, nativeErrorCode));
+                if (NetEventSource.IsEnabled) NetEventSource.Error(address, $"forward lookup for '{name}' failed with {errorCode}");
             }
 
             // One of three things happened:
@@ -411,7 +433,6 @@ namespace System.Net
         // If hostName is an IPString and justReturnParsedIP==true then no reverse lookup will be attempted, but the original address is returned.
         private static Task GetHostEntryOrAddressesCoreAsync(string hostName, bool justReturnParsedIp, bool throwOnIIPAny, bool justAddresses)
         {
-            if (NetEventSource.IsEnabled) NetEventSource.Info(null, hostName);
             NameResolutionPal.EnsureSocketsAreInitialized();
 
             if (hostName is null)
@@ -424,6 +445,7 @@ namespace System.Net
             {
                 if (throwOnIIPAny && (ipAddress.Equals(IPAddress.Any) || ipAddress.Equals(IPAddress.IPv6Any)))
                 {
+                    if (NetEventSource.IsEnabled) NetEventSource.Error(hostName, $"Invalid address '{ipAddress}'");
                     throw new ArgumentException(SR.net_invalid_ip_addr, nameof(hostName));
                 }
 

diff --git a/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs b/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs
index b154aab..3ba5c09 100644 (file)
--- a/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs
+++ b/src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionPal.Windows.cs
@@ -131,8 +131,11 @@ namespace System.Net
 
             const int HostNameBufferLength = 256;
             byte* buffer = stackalloc byte[HostNameBufferLength];
-            if (Interop.Winsock.gethostname(buffer, HostNameBufferLength) != SocketError.Success)
+            SocketError result = Interop.Winsock.gethostname(buffer, HostNameBufferLength);
+
+            if (result != SocketError.Success)
             {
+                if (NetEventSource.IsEnabled) NetEventSource.Error(null, $"GetHostName failed with {result}");
                 throw new SocketException();
             }
 

diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/LoggingTest.cs b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/LoggingTest.cs
index 5b63708..416321d 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/LoggingTest.cs
+++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/LoggingTest.cs
@@ -2,13 +2,22 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.Concurrent;
 using System.Diagnostics.Tracing;
+using System.Linq;
+using System.Net.Sockets;
 using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.DotNet.XUnitExtensions;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace System.Net.NameResolution.Tests
 {
-    public static class LoggingTest
+    using Configuration = System.Net.Test.Common.Configuration;
+
+    [Collection("NoParallelTests")]
+    public class LoggingTest
     {
         [Fact]
         public static void EventSource_ExistsWithCorrectId()
@@ -21,5 +30,103 @@ namespace System.Net.NameResolution.Tests
 
             Assert.NotEmpty(EventSource.GenerateManifest(esType, "assemblyPathToIncludeInManifest"));
         }
+
+        [ConditionalFact]
+        public void GetHostEntry_InvalidHost_LogsError()
+        {
+            using (var listener = new TestEventListener("Microsoft-System-Net-NameResolution", EventLevel.Error))
+            {
+                var events = new ConcurrentQueue<EventWrittenEventArgs>();
+
+                listener.RunWithCallback(ev => events.Enqueue(ev), () =>
+                {
+                    try
+                    {
+                        Dns.GetHostEntry(Configuration.Sockets.InvalidHost);
+                        throw new SkipTestException("GetHostEntry() should fail but it did not.");
+                    }
+                    catch (SocketException e) when (e.SocketErrorCode == SocketError.HostNotFound)
+                    {
+                    }
+                    catch (Exception e)
+                    {
+                        throw new SkipTestException($"GetHostEntry failed unexpectedly: {e.Message}");
+                    }
+                });
+
+                Assert.True(events.Count() > 0);
+                foreach (EventWrittenEventArgs ev in events)
+                {
+                    Assert.True(ev.Payload.Count >= 3);
+                    Assert.NotNull(ev.Payload[0]);
+                    Assert.NotNull(ev.Payload[1]);
+                    Assert.NotNull(ev.Payload[2]);
+                }
+            }
+        }
+
+        [ConditionalFact]
+        [PlatformSpecific(~TestPlatforms.Windows)]  // Unreliable on Windows.
+        public void GetHostEntryAsync_InvalidHost_LogsError()
+        {
+            using (var listener = new TestEventListener("Microsoft-System-Net-NameResolution", EventLevel.Error))
+            {
+                var events = new ConcurrentQueue<EventWrittenEventArgs>();
+
+                listener.RunWithCallback(ev => events.Enqueue(ev), () =>
+                {
+                    try
+                    {
+                        Dns.GetHostEntryAsync(Configuration.Sockets.InvalidHost).GetAwaiter().GetResult();
+                        throw new SkipTestException("GetHostEntry() should fail but it did not.");
+                    }
+                    catch (SocketException e) when (e.SocketErrorCode == SocketError.HostNotFound)
+                    {
+                    }
+                    catch (Exception e)
+                    {
+                        throw new SkipTestException($"GetHostEntry failed unexpectedly: {e.Message}");
+                    }
+                });
+
+                Assert.True(events.Count() > 0);
+                foreach (EventWrittenEventArgs ev in events)
+                {
+                    Assert.True(ev.Payload.Count >= 3);
+                    Assert.NotNull(ev.Payload[0]);
+                    Assert.NotNull(ev.Payload[1]);
+                    Assert.NotNull(ev.Payload[2]);
+                }
+            }
+        }
+
+        [ConditionalFact]
+        public void GetHostEntry_ValidName_NoErrors()
+        {
+            using (var listener = new TestEventListener("Microsoft-System-Net-NameResolution", EventLevel.Verbose))
+            {
+                var events = new ConcurrentQueue<EventWrittenEventArgs>();
+
+                listener.RunWithCallback(ev => events.Enqueue(ev), () =>
+                {
+                    try
+                    {
+                        Dns.GetHostEntryAsync("localhost").GetAwaiter().GetResult();
+                        Dns.GetHostEntryAsync(IPAddress.Loopback).GetAwaiter().GetResult();
+                        Dns.GetHostEntry("localhost");
+                        Dns.GetHostEntry(IPAddress.Loopback);
+                    }
+                    catch (Exception e)
+                    {
+                        throw new SkipTestException($"Localhost lookup failed unexpectedly: {e.Message}");
+                    }
+                });
+
+                // We get some traces.
+                Assert.True(events.Count() > 0);
+                // No errors or warning for successful query.
+                Assert.True(events.Count(ev => (int)ev.Level > (int)EventLevel.Informational) == 0);
+            }
+        }
     }
 }

diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
index a8c7299..044d02c 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
+++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/System.Net.NameResolution.Functional.Tests.csproj
@@ -15,5 +15,14 @@
     <Compile Include="$(CommonTestPath)\System\Threading\Tasks\TaskTimeoutExtensions.cs">
       <Link>Common\System\Threading\Tasks\TaskTimeoutExtensions.cs</Link>
     </Compile>
+    <Compile Include="$(CommonTestPath)\System\Net\Configuration.cs">
+      <Link>Common\System\Net\Configuration.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonTestPath)\System\Net\Configuration.Sockets.cs">
+      <Link>Common\System\Net\Configuration.Sockets.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonTestPath)\System\Diagnostics\Tracing\TestEventListener.cs">
+      <Link>Common\System\Diagnostics\Tracing\TestEventListener.cs</Link>
+    </Compile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/TestSettings.cs b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/TestSettings.cs
index 5741d1a..b354ae5 100644 (file)
--- a/src/libraries/System.Net.NameResolution/tests/FunctionalTests/TestSettings.cs
+++ b/src/libraries/System.Net.NameResolution/tests/FunctionalTests/TestSettings.cs
@@ -4,9 +4,14 @@
 
 using System.Net.Sockets;
 using System.Threading.Tasks;
+using Xunit;
+using Xunit.Abstractions;
 
 namespace System.Net.NameResolution.Tests
 {
+    [CollectionDefinition("NoParallelTests", DisableParallelization = true)]
+    public partial class NoParallelTests { }
+
     internal static class TestSettings
     {
         public const string LocalHost = "localhost";