Skip to content

Commit 34b0166

Browse files
JamesNKJamesNK
committed
Rename ASP.NET Core metrics
1 parent c1f7320 commit 34b0166

File tree

13 files changed

+86
-86
lines changed

13 files changed

+86
-86
lines changed

‎src/Hosting/Hosting/src/Internal/HostingMetrics.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ public HostingMetrics(IMeterFactory meterFactory)
2222
_meter = meterFactory.Create(MeterName);
2323

2424
_currentRequestsCounter = _meter.CreateUpDownCounter<long>(
25-
"current-requests",
25+
"http-server-current-requests",
2626
description: "Number of HTTP requests that are currently active on the server.");
2727

2828
_requestDuration = _meter.CreateHistogram<double>(
29-
"request-duration",
29+
"http-server-request-duration",
3030
unit: "s",
3131
description: "The duration of HTTP requests on the server.");
3232
}

‎src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public async Task EventCountersAndMetricsValues()
5151
var hostingApplication1 = CreateApplication(out var features1, eventSource: hostingEventSource, meterFactory: testMeterFactory1);
5252
var hostingApplication2 = CreateApplication(out var features2, eventSource: hostingEventSource, meterFactory: testMeterFactory2);
5353

54-
using var currentRequestsRecorder1 = new InstrumentRecorder<long>(testMeterFactory1, HostingMetrics.MeterName, "current-requests");
55-
using var currentRequestsRecorder2 = new InstrumentRecorder<long>(testMeterFactory2, HostingMetrics.MeterName, "current-requests");
56-
using var requestDurationRecorder1 = new InstrumentRecorder<double>(testMeterFactory1, HostingMetrics.MeterName, "request-duration");
57-
using var requestDurationRecorder2 = new InstrumentRecorder<double>(testMeterFactory2, HostingMetrics.MeterName, "request-duration");
54+
using var currentRequestsRecorder1 = new InstrumentRecorder<long>(testMeterFactory1, HostingMetrics.MeterName, "http-server-current-requests");
55+
using var currentRequestsRecorder2 = new InstrumentRecorder<long>(testMeterFactory2, HostingMetrics.MeterName, "http-server-current-requests");
56+
using var requestDurationRecorder1 = new InstrumentRecorder<double>(testMeterFactory1, HostingMetrics.MeterName, "http-server-request-duration");
57+
using var requestDurationRecorder2 = new InstrumentRecorder<double>(testMeterFactory2, HostingMetrics.MeterName, "http-server-request-duration");
5858

5959
// Act/Assert 1
6060
var context1 = hostingApplication1.CreateContext(features1);

‎src/Hosting/Hosting/test/HostingMetricsTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public void MultipleRequests()
2525
var httpContext = new DefaultHttpContext();
2626
var meter = meterFactory.Meters.Single();
2727

28-
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, HostingMetrics.MeterName, "request-duration");
29-
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "current-requests");
28+
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, HostingMetrics.MeterName, "http-server-request-duration");
29+
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "http-server-current-requests");
3030

3131
// Act/Assert
3232
Assert.Equal(HostingMetrics.MeterName, meter.Name);
@@ -128,8 +128,8 @@ public async Task StartListeningDuringRequest_NotMeasured()
128128

129129
await syncPoint.WaitForSyncPoint().DefaultTimeout();
130130

131-
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, HostingMetrics.MeterName, "request-duration");
132-
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "current-requests");
131+
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, HostingMetrics.MeterName, "http-server-request-duration");
132+
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "http-server-current-requests");
133133
context1.HttpContext.Response.StatusCode = StatusCodes.Status200OK;
134134

135135
syncPoint.Continue();
@@ -150,8 +150,8 @@ public void IHttpMetricsTagsFeatureNotUsedFromFeatureCollection()
150150
var httpContext = new DefaultHttpContext();
151151
var meter = meterFactory.Meters.Single();
152152

153-
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, HostingMetrics.MeterName, "request-duration");
154-
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "current-requests");
153+
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, HostingMetrics.MeterName, "http-server-request-duration");
154+
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "http-server-current-requests");
155155

156156
// Act/Assert
157157
Assert.Equal(HostingMetrics.MeterName, meter.Name);

‎src/Middleware/Diagnostics/test/UnitTests/DeveloperExceptionPageMiddlewareTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,8 @@ public async Task UnhandledError_ExceptionNameTagAdded()
541541
var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
542542

