Adjust DNS metrics#89813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antonfirsov merged 5 commits into from
Aug 3, 2023
Merged

Adjust DNS metrics #89813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7b7d0d
adjust DNS metrics
antonfirsov Aug 1, 2023
3f93209
set the unit to seconds
antonfirsov Aug 2, 2023
15b2ed1
Update src/libraries/System.Net.NameResolution/src/System/Net/NameRes…
antonfirsov Aug 2, 2023
0e8ff4b
simplify NameResolutionTelemetry.BeforeResolution
antonfirsov Aug 2, 2023
f24f384
Merge branch 'adjust-dns-metrics-01' of https://github.com/antonfirso…
antonfirsov Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,13 +24,13 @@ public static string GetHostName()
{
name = NameResolutionPal.GetHostName();
}
catch when (LogFailure(startingTimestamp))
catch when (LogFailure(string.Empty, startingTimestamp))
{
Debug.Fail("LogFailure should return false");
throw;
}

NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
NameResolutionTelemetry.Log.AfterResolution(string.Empty, startingTimestamp, successful: true);

if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, name);
return name;
Expand DownExpand Up@@ -395,13 +395,13 @@ private static object GetHostEntryOrAddressesCore(string hostName, bool justAddr
Aliases = aliases
};
}
catch when (LogFailure(startingTimestamp))
catch when (LogFailure(hostName, startingTimestamp))
{
Debug.Fail("LogFailure should return false");
throw;
}

NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: true);

return result;
}
Expand DownExpand Up@@ -435,13 +435,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
}
Debug.Assert(name != null);
}
catch when (LogFailure(startingTimestamp))
catch when (LogFailure(address, startingTimestamp))
{
Debug.Fail("LogFailure should return false");
throw;
}

NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
NameResolutionTelemetry.Log.AfterResolution(address, startingTimestamp, successful: true);

// Do the forward lookup to get the IPs for that host name
startingTimestamp = NameResolutionTelemetry.Log.BeforeResolution(name);
Expand All@@ -465,13 +465,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
AddressList = addresses
};
}
catch when (LogFailure(startingTimestamp))
catch when (LogFailure(name, startingTimestamp))
{
Debug.Fail("LogFailure should return false");
throw;
}

NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
NameResolutionTelemetry.Log.AfterResolution(name, startingTimestamp, successful: true);

// One of three things happened:
// 1. Success.
Expand DownExpand Up@@ -603,7 +603,7 @@ static async Task<T> CompleteAsync(Task task, string hostName, long startingTime
}
finally
{
NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: result is not null);
NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: result is not null);
}
}
}
Expand All@@ -628,9 +628,9 @@ private static void ValidateHostName(string hostName)
}
}

private static bool LogFailure(long? startingTimestamp)
private static bool LogFailure(object hostNameOrAddress, long? startingTimestamp)
{
NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: false);
NameResolutionTelemetry.Log.AfterResolution(hostNameOrAddress, startingTimestamp, successful: false);
return false;
}

Expand Down
40 changes: 7 additions & 33 deletions src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionMetrics.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,42 +12,16 @@ internal static class NameResolutionMetrics
{
private static readonly Meter s_meter = new("System.Net.NameResolution");

private static readonly Counter<long> s_lookupsRequestedCounter = s_meter.CreateCounter<long>(
name: "dns-lookups-requested",
description: "Number of DNS lookups requested.");
private static readonly Histogram<double> s_lookupDuration = s_meter.CreateHistogram<double>(
Comment thread
antonfirsov marked this conversation as resolved.
name: "dns.lookups.duration",
unit: "s",
description: "Measures the time taken to perform a DNS lookup.");

public static bool IsEnabled() => s_lookupsRequestedCounter.Enabled;
public static bool IsEnabled() => s_lookupDuration.Enabled;

public static void BeforeResolution(object hostNameOrAddress, out string? host)
public static void AfterResolution(TimeSpan duration, string hostName)
{
if (s_lookupsRequestedCounter.Enabled)
{
host = GetHostnameFromStateObject(hostNameOrAddress);

s_lookupsRequestedCounter.Add(1, KeyValuePair.Create("hostname", (object?)host));
}
else
{
host = null;
}
}

public static string GetHostnameFromStateObject(object hostNameOrAddress)
{
Debug.Assert(hostNameOrAddress is not null);

string host = hostNameOrAddress switch
{
string h => h,
KeyValuePair<string, AddressFamily> t => t.Key,
IPAddress a => a.ToString(),
KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
_ => null!
};

Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

return host;
s_lookupDuration.Record(duration.TotalSeconds, KeyValuePair.Create("dns.question.name", (object?)hostName));
}
}
}
45 changes: 36 additions & 9 deletions src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Tracing;
using System.Net.Sockets;
using System.Threading;

namespace System.Net
Expand DownExpand Up@@ -60,38 +62,40 @@ protected override void OnEventCommand(EventCommandEventArgs command)
[NonEvent]
public long BeforeResolution(object hostNameOrAddress)
{
// System.Diagnostics.Metrics part
NameResolutionMetrics.BeforeResolution(hostNameOrAddress, out string? host);

// System.Diagnostics.Tracing part
if (IsEnabled())
{
Interlocked.Increment(ref _lookupsRequested);
Interlocked.Increment(ref _currentLookups);

if (IsEnabled(EventLevel.Informational, EventKeywords.None))
{
host ??= NameResolutionMetrics.GetHostnameFromStateObject(hostNameOrAddress);
string host = GetHostnameFromStateObject(hostNameOrAddress);

ResolutionStart(host);
}

return Stopwatch.GetTimestamp();
}

return 0;
return NameResolutionMetrics.IsEnabled() ? Stopwatch.GetTimestamp() : 0;
}

[NonEvent]
public void AfterResolution(long? startingTimestamp, bool successful)
public void AfterResolution(object hostNameOrAddress, long? startingTimestamp, bool successful)
{
Debug.Assert(startingTimestamp.HasValue);
if (startingTimestamp == 0)
{
return;
}

TimeSpan duration = Stopwatch.GetElapsedTime(startingTimestamp.Value);

if (startingTimestamp != 0)
if (IsEnabled())
{
Interlocked.Decrement(ref _currentLookups);

_lookupsDuration?.WriteMetric(Stopwatch.GetElapsedTime(startingTimestamp.Value).TotalMilliseconds);
_lookupsDuration?.WriteMetric(duration.TotalMilliseconds);
Comment thread
antonfirsov marked this conversation as resolved.

if (IsEnabled(EventLevel.Informational, EventKeywords.None))
{
Expand All@@ -103,6 +107,29 @@ public void AfterResolution(long? startingTimestamp, bool successful)
ResolutionStop();
}
}

if (NameResolutionMetrics.IsEnabled())
{
NameResolutionMetrics.AfterResolution(duration, GetHostnameFromStateObject(hostNameOrAddress));
}
}

private static string GetHostnameFromStateObject(object hostNameOrAddress)
{
Debug.Assert(hostNameOrAddress is not null);

string host = hostNameOrAddress switch
{
string h => h,
KeyValuePair<string, AddressFamily> t => t.Key,
IPAddress a => a.ToString(),
KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
_ => null!
};

Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

return host;
}
}
}
18 changes: 9 additions & 9 deletions src/libraries/System.Net.NameResolution/tests/FunctionalTests/MetricsTest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ namespace System.Net.NameResolution.Tests
{
public class MetricsTest
{
private const string DnsLookupsRequested = "dns-lookups-requested";
private const string DnsLookupDuration = "dns.lookups.duration";

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
public static void ResolveValidHostName_MetricsRecorded()
Expand All@@ -23,7 +23,7 @@ public static void ResolveValidHostName_MetricsRecorded()
{
const string ValidHostName = "localhost";

using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

await Dns.GetHostEntryAsync(ValidHostName);
await Dns.GetHostAddressesAsync(ValidHostName);
Expand All@@ -34,10 +34,10 @@ public static void ResolveValidHostName_MetricsRecorded()
Dns.EndGetHostEntry(Dns.BeginGetHostEntry(ValidHostName, null, null));
Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(ValidHostName, null, null));

long[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);

Assert.Equal(6, measurements.Length);
Assert.All(measurements, m => Assert.Equal(1, m));
Assert.All(measurements, m => Assert.True(m > double.Epsilon));
}).Dispose();
}

