Skip to content

Commit 60363ed

Browse files
JamesNKJamesNK
committed
Rename ASP.NET Core metrics
1 parent 18b22d4 commit 60363ed

File tree

12 files changed

+82
-82
lines changed

12 files changed

+82
-82
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.CreateMeter(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>(testMeterRegister1, HostingMetrics.MeterName, "current-requests");
55-
using var currentRequestsRecorder2 = new InstrumentRecorder<long>(testMeterRegister2, HostingMetrics.MeterName, "current-requests");
56-
using var requestDurationRecorder1 = new InstrumentRecorder<double>(testMeterRegister1, HostingMetrics.MeterName, "request-duration");
57-
using var requestDurationRecorder2 = new InstrumentRecorder<double>(testMeterRegister2, HostingMetrics.MeterName, "request-duration");
54+
using var currentRequestsRecorder1 = new InstrumentRecorder<long>(testMeterRegister1, HostingMetrics.MeterName, "http-server-current-requests");
55+
using var currentRequestsRecorder2 = new InstrumentRecorder<long>(testMeterRegister2, HostingMetrics.MeterName, "http-server-current-requests");
56+
using var requestDurationRecorder1 = new InstrumentRecorder<double>(testMeterRegister1, HostingMetrics.MeterName, "http-server-request-duration");
57+
using var requestDurationRecorder2 = new InstrumentRecorder<double>(testMeterRegister2, 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
@@ -26,8 +26,8 @@ public void MultipleRequests()
2626
var httpContext = new DefaultHttpContext();
2727
var meter = meterFactory.Meters.Single();
2828

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

3232
// Act/Assert
3333
Assert.Equal(HostingMetrics.MeterName, meter.Name);
@@ -130,8 +130,8 @@ public async Task StartListeningDuringRequest_NotMeasured()
130130

131131
await syncPoint.WaitForSyncPoint().DefaultTimeout();
132132

133-
using var requestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, HostingMetrics.MeterName, "request-duration");
134-
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, HostingMetrics.MeterName, "current-requests");
133+
using var requestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, HostingMetrics.MeterName, "http-server-request-duration");
134+
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, HostingMetrics.MeterName, "http-server-current-requests");
135135
context1.HttpContext.Response.StatusCode = StatusCodes.Status200OK;
136136

137137
syncPoint.Continue();
@@ -153,8 +153,8 @@ public void IHttpMetricsTagsFeatureNotUsedFromFeatureCollection()
153153
var httpContext = new DefaultHttpContext();
154154
var meter = meterFactory.Meters.Single();
155155

156-
using var requestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, HostingMetrics.MeterName, "request-duration");
157-
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, HostingMetrics.MeterName, "current-requests");
156+
using var requestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, HostingMetrics.MeterName, "http-server-request-duration");
157+
using var currentRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, HostingMetrics.MeterName, "http-server-current-requests");
158158

159159
// Act/Assert
160160
Assert.Equal(HostingMetrics.MeterName, meter.Name);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ public async Task UnhandledError_ExceptionNameTagAdded()
541541

542542
var meterFactory = new TestMeterFactory();
543543
var meterRegistry = new TestMeterRegistry(meterFactory.Meters);
544-
var instrumentRecorder = new InstrumentRecorder<double>(meterRegistry, "Microsoft.AspNetCore.Hosting", "request-duration");
544+
var instrumentRecorder = new InstrumentRecorder<double>(meterRegistry, "Microsoft.AspNetCore.Hosting", "http-server-request-duration");
545545
instrumentRecorder.Register(m =>
546546
{
547547
tcs.SetResult();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,7 @@ public async Task UnhandledError_ExceptionNameTagAdded()
918918

919919
var meterFactory = new TestMeterFactory();
920920
var meterRegistry = new TestMeterRegistry(meterFactory.Meters);
921-
var instrumentRecorder = new InstrumentRecorder<double>(meterRegistry, "Microsoft.AspNetCore.Hosting", "request-duration");
921+
var instrumentRecorder = new InstrumentRecorder<double>(meterRegistry, "Microsoft.AspNetCore.Hosting", "http-server-request-duration");
922922
instrumentRecorder.Register(m =>
923923
{
924924
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.CreateMeter(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
@@ -35,11 +35,11 @@ public async Task Metrics_Rejected()
3535

3636
var context = new DefaultHttpContext();
3737

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

4444
// Act
4545
await middleware.Invoke(context).DefaultTimeout();
@@ -83,11 +83,11 @@ public async Task Metrics_Success()
8383
var context = new DefaultHttpContext();
8484
context.Request.Method = "GET";
8585

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

9292
// Act
9393
var middlewareTask = middleware.Invoke(context);
@@ -144,11 +144,11 @@ public async Task Metrics_ListenInMiddleOfRequest_CurrentLeasesNotDecreased()
144144

145145
await syncPoint.WaitForSyncPoint().DefaultTimeout();
146146

147-
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "leased-request-duration");
148-
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "current-leased-requests");
149-
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "current-queued-requests");
150-
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "queued-request-duration");
151-
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "lease-failed-requests");
147+
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-leased-request-duration");
148+
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-current-leased-requests");
149+
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-current-queued-requests");
150+
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-queued-request-duration");
151+
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-lease-failed-requests");
152152

153153
syncPoint.Continue();
154154

@@ -196,11 +196,11 @@ public async Task Metrics_Queued()
196196
routeEndpointBuilder.Metadata.Add(new EnableRateLimitingAttribute("concurrencyPolicy"));
197197
var endpoint = routeEndpointBuilder.Build();
198198

199-
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "leased-request-duration");
200-
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "current-leased-requests");
201-
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "current-queued-requests");
202-
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "queued-request-duration");
203-
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "lease-failed-requests");
199+
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-leased-request-duration");
200+
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-current-leased-requests");
201+
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-current-queued-requests");
202+
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-queued-request-duration");
203+
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-lease-failed-requests");
204204

205205
// Act
206206
var context1 = new DefaultHttpContext();
@@ -284,11 +284,11 @@ public async Task Metrics_ListenInMiddleOfQueued_CurrentQueueNotDecreased()
284284

285285
// Start listening while the second request is queued.
286286

287-
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "leased-request-duration");
288-
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "current-leased-requests");
289-
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "current-queued-requests");
290-
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "queued-request-duration");
291-
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "lease-failed-requests");
287+
using var leaseRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-leased-request-duration");
288+
using var currentLeaseRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-current-leased-requests");
289+
using var currentRequestsQueuedRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-current-queued-requests");
290+
using var queuedRequestDurationRecorder = new InstrumentRecorder<double>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-queued-request-duration");
291+
using var leaseFailedRequestsRecorder = new InstrumentRecorder<long>(meterRegistry, RateLimitingMetrics.MeterName, "rate-limiting-lease-failed-requests");
292292

293293
Assert.Empty(currentRequestsQueuedRecorder.GetMeasurements());
294294
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.CreateMeter(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

0 commit comments

Comments
 (0)