543543
var meterFactory = new TestMeterFactory();
544-
using var instrumentRecorder = new InstrumentRecorder<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
545-
using var measurementReporter = new MeasurementReporter<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
544+
using var instrumentRecorder = new InstrumentRecorder<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "http-server-request-duration");
545+
using var measurementReporter = new MeasurementReporter<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "http-server-request-duration");
546546
measurementReporter.Register(m =>
547547
{
548548
tcs.SetResult();

‎src/Middleware/Diagnostics/test/UnitTests/ExceptionHandlerTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -918,8 +918,8 @@ public async Task UnhandledError_ExceptionNameTagAdded()
918918
var tcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
919919

920920
var meterFactory = new TestMeterFactory();
921-
using var instrumentRecorder = new InstrumentRecorder<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
922-
using var measurementReporter = new MeasurementReporter<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
921+
using var instrumentRecorder = new InstrumentRecorder<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "http-server-request-duration");
922+
using var measurementReporter = new MeasurementReporter<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "http-server-request-duration");
923923
measurementReporter.Register(m =>
924924
{
925925
tcs.SetResult();

‎src/Middleware/RateLimiting/src/RateLimitingMetrics.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@ public RateLimitingMetrics(IMeterFactory meterFactory)
2424
_meter = meterFactory.Create(MeterName);
2525

2626
_currentLeasedRequestsCounter = _meter.CreateUpDownCounter<long>(
27-
"current-leased-requests",
27+
"rate-limiting-current-leased-requests",
2828
description: "Number of HTTP requests that are currently active on the server that hold a rate limiting lease.");
2929

3030
_leasedRequestDurationCounter = _meter.CreateHistogram<double>(
31-
"leased-request-duration",
31+
"rate-limiting-leased-request-duration",
3232
unit: "s",
3333
description: "The duration of rate limiting leases held by HTTP requests on the server.");
3434

3535
_currentQueuedRequestsCounter = _meter.CreateUpDownCounter<long>(
36-
"current-queued-requests",
36+
"rate-limiting-current-queued-requests",
3737
description: "Number of HTTP requests that are currently queued, waiting to acquire a rate limiting lease.");
3838

3939
_queuedRequestDurationCounter = _meter.CreateHistogram<double>(
40-
"queued-request-duration",
40+
"rate-limiting-queued-request-duration",
4141
unit: "s",
4242
description: "The duration of HTTP requests in a queue, waiting to acquire a rate limiting lease.");
4343

4444
_leaseFailedRequestsCounter = _meter.CreateCounter<long>(
45-
"lease-failed-requests",
45+
"rate-limiting-lease-failed-requests",
4646
description: "Number of HTTP requests that failed to acquire a rate limiting lease. Requests could be rejected by global or endpoint rate limiting policies. Or the request could be canceled while waiting for the lease.");
4747
}
4848

‎src/Middleware/RateLimiting/test/RateLimitingMetricsTests.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ public async Task Metrics_Rejected()
3434

3535
var context = new DefaultHttpContext();
3636

37-
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "leased-request-duration");
38-
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-leased-requests");
39-
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-queued-requests");
40-
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "queued-request-duration");
41-
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "lease-failed-requests");
37+
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-leased-request-duration");
38+
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-leased-requests");
39+
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-queued-requests");
40+
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-queued-request-duration");
41+
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-lease-failed-requests");
4242

4343
// Act
4444
await middleware.Invoke(context).DefaultTimeout();
@@ -81,11 +81,11 @@ public async Task Metrics_Success()
8181
var context = new DefaultHttpContext();
8282
context.Request.Method = "GET";
8383

84-
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "leased-request-duration");
85-
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-leased-requests");
86-
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-queued-requests");
87-
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "queued-request-duration");
88-
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "lease-failed-requests");
84+
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-leased-request-duration");
85+
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-leased-requests");
86+
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-queued-requests");
87+
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-queued-request-duration");
88+
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-lease-failed-requests");
8989

9090
// Act
9191
var middlewareTask = middleware.Invoke(context);
@@ -141,11 +141,11 @@ public async Task Metrics_ListenInMiddleOfRequest_CurrentLeasesNotDecreased()
141141

142142
await syncPoint.WaitForSyncPoint().DefaultTimeout();
143143

144-
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "leased-request-duration");
145-
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-leased-requests");
146-
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-queued-requests");
147-
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "queued-request-duration");
148-
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "lease-failed-requests");
144+
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-leased-request-duration");
145+
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-leased-requests");
146+
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-queued-requests");
147+
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-queued-request-duration");
148+
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-lease-failed-requests");
149149

150150
syncPoint.Continue();
151151