Expand All@@ -46,7 +46,7 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
{
const string InvalidHostName = $"invalid...example.com...{nameof(ResolveInvalidHostName_MetricsRecorded)}";

using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostEntryAsync(InvalidHostName));
await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostAddressesAsync(InvalidHostName));
Expand All@@ -57,17 +57,17 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostEntry(Dns.BeginGetHostEntry(InvalidHostName, null, null)));
Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(InvalidHostName, null, null)));

long[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);

Assert.Equal(6, measurements.Length);
Assert.All(measurements, m => Assert.Equal(1, m));
Assert.All(measurements, m => Assert.True(m > double.Epsilon));
}

private static long[] GetMeasurementsForHostname(InstrumentRecorder<long> recorder, string hostname)
private static double[] GetMeasurementsForHostname(InstrumentRecorder<double> recorder, string hostname)
{
return recorder
.GetMeasurements()
.Where(m => m.Tags.ToArray().Any(t => t.Key == "hostname" && t.Value is string hostnameTag && hostnameTag == hostname))
.Where(m => m.Tags.ToArray().Any(t => t.Key == "dns.question.name" && t.Value is string hostnameTag && hostnameTag == hostname))
.Select(m => m.Value)
.ToArray();
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Adjust DNS metrics#89813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonfirsov
merged 5 commits into

from

Aug 3, 2023
 Merged


Adjust DNS metrics
#89813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d7b7d0d

adjust DNS metrics


antonfirsov Aug 1, 2023
3f93209

set the unit to seconds


antonfirsov Aug 2, 2023
15b2ed1

Update src/libraries/System.Net.NameResolution/src/System/Net/NameRes…


antonfirsov Aug 2, 2023
0e8ff4b

simplify NameResolutionTelemetry.BeforeResolution


antonfirsov Aug 2, 2023
f24f384

Merge branch 'adjust-dns-metrics-01' of https://github.com/antonfirso…


antonfirsov Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 11 additions & 11 deletions
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,13 +24,13 @@ public static string GetHostName()
 {
 name = NameResolutionPal.GetHostName();
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(string.Empty, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(string.Empty, startingTimestamp, successful: true);

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, name);
 return name;
Expand DownExpand Up@@ -395,13 +395,13 @@ private static object GetHostEntryOrAddressesCore(string hostName, bool justAddr
 Aliases = aliases
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(hostName, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: true);

 return result;
 }
Expand DownExpand Up@@ -435,13 +435,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 }
 Debug.Assert(name != null);
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(address, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(address, startingTimestamp, successful: true);

 // Do the forward lookup to get the IPs for that host name
 startingTimestamp = NameResolutionTelemetry.Log.BeforeResolution(name);
Expand All@@ -465,13 +465,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 AddressList = addresses
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(name, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(name, startingTimestamp, successful: true);

 // One of three things happened:
 // 1. Success.
Expand DownExpand Up@@ -603,7 +603,7 @@ static async Task<T> CompleteAsync(Task task, string hostName, long startingTime
 }
 finally
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: result is not null);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: result is not null);
 }
 }
 }
Expand All@@ -628,9 +628,9 @@ private static void ValidateHostName(string hostName)
 }
 }

 private static bool LogFailure(long? startingTimestamp)
 private static bool LogFailure(object hostNameOrAddress, long? startingTimestamp)
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: false);
 NameResolutionTelemetry.Log.AfterResolution(hostNameOrAddress, startingTimestamp, successful: false);
 return false;
 }

Expand Down

40 changes: 7 additions & 33 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionMetrics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,42 +12,16 @@ internal static class NameResolutionMetrics
 {
 private static readonly Meter s_meter = new("System.Net.NameResolution");

 private static readonly Counter<long> s_lookupsRequestedCounter = s_meter.CreateCounter<long>(
 name: "dns-lookups-requested",
 description: "Number of DNS lookups requested.");
 private static readonly Histogram<double> s_lookupDuration = s_meter.CreateHistogram<double>(
Comment thread
antonfirsov marked this conversation as resolved.

 name: "dns.lookups.duration",
 unit: "s",
 description: "Measures the time taken to perform a DNS lookup.");

 public static bool IsEnabled() => s_lookupsRequestedCounter.Enabled;
 public static bool IsEnabled() => s_lookupDuration.Enabled;

 public static void BeforeResolution(object hostNameOrAddress, out string? host)
 public static void AfterResolution(TimeSpan duration, string hostName)
 {
 if (s_lookupsRequestedCounter.Enabled)
 {
 host = GetHostnameFromStateObject(hostNameOrAddress);

 s_lookupsRequestedCounter.Add(1, KeyValuePair.Create("hostname", (object?)host));
 }
 else
 {
 host = null;
 }
 }

 public static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 s_lookupDuration.Record(duration.TotalSeconds, KeyValuePair.Create("dns.question.name", (object?)hostName));
 }
 }
}

45 changes: 36 additions & 9 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Tracing;
using System.Net.Sockets;
using System.Threading;

namespace System.Net
Expand DownExpand Up@@ -60,38 +62,40 @@ protected override void OnEventCommand(EventCommandEventArgs command)
 [NonEvent]
 public long BeforeResolution(object hostNameOrAddress)
 {
 // System.Diagnostics.Metrics part
 NameResolutionMetrics.BeforeResolution(hostNameOrAddress, out string? host);

 // System.Diagnostics.Tracing part
 if (IsEnabled())
 {
 Interlocked.Increment(ref _lookupsRequested);
 Interlocked.Increment(ref _currentLookups);

 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
 host ??= NameResolutionMetrics.GetHostnameFromStateObject(hostNameOrAddress);
string host = GetHostnameFromStateObject(hostNameOrAddress);

 ResolutionStart(host);
 }

 return Stopwatch.GetTimestamp();
 }

 return 0;
 return NameResolutionMetrics.IsEnabled() ? Stopwatch.GetTimestamp() : 0;
 }

 [NonEvent]
 public void AfterResolution(long? startingTimestamp, bool successful)
 public void AfterResolution(object hostNameOrAddress, long? startingTimestamp, bool successful)
 {
 Debug.Assert(startingTimestamp.HasValue);
 if (startingTimestamp == 0)
 {
 return;
 }

 TimeSpan duration = Stopwatch.GetElapsedTime(startingTimestamp.Value);

 if (startingTimestamp != 0)
 if (IsEnabled())
 {
 Interlocked.Decrement(ref _currentLookups);

 _lookupsDuration?.WriteMetric(Stopwatch.GetElapsedTime(startingTimestamp.Value).TotalMilliseconds);
 _lookupsDuration?.WriteMetric(duration.TotalMilliseconds);
Comment thread
antonfirsov marked this conversation as resolved.


 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
Expand All@@ -103,6 +107,29 @@ public void AfterResolution(long? startingTimestamp, bool successful)
 ResolutionStop();
 }
 }

 if (NameResolutionMetrics.IsEnabled())
 {
 NameResolutionMetrics.AfterResolution(duration, GetHostnameFromStateObject(hostNameOrAddress));
 }
 }

 private static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 }
 }
}

18 changes: 9 additions & 9 deletions
src/libraries/System.Net.NameResolution/tests/FunctionalTests/MetricsTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ namespace System.Net.NameResolution.Tests
{
 public class MetricsTest
 {
 private const string DnsLookupsRequested = "dns-lookups-requested";
 private const string DnsLookupDuration = "dns.lookups.duration";

 [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
 public static void ResolveValidHostName_MetricsRecorded()
Expand All@@ -23,7 +23,7 @@ public static void ResolveValidHostName_MetricsRecorded()
 {
 const string ValidHostName = "localhost";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Dns.GetHostEntryAsync(ValidHostName);
 await Dns.GetHostAddressesAsync(ValidHostName);
Expand All@@ -34,10 +34,10 @@ public static void ResolveValidHostName_MetricsRecorded()
 Dns.EndGetHostEntry(Dns.BeginGetHostEntry(ValidHostName, null, null));
 Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(ValidHostName, null, null));

long[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }).Dispose();
 }

Expand All@@ -46,7 +46,7 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 {
 const string InvalidHostName = $"invalid...example.com...{nameof(ResolveInvalidHostName_MetricsRecorded)}";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostEntryAsync(InvalidHostName));
 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostAddressesAsync(InvalidHostName));
