Revert "Add bucket bound hints to Networking histograms (dotnet#104629)"

This reverts commit 5f9fff0.

src/libraries/System.Net.Http/src/System/Net/Http/DiagnosticsHelper.cs

@@ -3,21 +3,12 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.Metrics;
 using System.Threading;
 
 namespace System.Net.Http
 {
     internal static class DiagnosticsHelper
     {
-        // OTel bucket boundary recommendation for 'http.request.duration':
-        // https://github.com/open-telemetry/semantic-conventions/blob/release/v1.23.x/docs/http/http-metrics.md#metric-httpclientrequestduration
-        // We are using the same boundaries for durations which are not expected to be longer than an HTTP request.
-        public static InstrumentAdvice<double> ShortHistogramAdvice { get; } = new()
-        {
-            HistogramBucketBoundaries = [0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10]
-        };
-
         internal static string GetRedactedUriString(Uri uri)
         {
             Debug.Assert(uri.IsAbsoluteUri);

src/libraries/System.Net.Http/src/System/Net/Http/Metrics/MetricsHandler.cs

@@ -29,8 +29,7 @@ public MetricsHandler(HttpMessageHandler innerHandler, IMeterFactory? meterFacto
             _requestsDuration = meter.CreateHistogram<double>(
                 "http.client.request.duration",
                 unit: "s",
-                description: "Duration of HTTP client requests.",
-                advice: DiagnosticsHelper.ShortHistogramAdvice);
+                description: "Duration of HTTP client requests.");
         }
 
         internal override ValueTask<HttpResponseMessage> SendAsync(HttpRequestMessage request, bool async, CancellationToken cancellationToken)

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Metrics/SocketsHttpHandlerMetrics.cs

@@ -16,18 +16,12 @@ internal sealed class SocketsHttpHandlerMetrics(Meter meter)
         public readonly Histogram<double> ConnectionDuration = meter.CreateHistogram<double>(
             name: "http.client.connection.duration",
             unit: "s",
-            description: "The duration of successfully established outbound HTTP connections.",
-            advice: new InstrumentAdvice<double>()
-            {
-                // These values are not based on a standard and may change in the future.
-                HistogramBucketBoundaries = [0.01, 0.02, 0.05, 0.1, 0.2, 0.5, 1, 2, 5, 10, 30, 60, 120, 300]
-            });
+            description: "The duration of successfully established outbound HTTP connections.");
 
         public readonly Histogram<double> RequestsQueueDuration = meter.CreateHistogram<double>(
             name: "http.client.request.time_in_queue",
             unit: "s",
-            description: "The amount of time requests spent on a queue waiting for an available connection.",
-            advice: DiagnosticsHelper.ShortHistogramAdvice);
+            description: "The amount of time requests spent on a queue waiting for an available connection.");
 
         public void RequestLeftQueue(HttpRequestMessage request, HttpConnectionPool pool, TimeSpan duration, int versionMajor)
         {

src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs

@@ -172,8 +172,6 @@ protected sealed class InstrumentRecorder<T> : IDisposable where T : struct
             private Meter? _meter;
 
             public Action? MeasurementRecorded;
-            public Action<IReadOnlyList<T>> VerifyHistogramBucketBoundaries;
-            public int MeasurementCount => _values.Count;
 
             public InstrumentRecorder(string instrumentName)
             {
@@ -206,13 +204,6 @@ private void OnMeasurementRecorded(Instrument instrument, T measurement, ReadOnl
             {
                 _values.Enqueue(new Measurement<T>(measurement, tags));
                 MeasurementRecorded?.Invoke();
-                if (VerifyHistogramBucketBoundaries is not null)
-                {
-                    Histogram<T> histogram = (Histogram<T>)instrument;
-                    IReadOnlyList<T> boundaries = histogram.Advice.HistogramBucketBoundaries;
-                    Assert.NotNull(boundaries);
-                    VerifyHistogramBucketBoundaries(boundaries);
-                }
             }
 
             public IReadOnlyList<Measurement<T>> GetMeasurements() => _values.ToArray();
@@ -348,7 +339,6 @@ public Task RequestDuration_Success_Recorded(string method, HttpStatusCode statu
             {
                 using HttpMessageInvoker client = CreateHttpMessageInvoker();
                 using InstrumentRecorder<double> recorder = SetupInstrumentRecorder<double>(InstrumentNames.RequestDuration);
-
                 using HttpRequestMessage request = new(HttpMethod.Parse(method), uri) { Version = UseVersion };
 
                 using HttpResponseMessage response = await SendAsync(client, request);
@@ -937,40 +927,6 @@ await IgnoreExceptions(async () =>
                 });
             });
         }
-
-        [Fact]
-        public Task DurationHistograms_HaveBucketSizeHints()
-        {
-            return LoopbackServerFactory.CreateClientAndServerAsync(async uri =>
-            {
-                using HttpMessageInvoker client = CreateHttpMessageInvoker();
-                using InstrumentRecorder<double> requestDurationRecorder = SetupInstrumentRecorder<double>(InstrumentNames.RequestDuration);
-                using InstrumentRecorder<double> timeInQueueRecorder = SetupInstrumentRecorder<double>(InstrumentNames.TimeInQueue);
-                using InstrumentRecorder<double> connectionDurationRecorder = SetupInstrumentRecorder<double>(InstrumentNames.ConnectionDuration);
-
-                requestDurationRecorder.VerifyHistogramBucketBoundaries = b =>
-                {
-                    // Verify first and last value of the boundaries defined in
-                    // https://github.com/open-telemetry/semantic-conventions/blob/release/v1.23.x/docs/http/http-metrics.md#metric-httpserverrequestduration
-                    Assert.Equal(0.005, b.First());
-                    Assert.Equal(10, b.Last());
-                };
-                timeInQueueRecorder.VerifyHistogramBucketBoundaries = requestDurationRecorder.VerifyHistogramBucketBoundaries;
-                connectionDurationRecorder.VerifyHistogramBucketBoundaries =
-                    b => Assert.True(b.Last() > 180); // At least 3 minutes for the highest bucket.
-
-                using HttpRequestMessage request = new(HttpMethod.Get, uri) { Version = UseVersion };
-                using HttpResponseMessage response = await SendAsync(client, request);
-
-                Assert.Equal(1, requestDurationRecorder.MeasurementCount);
-                Assert.Equal(1, timeInQueueRecorder.MeasurementCount);
-                client.Dispose(); // terminate the connection
-                Assert.Equal(1, connectionDurationRecorder.MeasurementCount);
-            }, async server =>
-            {
-                await server.AcceptConnectionSendResponseAndCloseAsync();
-            });
-        }
     }
 
     [ActiveIssue("https://github.com/dotnet/runtime/issues/93754", TestPlatforms.Browser)]