@@ -192,11 +192,11 @@ public async Task Metrics_Queued()
192192
routeEndpointBuilder.Metadata.Add(new EnableRateLimitingAttribute("concurrencyPolicy"));
193193
var endpoint = routeEndpointBuilder.Build();
194194

195-
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "leased-request-duration");
196-
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-leased-requests");
197-
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-queued-requests");
198-
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "queued-request-duration");
199-
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "lease-failed-requests");
195+
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-leased-request-duration");
196+
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-leased-requests");
197+
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-queued-requests");
198+
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-queued-request-duration");
199+
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-lease-failed-requests");
200200

201201
// Act
202202
var context1 = new DefaultHttpContext();
@@ -279,11 +279,11 @@ public async Task Metrics_ListenInMiddleOfQueued_CurrentQueueNotDecreased()
279279

280280
// Start listening while the second request is queued.
281281

282-
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "leased-request-duration");
283-
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-leased-requests");
284-
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "current-queued-requests");
285-
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "queued-request-duration");
286-
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "lease-failed-requests");
282+
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-leased-request-duration");
283+
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-leased-requests");
284+
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-current-queued-requests");
285+
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-queued-request-duration");
286+
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterFactory, RateLimitingMetrics.MeterName, "rate-limiting-lease-failed-requests");
287287

288288
Assert.Empty(currentRequestsQueuedRecorder.GetMeasurements());
289289
Assert.Empty(queuedRequestDurationRecorder.GetMeasurements());

‎src/Servers/Kestrel/Core/src/Internal/Infrastructure/KestrelMetrics.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,37 +30,37 @@ public KestrelMetrics(IMeterFactory meterFactory)
3030
_meter = meterFactory.Create(MeterName);
3131

3232
_currentConnectionsCounter = _meter.CreateUpDownCounter<long>(
33-
"current-connections",
33+
"kestrel-current-connections",
3434
description: "Number of connections that are currently active on the server.");
3535

3636
_connectionDuration = _meter.CreateHistogram<double>(
37-
"connection-duration",
37+
"kestrel-connection-duration",
3838
unit: "s",
3939
description: "The duration of connections on the server.");
4040

4141
_rejectedConnectionsCounter = _meter.CreateCounter<long>(
42-
"rejected-connections",
42+
"kestrel-rejected-connections",
4343
description: "Number of connections rejected by the server. Connections are rejected when the currently active count exceeds the value configured with MaxConcurrentConnections.");
4444

4545
_queuedConnectionsCounter = _meter.CreateUpDownCounter<long>(
46-
"queued-connections",
46+
"kestrel-queued-connections",
4747
description: "Number of connections that are currently queued and are waiting to start.");
4848

4949
_queuedRequestsCounter = _meter.CreateUpDownCounter<long>(
50-
"queued-requests",
50+
"kestrel-queued-requests",
5151
description: "Number of HTTP requests on multiplexed connections (HTTP/2 and HTTP/3) that are currently queued and are waiting to start.");
5252

5353
_currentUpgradedRequestsCounter = _meter.CreateUpDownCounter<long>(
54-
"current-upgraded-connections",
54+
"kestrel-current-upgraded-connections",
5555
description: "Number of HTTP connections that are currently upgraded (WebSockets). The number only tracks HTTP/1.1 connections.");
5656

5757
_tlsHandshakeDuration = _meter.CreateHistogram<double>(
58-
"tls-handshake-duration",
58+
"kestrel-tls-handshake-duration",
5959
unit: "s",
6060
description: "The duration of TLS handshakes on the server.");
6161

6262
_currentTlsHandshakesCounter = _meter.CreateUpDownCounter<long>(
63-
"current-tls-handshakes",
63+
"kestrel-current-tls-handshakes",
6464
description: "Number of TLS handshakes that are currently in progress on the server.");
6565
}
6666

‎src/Servers/Kestrel/test/InMemory.FunctionalTests/ConnectionLimitTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public async Task UpgradedConnectionsCountsAgainstDifferentLimit()
102102
public async Task RejectsConnectionsWhenLimitReached()
103103
{
104104
var testMeterFactory = new TestMeterFactory();
105-
using var rejectedConnections = new InstrumentRecorder<long>(testMeterFactory, "Microsoft.AspNetCore.Server.Kestrel", "rejected-connections");
105+
using var rejectedConnections = new InstrumentRecorder<long>(testMeterFactory, "Microsoft.AspNetCore.Server.Kestrel", "kestrel-rejected-connections");
106106

107107
const int max = 10;
108108
var requestTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);

0 commit comments

Comments
 (0)