Expand All@@ -57,17 +57,17 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostEntry(Dns.BeginGetHostEntry(InvalidHostName, null, null)));
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(InvalidHostName, null, null)));

long[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }

 private static long[] GetMeasurementsForHostname(InstrumentRecorder<long> recorder, string hostname)
 private static double[] GetMeasurementsForHostname(InstrumentRecorder<double> recorder, string hostname)
 {
 return recorder
 .GetMeasurements()
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "hostname" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "dns.question.name" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Select(m => m.Value)
 .ToArray();
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adjust DNS metrics#89813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonfirsov
merged 5 commits into

from

Aug 3, 2023
 Merged


Adjust DNS metrics
#89813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d7b7d0d

adjust DNS metrics


antonfirsov Aug 1, 2023
3f93209

set the unit to seconds


antonfirsov Aug 2, 2023
15b2ed1

Update src/libraries/System.Net.NameResolution/src/System/Net/NameRes…


antonfirsov Aug 2, 2023
0e8ff4b

simplify NameResolutionTelemetry.BeforeResolution


antonfirsov Aug 2, 2023
f24f384

Merge branch 'adjust-dns-metrics-01' of https://github.com/antonfirso…


antonfirsov Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 11 additions & 11 deletions
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,13 +24,13 @@ public static string GetHostName()
 {
 name = NameResolutionPal.GetHostName();
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(string.Empty, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(string.Empty, startingTimestamp, successful: true);

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, name);
 return name;
Expand DownExpand Up@@ -395,13 +395,13 @@ private static object GetHostEntryOrAddressesCore(string hostName, bool justAddr
 Aliases = aliases
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(hostName, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: true);

 return result;
 }
Expand DownExpand Up@@ -435,13 +435,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 }
 Debug.Assert(name != null);
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(address, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(address, startingTimestamp, successful: true);

 // Do the forward lookup to get the IPs for that host name
 startingTimestamp = NameResolutionTelemetry.Log.BeforeResolution(name);
Expand All@@ -465,13 +465,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 AddressList = addresses
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(name, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(name, startingTimestamp, successful: true);

 // One of three things happened:
 // 1. Success.
Expand DownExpand Up@@ -603,7 +603,7 @@ static async Task<T> CompleteAsync(Task task, string hostName, long startingTime
 }
 finally
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: result is not null);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: result is not null);
 }
 }
 }
Expand All@@ -628,9 +628,9 @@ private static void ValidateHostName(string hostName)
 }
 }

 private static bool LogFailure(long? startingTimestamp)
 private static bool LogFailure(object hostNameOrAddress, long? startingTimestamp)
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: false);
 NameResolutionTelemetry.Log.AfterResolution(hostNameOrAddress, startingTimestamp, successful: false);
 return false;
 }

Expand Down

40 changes: 7 additions & 33 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionMetrics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,42 +12,16 @@ internal static class NameResolutionMetrics
 {
 private static readonly Meter s_meter = new("System.Net.NameResolution");

 private static readonly Counter<long> s_lookupsRequestedCounter = s_meter.CreateCounter<long>(
 name: "dns-lookups-requested",
 description: "Number of DNS lookups requested.");
 private static readonly Histogram<double> s_lookupDuration = s_meter.CreateHistogram<double>(
Comment thread
antonfirsov marked this conversation as resolved.

 name: "dns.lookups.duration",
 unit: "s",
 description: "Measures the time taken to perform a DNS lookup.");

 public static bool IsEnabled() => s_lookupsRequestedCounter.Enabled;
 public static bool IsEnabled() => s_lookupDuration.Enabled;

 public static void BeforeResolution(object hostNameOrAddress, out string? host)
 public static void AfterResolution(TimeSpan duration, string hostName)
 {
 if (s_lookupsRequestedCounter.Enabled)
 {
 host = GetHostnameFromStateObject(hostNameOrAddress);

 s_lookupsRequestedCounter.Add(1, KeyValuePair.Create("hostname", (object?)host));
 }
 else
 {
 host = null;
 }
 }

 public static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 s_lookupDuration.Record(duration.TotalSeconds, KeyValuePair.Create("dns.question.name", (object?)hostName));
 }
 }
}

45 changes: 36 additions & 9 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Tracing;
using System.Net.Sockets;
using System.Threading;

namespace System.Net
Expand DownExpand Up@@ -60,38 +62,40 @@ protected override void OnEventCommand(EventCommandEventArgs command)
 [NonEvent]
 public long BeforeResolution(object hostNameOrAddress)
 {
 // System.Diagnostics.Metrics part
 NameResolutionMetrics.BeforeResolution(hostNameOrAddress, out string? host);

 // System.Diagnostics.Tracing part
 if (IsEnabled())
 {
 Interlocked.Increment(ref _lookupsRequested);
 Interlocked.Increment(ref _currentLookups);

 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
 host ??= NameResolutionMetrics.GetHostnameFromStateObject(hostNameOrAddress);
string host = GetHostnameFromStateObject(hostNameOrAddress);

 ResolutionStart(host);
 }

 return Stopwatch.GetTimestamp();
 }

 return 0;
 return NameResolutionMetrics.IsEnabled() ? Stopwatch.GetTimestamp() : 0;
 }

 [NonEvent]
 public void AfterResolution(long? startingTimestamp, bool successful)
 public void AfterResolution(object hostNameOrAddress, long? startingTimestamp, bool successful)
 {
 Debug.Assert(startingTimestamp.HasValue);
 if (startingTimestamp == 0)
 {
 return;
 }

 TimeSpan duration = Stopwatch.GetElapsedTime(startingTimestamp.Value);

 if (startingTimestamp != 0)
 if (IsEnabled())
 {
 Interlocked.Decrement(ref _currentLookups);

 _lookupsDuration?.WriteMetric(Stopwatch.GetElapsedTime(startingTimestamp.Value).TotalMilliseconds);
 _lookupsDuration?.WriteMetric(duration.TotalMilliseconds);
Comment thread
antonfirsov marked this conversation as resolved.


 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
Expand All@@ -103,6 +107,29 @@ public void AfterResolution(long? startingTimestamp, bool successful)
 ResolutionStop();
 }
 }

 if (NameResolutionMetrics.IsEnabled())
 {
 NameResolutionMetrics.AfterResolution(duration, GetHostnameFromStateObject(hostNameOrAddress));
 }
 }

 private static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 }
 }
}

18 changes: 9 additions & 9 deletions
src/libraries/System.Net.NameResolution/tests/FunctionalTests/MetricsTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ namespace System.Net.NameResolution.Tests
{
 public class MetricsTest
 {
 private const string DnsLookupsRequested = "dns-lookups-requested";
 private const string DnsLookupDuration = "dns.lookups.duration";

 [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
 public static void ResolveValidHostName_MetricsRecorded()
Expand All@@ -23,7 +23,7 @@ public static void ResolveValidHostName_MetricsRecorded()
 {
 const string ValidHostName = "localhost";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Dns.GetHostEntryAsync(ValidHostName);
 await Dns.GetHostAddressesAsync(ValidHostName);
Expand All@@ -34,10 +34,10 @@ public static void ResolveValidHostName_MetricsRecorded()
 Dns.EndGetHostEntry(Dns.BeginGetHostEntry(ValidHostName, null, null));
 Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(ValidHostName, null, null));

long[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }).Dispose();
 }

Expand All@@ -46,7 +46,7 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 {
 const string InvalidHostName = $"invalid...example.com...{nameof(ResolveInvalidHostName_MetricsRecorded)}";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostEntryAsync(InvalidHostName));
 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostAddressesAsync(InvalidHostName));
Expand All@@ -57,17 +57,17 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostEntry(Dns.BeginGetHostEntry(InvalidHostName, null, null)));
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(InvalidHostName, null, null)));