src/libraries/System.Net.NameResolution/src/System/Net/NameResolutionMetrics.cs

@@ -15,14 +15,7 @@ internal static class NameResolutionMetrics
         private static readonly Histogram<double> s_lookupDuration = s_meter.CreateHistogram<double>(
             name: "dns.lookup.duration",
             unit: "s",
-            description: "Measures the time taken to perform a DNS lookup.",
-            advice: new InstrumentAdvice<double>()
-            {
-                // OTel bucket boundary recommendation for 'http.request.duration':
-                // https://github.com/open-telemetry/semantic-conventions/blob/release/v1.23.x/docs/http/http-metrics.md#metric-httpclientrequestduration
-                // We are using these boundaries for all network requests that are expected to be short.
-                HistogramBucketBoundaries = [0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10]
-            });
+            description: "Measures the time taken to perform a DNS lookup.");
 
         public static bool IsEnabled() => s_lookupDuration.Enabled;
 

src/libraries/System.Net.NameResolution/tests/FunctionalTests/MetricsTest.cs

@@ -41,22 +41,6 @@ await RemoteExecutor.Invoke(async () =>
             }).DisposeAsync();
         }
 
-        [Fact]
-        public static async Task DurationHistogram_HasBucketSizeHints()
-        {
-            await RemoteExecutor.Invoke(async () =>
-            {
-                const string ValidHostName = "localhost";
-
-                using var recorder = new InstrumentRecorder<double>(DnsLookupDuration);
-                recorder.VerifyHistogramBucketBoundaries = b => Assert.True(b.Count > 2);
-
-                await Dns.GetHostEntryAsync(ValidHostName);
-
-                Assert.Equal(1, recorder.MeasurementCount);
-            }).DisposeAsync();
-        }
-
         [Fact]
         public static async Task ResolveInvalidHostName_MetricsRecorded()
         {
@@ -102,9 +86,6 @@ private sealed class InstrumentRecorder<T> : IDisposable where T : struct
             private readonly MeterListener _meterListener = new();
             private readonly ConcurrentQueue<Measurement<T>> _values = new();
 
-            public Action<IReadOnlyList<T>> VerifyHistogramBucketBoundaries;
-            public int MeasurementCount => _values.Count;
-
             public InstrumentRecorder(string instrumentName)
             {
                 _meterListener.InstrumentPublished = (instrument, listener) =>
@@ -118,17 +99,7 @@ public InstrumentRecorder(string instrumentName)
                 _meterListener.Start();
             }
 
-            private void OnMeasurementRecorded(Instrument instrument, T measurement, ReadOnlySpan<KeyValuePair<string, object?>> tags, object? state)
-            {
-                _values.Enqueue(new Measurement<T>(measurement, tags));
-                if (VerifyHistogramBucketBoundaries is not null)
-                {
-                    Histogram<T> histogram = (Histogram<T>)instrument;
-                    IReadOnlyList<T> boundaries = histogram.Advice.HistogramBucketBoundaries;
-                    Assert.NotNull(boundaries);
-                    VerifyHistogramBucketBoundaries(boundaries);
-                }
-            }
+            private void OnMeasurementRecorded(Instrument instrument, T measurement, ReadOnlySpan<KeyValuePair<string, object?>> tags, object? state) => _values.Enqueue(new Measurement<T>(measurement, tags));
             public IReadOnlyList<Measurement<T>> GetMeasurements() => _values.ToArray();
             public void Dispose() => _meterListener.Dispose();
         }