From 85ec284bba917b1a9b55951bd34c8f9a0a7d05ea Mon Sep 17 00:00:00 2001 From: Roman Konecny Date: Fri, 19 Jul 2024 13:23:56 +0200 Subject: [PATCH 1/2] Move telemetry out of lock scope --- src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b592f0ce44857f..73e2642f837602 100644 --- a/src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs +++ b/src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs @@ -704,8 +704,8 @@ private static Task RunAsync(Func>)s_tasks).Remove(new KeyValuePair(key!, task)); // Since it was canceled, func(..) had not executed and call AfterResolution it needs to be called here. - NameResolutionTelemetry.Log.AfterResolution(key!, activity, new OperationCanceledException()); } + NameResolutionTelemetry.Log.AfterResolution(key!, activity, new OperationCanceledException()); }, key, CancellationToken.None, TaskContinuationOptions.OnlyOnCanceled | TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); } From 57b9b2fe1da4ee070099af0dfb991c4be4aa0cc3 Mon Sep 17 00:00:00 2001 From: Roman Konecny Date: Fri, 19 Jul 2024 13:29:08 +0200 Subject: [PATCH 2/2] Move also comment --- src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 73e2642f837602..c8a526ccc4b3cc 100644 --- a/src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs +++ b/src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs @@ -703,8 +703,8 @@ private static Task RunAsync(Func>)s_tasks).Remove(new KeyValuePair(key!, task)); - // Since it was canceled, func(..) had not executed and call AfterResolution it needs to be called here. } + // Since it was canceled, func(..) had not executed and call AfterResolution it needs to be called here. NameResolutionTelemetry.Log.AfterResolution(key!, activity, new OperationCanceledException()); }, key, CancellationToken.None, TaskContinuationOptions.OnlyOnCanceled | TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default); }