long[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }

 private static long[] GetMeasurementsForHostname(InstrumentRecorder<long> recorder, string hostname)
 private static double[] GetMeasurementsForHostname(InstrumentRecorder<double> recorder, string hostname)
 {
 return recorder
 .GetMeasurements()
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "hostname" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "dns.question.name" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Select(m => m.Value)
 .ToArray();
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adjust DNS metrics#89813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonfirsov
merged 5 commits into

from

Aug 3, 2023
 Merged


Adjust DNS metrics
#89813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d7b7d0d

adjust DNS metrics


antonfirsov Aug 1, 2023
3f93209

set the unit to seconds


antonfirsov Aug 2, 2023
15b2ed1

Update src/libraries/System.Net.NameResolution/src/System/Net/NameRes…


antonfirsov Aug 2, 2023
0e8ff4b

simplify NameResolutionTelemetry.BeforeResolution


antonfirsov Aug 2, 2023
f24f384

Merge branch 'adjust-dns-metrics-01' of https://github.com/antonfirso…


antonfirsov Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 11 additions & 11 deletions
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,13 +24,13 @@ public static string GetHostName()
 {
 name = NameResolutionPal.GetHostName();
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(string.Empty, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(string.Empty, startingTimestamp, successful: true);

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, name);
 return name;
Expand DownExpand Up@@ -395,13 +395,13 @@ private static object GetHostEntryOrAddressesCore(string hostName, bool justAddr
 Aliases = aliases
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(hostName, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: true);

 return result;
 }
Expand DownExpand Up@@ -435,13 +435,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 }
 Debug.Assert(name != null);
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(address, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(address, startingTimestamp, successful: true);

 // Do the forward lookup to get the IPs for that host name
 startingTimestamp = NameResolutionTelemetry.Log.BeforeResolution(name);
Expand All@@ -465,13 +465,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 AddressList = addresses
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(name, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(name, startingTimestamp, successful: true);

 // One of three things happened:
 // 1. Success.
Expand DownExpand Up@@ -603,7 +603,7 @@ static async Task<T> CompleteAsync(Task task, string hostName, long startingTime
 }
 finally
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: result is not null);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: result is not null);
 }
 }
 }
Expand All@@ -628,9 +628,9 @@ private static void ValidateHostName(string hostName)
 }
 }

 private static bool LogFailure(long? startingTimestamp)
 private static bool LogFailure(object hostNameOrAddress, long? startingTimestamp)
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: false);
 NameResolutionTelemetry.Log.AfterResolution(hostNameOrAddress, startingTimestamp, successful: false);
 return false;
 }

Expand Down

40 changes: 7 additions & 33 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionMetrics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,42 +12,16 @@ internal static class NameResolutionMetrics
 {
 private static readonly Meter s_meter = new("System.Net.NameResolution");

 private static readonly Counter<long> s_lookupsRequestedCounter = s_meter.CreateCounter<long>(
 name: "dns-lookups-requested",
 description: "Number of DNS lookups requested.");
 private static readonly Histogram<double> s_lookupDuration = s_meter.CreateHistogram<double>(
Comment thread
antonfirsov marked this conversation as resolved.

 name: "dns.lookups.duration",
 unit: "s",
 description: "Measures the time taken to perform a DNS lookup.");

 public static bool IsEnabled() => s_lookupsRequestedCounter.Enabled;
 public static bool IsEnabled() => s_lookupDuration.Enabled;

 public static void BeforeResolution(object hostNameOrAddress, out string? host)
 public static void AfterResolution(TimeSpan duration, string hostName)
 {
 if (s_lookupsRequestedCounter.Enabled)
 {
 host = GetHostnameFromStateObject(hostNameOrAddress);

 s_lookupsRequestedCounter.Add(1, KeyValuePair.Create("hostname", (object?)host));
 }
 else
 {
 host = null;
 }
 }

 public static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 s_lookupDuration.Record(duration.TotalSeconds, KeyValuePair.Create("dns.question.name", (object?)hostName));
 }
 }
}

45 changes: 36 additions & 9 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Tracing;
using System.Net.Sockets;
using System.Threading;

namespace System.Net
Expand DownExpand Up@@ -60,38 +62,40 @@ protected override void OnEventCommand(EventCommandEventArgs command)
 [NonEvent]
 public long BeforeResolution(object hostNameOrAddress)
 {
 // System.Diagnostics.Metrics part
 NameResolutionMetrics.BeforeResolution(hostNameOrAddress, out string? host);

 // System.Diagnostics.Tracing part
 if (IsEnabled())
 {
 Interlocked.Increment(ref _lookupsRequested);
 Interlocked.Increment(ref _currentLookups);

 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
 host ??= NameResolutionMetrics.GetHostnameFromStateObject(hostNameOrAddress);
string host = GetHostnameFromStateObject(hostNameOrAddress);

 ResolutionStart(host);
 }

 return Stopwatch.GetTimestamp();
 }

 return 0;
 return NameResolutionMetrics.IsEnabled() ? Stopwatch.GetTimestamp() : 0;
 }

 [NonEvent]
 public void AfterResolution(long? startingTimestamp, bool successful)
 public void AfterResolution(object hostNameOrAddress, long? startingTimestamp, bool successful)
 {
 Debug.Assert(startingTimestamp.HasValue);
 if (startingTimestamp == 0)
 {
 return;
 }

 TimeSpan duration = Stopwatch.GetElapsedTime(startingTimestamp.Value);

 if (startingTimestamp != 0)
 if (IsEnabled())
 {
 Interlocked.Decrement(ref _currentLookups);

 _lookupsDuration?.WriteMetric(Stopwatch.GetElapsedTime(startingTimestamp.Value).TotalMilliseconds);
 _lookupsDuration?.WriteMetric(duration.TotalMilliseconds);
Comment thread
antonfirsov marked this conversation as resolved.


 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
Expand All@@ -103,6 +107,29 @@ public void AfterResolution(long? startingTimestamp, bool successful)
 ResolutionStop();
 }
 }

 if (NameResolutionMetrics.IsEnabled())
 {
 NameResolutionMetrics.AfterResolution(duration, GetHostnameFromStateObject(hostNameOrAddress));
 }
 }

 private static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 }
 }
}

18 changes: 9 additions & 9 deletions
src/libraries/System.Net.NameResolution/tests/FunctionalTests/MetricsTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ namespace System.Net.NameResolution.Tests
{
 public class MetricsTest
 {
 private const string DnsLookupsRequested = "dns-lookups-requested";
 private const string DnsLookupDuration = "dns.lookups.duration";

 [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
 public static void ResolveValidHostName_MetricsRecorded()
Expand All@@ -23,7 +23,7 @@ public static void ResolveValidHostName_MetricsRecorded()
 {
 const string ValidHostName = "localhost";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Dns.GetHostEntryAsync(ValidHostName);
 await Dns.GetHostAddressesAsync(ValidHostName);
Expand All@@ -34,10 +34,10 @@ public static void ResolveValidHostName_MetricsRecorded()
 Dns.EndGetHostEntry(Dns.BeginGetHostEntry(ValidHostName, null, null));
 Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(ValidHostName, null, null));

long[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }).Dispose();
 }

Expand All@@ -46,7 +46,7 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 {
 const string InvalidHostName = $"invalid...example.com...{nameof(ResolveInvalidHostName_MetricsRecorded)}";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostEntryAsync(InvalidHostName));
 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostAddressesAsync(InvalidHostName));
Expand All@@ -57,17 +57,17 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostEntry(Dns.BeginGetHostEntry(InvalidHostName, null, null)));
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(InvalidHostName, null, null)));

