Rename current connections counter

Author: JamesNK

src/SignalR/common/Http.Connections/src/Internal/HttpConnectionsMetrics.cs

@@ -9,14 +9,14 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal;
 
 internal readonly struct MetricsContext
 {
-    public MetricsContext(bool connectionDurationEnabled, bool currentNegotiatedConnectionsCounterEnabled)
+    public MetricsContext(bool connectionDurationEnabled, bool currentConnectionsCounterEnabled)
     {
         ConnectionDurationEnabled = connectionDurationEnabled;
-        CurrentNegotiatedConnectionsCounterEnabled = currentNegotiatedConnectionsCounterEnabled;
+        CurrentConnectionsCounterEnabled = currentConnectionsCounterEnabled;
     }
 
     public bool ConnectionDurationEnabled { get; }
-    public bool CurrentNegotiatedConnectionsCounterEnabled { get; }
+    public bool CurrentConnectionsCounterEnabled { get; }
 }
 
 internal sealed class HttpConnectionsMetrics : IDisposable
@@ -25,7 +25,7 @@ internal sealed class HttpConnectionsMetrics : IDisposable
 
     private readonly Meter _meter;
     private readonly Histogram<double> _connectionDuration;
-    private readonly UpDownCounter<long> _currentNegotiatedConnectionsCounter;
+    private readonly UpDownCounter<long> _currentConnectionsCounter;
 
     public HttpConnectionsMetrics(IMeterFactory meterFactory)
     {
@@ -36,9 +36,9 @@ public HttpConnectionsMetrics(IMeterFactory meterFactory)
             unit: "s",
             description: "The duration of connections on the server.");
 
-        _currentNegotiatedConnectionsCounter = _meter.CreateUpDownCounter<long>(
-            "signalr-http-transport-current-negotiated-connections",
-            description: "Number of negotiated connections that are currently active on the server.");
+        _currentConnectionsCounter = _meter.CreateUpDownCounter<long>(
+            "signalr-http-transport-current-connections",
+            description: "Number of connections that are currently active on the server.");
     }
 
     public void ConnectionStop(in MetricsContext metricsContext, HttpTransportType transportType, HttpConnectionStopStatus status, long startTimestamp, long currentTimestamp)
@@ -57,21 +57,21 @@ public void ConnectionTransportStart(in MetricsContext metricsContext, HttpTrans
         Debug.Assert(transportType != HttpTransportType.None);
 
         // Tags must match transport end.
-        if (metricsContext.CurrentNegotiatedConnectionsCounterEnabled)
+        if (metricsContext.CurrentConnectionsCounterEnabled)
         {
-            _currentNegotiatedConnectionsCounter.Add(1, new KeyValuePair<string, object?>("transport", transportType.ToString()));
+            _currentConnectionsCounter.Add(1, new KeyValuePair<string, object?>("transport", transportType.ToString()));
         }
     }
 
     public void TransportStop(in MetricsContext metricsContext, HttpTransportType transportType)
     {
-        if (metricsContext.CurrentNegotiatedConnectionsCounterEnabled)
+        if (metricsContext.CurrentConnectionsCounterEnabled)
         {
             // Tags must match transport start.
             // If the transport type is none then the transport was never started for this connection.
             if (transportType != HttpTransportType.None)
             {
-                _currentNegotiatedConnectionsCounter.Add(-1, new KeyValuePair<string, object?>("transport", transportType.ToString()));
+                _currentConnectionsCounter.Add(-1, new KeyValuePair<string, object?>("transport", transportType.ToString()));
             }
         }
     }
@@ -83,6 +83,6 @@ public void Dispose()
 
     public MetricsContext CreateContext()
     {
-        return new MetricsContext(_connectionDuration.Enabled, _currentNegotiatedConnectionsCounter.Enabled);
+        return new MetricsContext(_connectionDuration.Enabled, _currentConnectionsCounter.Enabled);
     }
 }

src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs

@@ -1091,7 +1091,7 @@ public async Task Metrics()
         {
             var testMeterFactory = new TestMeterFactory();
             using var connectionDuration = new InstrumentRecorder<double>(testMeterFactory, HttpConnectionsMetrics.MeterName, "signalr-http-transport-connection-duration");
-            using var currentNegotiatedConnections = new InstrumentRecorder<long>(testMeterFactory, HttpConnectionsMetrics.MeterName, "signalr-http-transport-current-negotiated-connections");
+            using var currentConnections = new InstrumentRecorder<long>(testMeterFactory, HttpConnectionsMetrics.MeterName, "signalr-http-transport-current-connections");
 
             var metrics = new HttpConnectionsMetrics(testMeterFactory);
             var manager = CreateConnectionManager(LoggerFactory, metrics);
@@ -1119,7 +1119,7 @@ public async Task Metrics()
             Assert.False(exists);
 
             Assert.Collection(connectionDuration.GetMeasurements(), m => AssertDuration(m, HttpConnectionStopStatus.NormalClosure, HttpTransportType.LongPolling));
-            Assert.Collection(currentNegotiatedConnections.GetMeasurements(), m => AssertTransport(m, 1, HttpTransportType.LongPolling), m => AssertTransport(m, -1, HttpTransportType.LongPolling));
+            Assert.Collection(currentConnections.GetMeasurements(), m => AssertTransport(m, 1, HttpTransportType.LongPolling), m => AssertTransport(m, -1, HttpTransportType.LongPolling));
         }
 
         static void AssertTransport(Measurement<long> measurement, long expected, HttpTransportType transportType)