long[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }

 private static long[] GetMeasurementsForHostname(InstrumentRecorder<long> recorder, string hostname)
 private static double[] GetMeasurementsForHostname(InstrumentRecorder<double> recorder, string hostname)
 {
 return recorder
 .GetMeasurements()
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "hostname" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "dns.question.name" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Select(m => m.Value)
 .ToArray();
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Adjust DNS metrics#89813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonfirsov
merged 5 commits into

from

Aug 3, 2023
 Merged


Adjust DNS metrics
#89813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d7b7d0d

adjust DNS metrics


antonfirsov Aug 1, 2023
3f93209

set the unit to seconds


antonfirsov Aug 2, 2023
15b2ed1

Update src/libraries/System.Net.NameResolution/src/System/Net/NameRes…


antonfirsov Aug 2, 2023
0e8ff4b

simplify NameResolutionTelemetry.BeforeResolution


antonfirsov Aug 2, 2023
f24f384

Merge branch 'adjust-dns-metrics-01' of https://github.com/antonfirso…


antonfirsov Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 11 additions & 11 deletions
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,13 +24,13 @@ public static string GetHostName()
 {
 name = NameResolutionPal.GetHostName();
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(string.Empty, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(string.Empty, startingTimestamp, successful: true);

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, name);
 return name;
Expand DownExpand Up@@ -395,13 +395,13 @@ private static object GetHostEntryOrAddressesCore(string hostName, bool justAddr
 Aliases = aliases
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(hostName, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: true);

 return result;
 }
Expand DownExpand Up@@ -435,13 +435,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 }
 Debug.Assert(name != null);
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(address, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(address, startingTimestamp, successful: true);

 // Do the forward lookup to get the IPs for that host name
 startingTimestamp = NameResolutionTelemetry.Log.BeforeResolution(name);
Expand All@@ -465,13 +465,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 AddressList = addresses
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(name, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(name, startingTimestamp, successful: true);

 // One of three things happened:
 // 1. Success.
Expand DownExpand Up@@ -603,7 +603,7 @@ static async Task<T> CompleteAsync(Task task, string hostName, long startingTime
 }
 finally
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: result is not null);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: result is not null);
 }
 }
 }
Expand All@@ -628,9 +628,9 @@ private static void ValidateHostName(string hostName)
 }
 }

 private static bool LogFailure(long? startingTimestamp)
 private static bool LogFailure(object hostNameOrAddress, long? startingTimestamp)
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: false);
 NameResolutionTelemetry.Log.AfterResolution(hostNameOrAddress, startingTimestamp, successful: false);
 return false;
 }

Expand Down

40 changes: 7 additions & 33 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionMetrics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,42 +12,16 @@ internal static class NameResolutionMetrics
 {
 private static readonly Meter s_meter = new("System.Net.NameResolution");

 private static readonly Counter<long> s_lookupsRequestedCounter = s_meter.CreateCounter<long>(
 name: "dns-lookups-requested",
 description: "Number of DNS lookups requested.");
 private static readonly Histogram<double> s_lookupDuration = s_meter.CreateHistogram<double>(
Comment thread
antonfirsov marked this conversation as resolved.

 name: "dns.lookups.duration",
 unit: "s",
 description: "Measures the time taken to perform a DNS lookup.");

 public static bool IsEnabled() => s_lookupsRequestedCounter.Enabled;
 public static bool IsEnabled() => s_lookupDuration.Enabled;

 public static void BeforeResolution(object hostNameOrAddress, out string? host)
 public static void AfterResolution(TimeSpan duration, string hostName)
 {
 if (s_lookupsRequestedCounter.Enabled)
 {
 host = GetHostnameFromStateObject(hostNameOrAddress);

 s_lookupsRequestedCounter.Add(1, KeyValuePair.Create("hostname", (object?)host));
 }
 else
 {
 host = null;
 }
 }

 public static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 s_lookupDuration.Record(duration.TotalSeconds, KeyValuePair.Create("dns.question.name", (object?)hostName));
 }
 }
}

45 changes: 36 additions & 9 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Tracing;
using System.Net.Sockets;
using System.Threading;

namespace System.Net
Expand DownExpand Up@@ -60,38 +62,40 @@ protected override void OnEventCommand(EventCommandEventArgs command)
 [NonEvent]
 public long BeforeResolution(object hostNameOrAddress)
 {
 // System.Diagnostics.Metrics part
 NameResolutionMetrics.BeforeResolution(hostNameOrAddress, out string? host);

 // System.Diagnostics.Tracing part
 if (IsEnabled())
 {
 Interlocked.Increment(ref _lookupsRequested);
 Interlocked.Increment(ref _currentLookups);

 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
 host ??= NameResolutionMetrics.GetHostnameFromStateObject(hostNameOrAddress);
string host = GetHostnameFromStateObject(hostNameOrAddress);

 ResolutionStart(host);
 }

 return Stopwatch.GetTimestamp();
 }

 return 0;
 return NameResolutionMetrics.IsEnabled() ? Stopwatch.GetTimestamp() : 0;
 }

 [NonEvent]
 public void AfterResolution(long? startingTimestamp, bool successful)
 public void AfterResolution(object hostNameOrAddress, long? startingTimestamp, bool successful)
 {
 Debug.Assert(startingTimestamp.HasValue);
 if (startingTimestamp == 0)
 {
 return;
 }

 TimeSpan duration = Stopwatch.GetElapsedTime(startingTimestamp.Value);

 if (startingTimestamp != 0)
 if (IsEnabled())
 {
 Interlocked.Decrement(ref _currentLookups);

 _lookupsDuration?.WriteMetric(Stopwatch.GetElapsedTime(startingTimestamp.Value).TotalMilliseconds);
 _lookupsDuration?.WriteMetric(duration.TotalMilliseconds);
Comment thread
antonfirsov marked this conversation as resolved.


 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
Expand All@@ -103,6 +107,29 @@ public void AfterResolution(long? startingTimestamp, bool successful)
 ResolutionStop();
 }
 }

 if (NameResolutionMetrics.IsEnabled())
 {
 NameResolutionMetrics.AfterResolution(duration, GetHostnameFromStateObject(hostNameOrAddress));
 }
 }

 private static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 }
 }
}

18 changes: 9 additions & 9 deletions
src/libraries/System.Net.NameResolution/tests/FunctionalTests/MetricsTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ namespace System.Net.NameResolution.Tests
{
 public class MetricsTest
 {
 private const string DnsLookupsRequested = "dns-lookups-requested";
 private const string DnsLookupDuration = "dns.lookups.duration";

 [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
 public static void ResolveValidHostName_MetricsRecorded()
Expand All@@ -23,7 +23,7 @@ public static void ResolveValidHostName_MetricsRecorded()
 {
 const string ValidHostName = "localhost";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Dns.GetHostEntryAsync(ValidHostName);
 await Dns.GetHostAddressesAsync(ValidHostName);
Expand All@@ -34,10 +34,10 @@ public static void ResolveValidHostName_MetricsRecorded()
 Dns.EndGetHostEntry(Dns.BeginGetHostEntry(ValidHostName, null, null));
 Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(ValidHostName, null, null));

long[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }).Dispose();
 }

Expand All@@ -46,7 +46,7 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 {
 const string InvalidHostName = $"invalid...example.com...{nameof(ResolveInvalidHostName_MetricsRecorded)}";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostEntryAsync(InvalidHostName));
 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostAddressesAsync(InvalidHostName));
Expand All@@ -57,17 +57,17 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostEntry(Dns.BeginGetHostEntry(InvalidHostName, null, null)));
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(InvalidHostName, null, null)));

long[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }

 private static long[] GetMeasurementsForHostname(InstrumentRecorder<long> recorder, string hostname)
 private static double[] GetMeasurementsForHostname(InstrumentRecorder<double> recorder, string hostname)
 {
 return recorder
 .GetMeasurements()
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "hostname" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "dns.question.name" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Select(m => m.Value)
 .ToArray();
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adjust DNS metrics#89813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonfirsov
merged 5 commits into

from

Aug 3, 2023
 Merged


Adjust DNS metrics
#89813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d7b7d0d

adjust DNS metrics


antonfirsov Aug 1, 2023
3f93209

set the unit to seconds


antonfirsov Aug 2, 2023
15b2ed1

Update src/libraries/System.Net.NameResolution/src/System/Net/NameRes…


antonfirsov Aug 2, 2023
0e8ff4b

simplify NameResolutionTelemetry.BeforeResolution


antonfirsov Aug 2, 2023
f24f384

Merge branch 'adjust-dns-metrics-01' of https://github.com/antonfirso…


antonfirsov Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 11 additions & 11 deletions
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,13 +24,13 @@ public static string GetHostName()
 {
 name = NameResolutionPal.GetHostName();
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(string.Empty, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(string.Empty, startingTimestamp, successful: true);

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, name);
 return name;
Expand DownExpand Up@@ -395,13 +395,13 @@ private static object GetHostEntryOrAddressesCore(string hostName, bool justAddr
 Aliases = aliases
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(hostName, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: true);

 return result;
 }
Expand DownExpand Up@@ -435,13 +435,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 }
 Debug.Assert(name != null);
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(address, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(address, startingTimestamp, successful: true);

 // Do the forward lookup to get the IPs for that host name
 startingTimestamp = NameResolutionTelemetry.Log.BeforeResolution(name);
Expand All@@ -465,13 +465,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 AddressList = addresses
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(name, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(name, startingTimestamp, successful: true);

 // One of three things happened:
 // 1. Success.
Expand DownExpand Up@@ -603,7 +603,7 @@ static async Task<T> CompleteAsync(Task task, string hostName, long startingTime
 }
 finally
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: result is not null);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: result is not null);
 }
 }
 }
Expand All@@ -628,9 +628,9 @@ private static void ValidateHostName(string hostName)
 }
 }

 private static bool LogFailure(long? startingTimestamp)
 private static bool LogFailure(object hostNameOrAddress, long? startingTimestamp)
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: false);
 NameResolutionTelemetry.Log.AfterResolution(hostNameOrAddress, startingTimestamp, successful: false);
 return false;
 }

Expand Down

40 changes: 7 additions & 33 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionMetrics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,42 +12,16 @@ internal static class NameResolutionMetrics
 {
 private static readonly Meter s_meter = new("System.Net.NameResolution");

 private static readonly Counter<long> s_lookupsRequestedCounter = s_meter.CreateCounter<long>(
 name: "dns-lookups-requested",
 description: "Number of DNS lookups requested.");
 private static readonly Histogram<double> s_lookupDuration = s_meter.CreateHistogram<double>(
Comment thread
antonfirsov marked this conversation as resolved.

 name: "dns.lookups.duration",
 unit: "s",
 description: "Measures the time taken to perform a DNS lookup.");

 public static bool IsEnabled() => s_lookupsRequestedCounter.Enabled;
 public static bool IsEnabled() => s_lookupDuration.Enabled;

 public static void BeforeResolution(object hostNameOrAddress, out string? host)
 public static void AfterResolution(TimeSpan duration, string hostName)
 {
 if (s_lookupsRequestedCounter.Enabled)
 {
 host = GetHostnameFromStateObject(hostNameOrAddress);

 s_lookupsRequestedCounter.Add(1, KeyValuePair.Create("hostname", (object?)host));
 }
 else
 {
 host = null;
 }
 }

 public static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 s_lookupDuration.Record(duration.TotalSeconds, KeyValuePair.Create("dns.question.name", (object?)hostName));
 }
 }
}

45 changes: 36 additions & 9 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Tracing;
using System.Net.Sockets;
using System.Threading;

namespace System.Net
Expand DownExpand Up@@ -60,38 +62,40 @@ protected override void OnEventCommand(EventCommandEventArgs command)
 [NonEvent]
 public long BeforeResolution(object hostNameOrAddress)
 {
 // System.Diagnostics.Metrics part
 NameResolutionMetrics.BeforeResolution(hostNameOrAddress, out string? host);

 // System.Diagnostics.Tracing part
 if (IsEnabled())
 {
 Interlocked.Increment(ref _lookupsRequested);
 Interlocked.Increment(ref _currentLookups);

 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
 host ??= NameResolutionMetrics.GetHostnameFromStateObject(hostNameOrAddress);
string host = GetHostnameFromStateObject(hostNameOrAddress);

 ResolutionStart(host);
 }

 return Stopwatch.GetTimestamp();
 }

 return 0;
 return NameResolutionMetrics.IsEnabled() ? Stopwatch.GetTimestamp() : 0;
 }

 [NonEvent]
 public void AfterResolution(long? startingTimestamp, bool successful)
 public void AfterResolution(object hostNameOrAddress, long? startingTimestamp, bool successful)
 {
 Debug.Assert(startingTimestamp.HasValue);
 if (startingTimestamp == 0)
 {
 return;
 }

 TimeSpan duration = Stopwatch.GetElapsedTime(startingTimestamp.Value);

 if (startingTimestamp != 0)
 if (IsEnabled())
 {
 Interlocked.Decrement(ref _currentLookups);

 _lookupsDuration?.WriteMetric(Stopwatch.GetElapsedTime(startingTimestamp.Value).TotalMilliseconds);
 _lookupsDuration?.WriteMetric(duration.TotalMilliseconds);
Comment thread
antonfirsov marked this conversation as resolved.


 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
Expand All@@ -103,6 +107,29 @@ public void AfterResolution(long? startingTimestamp, bool successful)
 ResolutionStop();
 }
 }

 if (NameResolutionMetrics.IsEnabled())
 {
 NameResolutionMetrics.AfterResolution(duration, GetHostnameFromStateObject(hostNameOrAddress));
 }
 }

 private static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 }
 }
}

18 changes: 9 additions & 9 deletions
src/libraries/System.Net.NameResolution/tests/FunctionalTests/MetricsTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ namespace System.Net.NameResolution.Tests
{
 public class MetricsTest
 {
 private const string DnsLookupsRequested = "dns-lookups-requested";
 private const string DnsLookupDuration = "dns.lookups.duration";

 [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
 public static void ResolveValidHostName_MetricsRecorded()
Expand All@@ -23,7 +23,7 @@ public static void ResolveValidHostName_MetricsRecorded()
 {
 const string ValidHostName = "localhost";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Dns.GetHostEntryAsync(ValidHostName);
 await Dns.GetHostAddressesAsync(ValidHostName);
Expand All@@ -34,10 +34,10 @@ public static void ResolveValidHostName_MetricsRecorded()
 Dns.EndGetHostEntry(Dns.BeginGetHostEntry(ValidHostName, null, null));
 Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(ValidHostName, null, null));

long[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }).Dispose();
 }

Expand All@@ -46,7 +46,7 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 {
 const string InvalidHostName = $"invalid...example.com...{nameof(ResolveInvalidHostName_MetricsRecorded)}";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostEntryAsync(InvalidHostName));
 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostAddressesAsync(InvalidHostName));
Expand All@@ -57,17 +57,17 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostEntry(Dns.BeginGetHostEntry(InvalidHostName, null, null)));
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(InvalidHostName, null, null)));

long[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }

 private static long[] GetMeasurementsForHostname(InstrumentRecorder<long> recorder, string hostname)
 private static double[] GetMeasurementsForHostname(InstrumentRecorder<double> recorder, string hostname)
 {
 return recorder
 .GetMeasurements()
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "hostname" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "dns.question.name" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Select(m => m.Value)
 .ToArray();
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Adjust DNS metrics#89813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonfirsov
merged 5 commits into

from

Aug 3, 2023
 Merged


Adjust DNS metrics
#89813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d7b7d0d

adjust DNS metrics


antonfirsov Aug 1, 2023
3f93209

set the unit to seconds


antonfirsov Aug 2, 2023
15b2ed1

Update src/libraries/System.Net.NameResolution/src/System/Net/NameRes…


antonfirsov Aug 2, 2023
0e8ff4b

simplify NameResolutionTelemetry.BeforeResolution


antonfirsov Aug 2, 2023
f24f384

Merge branch 'adjust-dns-metrics-01' of https://github.com/antonfirso…


antonfirsov Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 11 additions & 11 deletions
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,13 +24,13 @@ public static string GetHostName()
 {
 name = NameResolutionPal.GetHostName();
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(string.Empty, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(string.Empty, startingTimestamp, successful: true);

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, name);
 return name;
Expand DownExpand Up@@ -395,13 +395,13 @@ private static object GetHostEntryOrAddressesCore(string hostName, bool justAddr
 Aliases = aliases
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(hostName, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: true);

 return result;
 }
Expand DownExpand Up@@ -435,13 +435,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 }
 Debug.Assert(name != null);
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(address, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(address, startingTimestamp, successful: true);

 // Do the forward lookup to get the IPs for that host name
 startingTimestamp = NameResolutionTelemetry.Log.BeforeResolution(name);
Expand All@@ -465,13 +465,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 AddressList = addresses
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(name, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(name, startingTimestamp, successful: true);

 // One of three things happened:
 // 1. Success.
Expand DownExpand Up@@ -603,7 +603,7 @@ static async Task<T> CompleteAsync(Task task, string hostName, long startingTime
 }
 finally
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: result is not null);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: result is not null);
 }
 }
 }
Expand All@@ -628,9 +628,9 @@ private static void ValidateHostName(string hostName)
 }
 }

 private static bool LogFailure(long? startingTimestamp)
 private static bool LogFailure(object hostNameOrAddress, long? startingTimestamp)
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: false);
 NameResolutionTelemetry.Log.AfterResolution(hostNameOrAddress, startingTimestamp, successful: false);
 return false;
 }

Expand Down

40 changes: 7 additions & 33 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionMetrics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,42 +12,16 @@ internal static class NameResolutionMetrics
 {
 private static readonly Meter s_meter = new("System.Net.NameResolution");

 private static readonly Counter<long> s_lookupsRequestedCounter = s_meter.CreateCounter<long>(
 name: "dns-lookups-requested",
 description: "Number of DNS lookups requested.");
 private static readonly Histogram<double> s_lookupDuration = s_meter.CreateHistogram<double>(
Comment thread
antonfirsov marked this conversation as resolved.

 name: "dns.lookups.duration",
 unit: "s",
 description: "Measures the time taken to perform a DNS lookup.");

 public static bool IsEnabled() => s_lookupsRequestedCounter.Enabled;
 public static bool IsEnabled() => s_lookupDuration.Enabled;

 public static void BeforeResolution(object hostNameOrAddress, out string? host)
 public static void AfterResolution(TimeSpan duration, string hostName)
 {
 if (s_lookupsRequestedCounter.Enabled)
 {
 host = GetHostnameFromStateObject(hostNameOrAddress);

 s_lookupsRequestedCounter.Add(1, KeyValuePair.Create("hostname", (object?)host));
 }
 else
 {
 host = null;
 }
 }

 public static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 s_lookupDuration.Record(duration.TotalSeconds, KeyValuePair.Create("dns.question.name", (object?)hostName));
 }
 }
}

45 changes: 36 additions & 9 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Tracing;
using System.Net.Sockets;
using System.Threading;

namespace System.Net
Expand DownExpand Up@@ -60,38 +62,40 @@ protected override void OnEventCommand(EventCommandEventArgs command)
 [NonEvent]
 public long BeforeResolution(object hostNameOrAddress)
 {
 // System.Diagnostics.Metrics part
 NameResolutionMetrics.BeforeResolution(hostNameOrAddress, out string? host);

 // System.Diagnostics.Tracing part
 if (IsEnabled())
 {
 Interlocked.Increment(ref _lookupsRequested);
 Interlocked.Increment(ref _currentLookups);

 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
 host ??= NameResolutionMetrics.GetHostnameFromStateObject(hostNameOrAddress);
string host = GetHostnameFromStateObject(hostNameOrAddress);

 ResolutionStart(host);
 }

 return Stopwatch.GetTimestamp();
 }

 return 0;
 return NameResolutionMetrics.IsEnabled() ? Stopwatch.GetTimestamp() : 0;
 }

 [NonEvent]
 public void AfterResolution(long? startingTimestamp, bool successful)
 public void AfterResolution(object hostNameOrAddress, long? startingTimestamp, bool successful)
 {
 Debug.Assert(startingTimestamp.HasValue);
 if (startingTimestamp == 0)
 {
 return;
 }

 TimeSpan duration = Stopwatch.GetElapsedTime(startingTimestamp.Value);

 if (startingTimestamp != 0)
 if (IsEnabled())
 {
 Interlocked.Decrement(ref _currentLookups);

 _lookupsDuration?.WriteMetric(Stopwatch.GetElapsedTime(startingTimestamp.Value).TotalMilliseconds);
 _lookupsDuration?.WriteMetric(duration.TotalMilliseconds);
Comment thread
antonfirsov marked this conversation as resolved.


 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
Expand All@@ -103,6 +107,29 @@ public void AfterResolution(long? startingTimestamp, bool successful)
 ResolutionStop();
 }
 }

 if (NameResolutionMetrics.IsEnabled())
 {
 NameResolutionMetrics.AfterResolution(duration, GetHostnameFromStateObject(hostNameOrAddress));
 }
 }

 private static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 }
 }
}

18 changes: 9 additions & 9 deletions
src/libraries/System.Net.NameResolution/tests/FunctionalTests/MetricsTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ namespace System.Net.NameResolution.Tests
{
 public class MetricsTest
 {
 private const string DnsLookupsRequested = "dns-lookups-requested";
 private const string DnsLookupDuration = "dns.lookups.duration";

 [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
 public static void ResolveValidHostName_MetricsRecorded()
Expand All@@ -23,7 +23,7 @@ public static void ResolveValidHostName_MetricsRecorded()
 {
 const string ValidHostName = "localhost";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Dns.GetHostEntryAsync(ValidHostName);
 await Dns.GetHostAddressesAsync(ValidHostName);
Expand All@@ -34,10 +34,10 @@ public static void ResolveValidHostName_MetricsRecorded()
 Dns.EndGetHostEntry(Dns.BeginGetHostEntry(ValidHostName, null, null));
 Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(ValidHostName, null, null));

long[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }).Dispose();
 }

Expand All@@ -46,7 +46,7 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 {
 const string InvalidHostName = $"invalid...example.com...{nameof(ResolveInvalidHostName_MetricsRecorded)}";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostEntryAsync(InvalidHostName));
 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostAddressesAsync(InvalidHostName));
Expand All@@ -57,17 +57,17 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostEntry(Dns.BeginGetHostEntry(InvalidHostName, null, null)));
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(InvalidHostName, null, null)));

long[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }

 private static long[] GetMeasurementsForHostname(InstrumentRecorder<long> recorder, string hostname)
 private static double[] GetMeasurementsForHostname(InstrumentRecorder<double> recorder, string hostname)
 {
 return recorder
 .GetMeasurements()
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "hostname" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "dns.question.name" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Select(m => m.Value)
 .ToArray();
 }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Adjust DNS metrics#89813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonfirsov
merged 5 commits into

from

Aug 3, 2023
 Merged


Adjust DNS metrics
#89813
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
d7b7d0d

adjust DNS metrics


antonfirsov Aug 1, 2023
3f93209

set the unit to seconds


antonfirsov Aug 2, 2023
15b2ed1

Update src/libraries/System.Net.NameResolution/src/System/Net/NameRes…


antonfirsov Aug 2, 2023
0e8ff4b

simplify NameResolutionTelemetry.BeforeResolution


antonfirsov Aug 2, 2023
f24f384

Merge branch 'adjust-dns-metrics-01' of https://github.com/antonfirso…


antonfirsov Aug 2, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 11 additions & 11 deletions
src/libraries/System.Net.NameResolution/src/System/Net/Dns.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,13 +24,13 @@ public static string GetHostName()
 {
 name = NameResolutionPal.GetHostName();
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(string.Empty, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(string.Empty, startingTimestamp, successful: true);

 if (NetEventSource.Log.IsEnabled()) NetEventSource.Info(null, name);
 return name;
Expand DownExpand Up@@ -395,13 +395,13 @@ private static object GetHostEntryOrAddressesCore(string hostName, bool justAddr
 Aliases = aliases
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(hostName, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: true);

 return result;
 }
Expand DownExpand Up@@ -435,13 +435,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 }
 Debug.Assert(name != null);
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(address, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(address, startingTimestamp, successful: true);

 // Do the forward lookup to get the IPs for that host name
 startingTimestamp = NameResolutionTelemetry.Log.BeforeResolution(name);
Expand All@@ -465,13 +465,13 @@ private static object GetHostEntryOrAddressesCore(IPAddress address, bool justAd
 AddressList = addresses
 };
 }
 catch when (LogFailure(startingTimestamp))
 catch when (LogFailure(name, startingTimestamp))
 {
 Debug.Fail("LogFailure should return false");
 throw;
 }

 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: true);
 NameResolutionTelemetry.Log.AfterResolution(name, startingTimestamp, successful: true);

 // One of three things happened:
 // 1. Success.
Expand DownExpand Up@@ -603,7 +603,7 @@ static async Task<T> CompleteAsync(Task task, string hostName, long startingTime
 }
 finally
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: result is not null);
 NameResolutionTelemetry.Log.AfterResolution(hostName, startingTimestamp, successful: result is not null);
 }
 }
 }
Expand All@@ -628,9 +628,9 @@ private static void ValidateHostName(string hostName)
 }
 }

 private static bool LogFailure(long? startingTimestamp)
 private static bool LogFailure(object hostNameOrAddress, long? startingTimestamp)
 {
 NameResolutionTelemetry.Log.AfterResolution(startingTimestamp, successful: false);
 NameResolutionTelemetry.Log.AfterResolution(hostNameOrAddress, startingTimestamp, successful: false);
 return false;
 }

Expand Down

40 changes: 7 additions & 33 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionMetrics.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,42 +12,16 @@ internal static class NameResolutionMetrics
 {
 private static readonly Meter s_meter = new("System.Net.NameResolution");

 private static readonly Counter<long> s_lookupsRequestedCounter = s_meter.CreateCounter<long>(
 name: "dns-lookups-requested",
 description: "Number of DNS lookups requested.");
 private static readonly Histogram<double> s_lookupDuration = s_meter.CreateHistogram<double>(
Comment thread
antonfirsov marked this conversation as resolved.

 name: "dns.lookups.duration",
 unit: "s",
 description: "Measures the time taken to perform a DNS lookup.");

 public static bool IsEnabled() => s_lookupsRequestedCounter.Enabled;
 public static bool IsEnabled() => s_lookupDuration.Enabled;

 public static void BeforeResolution(object hostNameOrAddress, out string? host)
 public static void AfterResolution(TimeSpan duration, string hostName)
 {
 if (s_lookupsRequestedCounter.Enabled)
 {
 host = GetHostnameFromStateObject(hostNameOrAddress);

 s_lookupsRequestedCounter.Add(1, KeyValuePair.Create("hostname", (object?)host));
 }
 else
 {
 host = null;
 }
 }

 public static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 s_lookupDuration.Record(duration.TotalSeconds, KeyValuePair.Create("dns.question.name", (object?)hostName));
 }
 }
}

45 changes: 36 additions & 9 deletions
src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionTelemetry.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.Tracing;
using System.Net.Sockets;
using System.Threading;

namespace System.Net
Expand DownExpand Up@@ -60,38 +62,40 @@ protected override void OnEventCommand(EventCommandEventArgs command)
 [NonEvent]
 public long BeforeResolution(object hostNameOrAddress)
 {
 // System.Diagnostics.Metrics part
 NameResolutionMetrics.BeforeResolution(hostNameOrAddress, out string? host);

 // System.Diagnostics.Tracing part
 if (IsEnabled())
 {
 Interlocked.Increment(ref _lookupsRequested);
 Interlocked.Increment(ref _currentLookups);

 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
 host ??= NameResolutionMetrics.GetHostnameFromStateObject(hostNameOrAddress);
string host = GetHostnameFromStateObject(hostNameOrAddress);

 ResolutionStart(host);
 }

 return Stopwatch.GetTimestamp();
 }

 return 0;
 return NameResolutionMetrics.IsEnabled() ? Stopwatch.GetTimestamp() : 0;
 }

 [NonEvent]
 public void AfterResolution(long? startingTimestamp, bool successful)
 public void AfterResolution(object hostNameOrAddress, long? startingTimestamp, bool successful)
 {
 Debug.Assert(startingTimestamp.HasValue);
 if (startingTimestamp == 0)
 {
 return;
 }

 TimeSpan duration = Stopwatch.GetElapsedTime(startingTimestamp.Value);

 if (startingTimestamp != 0)
 if (IsEnabled())
 {
 Interlocked.Decrement(ref _currentLookups);

 _lookupsDuration?.WriteMetric(Stopwatch.GetElapsedTime(startingTimestamp.Value).TotalMilliseconds);
 _lookupsDuration?.WriteMetric(duration.TotalMilliseconds);
Comment thread
antonfirsov marked this conversation as resolved.


 if (IsEnabled(EventLevel.Informational, EventKeywords.None))
 {
Expand All@@ -103,6 +107,29 @@ public void AfterResolution(long? startingTimestamp, bool successful)
 ResolutionStop();
 }
 }

 if (NameResolutionMetrics.IsEnabled())
 {
 NameResolutionMetrics.AfterResolution(duration, GetHostnameFromStateObject(hostNameOrAddress));
 }
 }

 private static string GetHostnameFromStateObject(object hostNameOrAddress)
 {
 Debug.Assert(hostNameOrAddress is not null);

 string host = hostNameOrAddress switch
 {
 string h => h,
 KeyValuePair<string, AddressFamily> t => t.Key,
 IPAddress a => a.ToString(),
 KeyValuePair<IPAddress, AddressFamily> t => t.Key.ToString(),
 _ => null!
 };

 Debug.Assert(host is not null, $"Unknown hostNameOrAddress type: {hostNameOrAddress.GetType().Name}");

 return host;
 }
 }
}

18 changes: 9 additions & 9 deletions
src/libraries/System.Net.NameResolution/tests/FunctionalTests/MetricsTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ namespace System.Net.NameResolution.Tests
{
 public class MetricsTest
 {
 private const string DnsLookupsRequested = "dns-lookups-requested";
 private const string DnsLookupDuration = "dns.lookups.duration";

 [ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
 public static void ResolveValidHostName_MetricsRecorded()
Expand All@@ -23,7 +23,7 @@ public static void ResolveValidHostName_MetricsRecorded()
 {
 const string ValidHostName = "localhost";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Dns.GetHostEntryAsync(ValidHostName);
 await Dns.GetHostAddressesAsync(ValidHostName);
Expand All@@ -34,10 +34,10 @@ public static void ResolveValidHostName_MetricsRecorded()
 Dns.EndGetHostEntry(Dns.BeginGetHostEntry(ValidHostName, null, null));
 Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(ValidHostName, null, null));

long[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, ValidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }).Dispose();
 }

Expand All@@ -46,7 +46,7 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 {
 const string InvalidHostName = $"invalid...example.com...{nameof(ResolveInvalidHostName_MetricsRecorded)}";

 using var recorder = new InstrumentRecorder<long>(DnsLookupsRequested);
 using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);

 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostEntryAsync(InvalidHostName));
 await Assert.ThrowsAnyAsync<SocketException>(async () => await Dns.GetHostAddressesAsync(InvalidHostName));
Expand All@@ -57,17 +57,17 @@ public static async Task ResolveInvalidHostName_MetricsRecorded()
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostEntry(Dns.BeginGetHostEntry(InvalidHostName, null, null)));
 Assert.ThrowsAny<SocketException>(() => Dns.EndGetHostAddresses(Dns.BeginGetHostAddresses(InvalidHostName, null, null)));

long[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);
double[] measurements = GetMeasurementsForHostname(recorder, InvalidHostName);

 Assert.Equal(6, measurements.Length);
 Assert.All(measurements, m => Assert.Equal(1, m));
 Assert.All(measurements, m => Assert.True(m > double.Epsilon));
 }

 private static long[] GetMeasurementsForHostname(InstrumentRecorder<long> recorder, string hostname)
 private static double[] GetMeasurementsForHostname(InstrumentRecorder<double> recorder, string hostname)
 {
 return recorder
 .GetMeasurements()
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "hostname" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Where(m => m.Tags.ToArray().Any(t => t.Key == "dns.question.name" && t.Value is string hostnameTag && hostnameTag == hostname))
 .Select(m => m.Value)
 .ToArray();
 }
Expand Down