Skip to content

Commit 9d34e67

Browse files
JamesNKJamesNK
authored
Rename ASP.NET Core metrics (#48375)
1 parent 24a2837 commit 9d34e67

File tree

17 files changed

+105
-133
lines changed

17 files changed

+105
-133
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ public HostingMetrics(IMeterFactory meterFactory)
2323
_meter = meterFactory.Create(MeterName);
2424

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

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

3434
_unhandledRequestsCounter = _meter.CreateCounter<long>(
35-
"unhandled-requests",
35+
"http-server-unhandled-requests",
3636
description: "Number of HTTP requests that reached the end of the middleware pipeline without being handled by application code.");
3737
}
3838

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

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

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

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

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ 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");
30-
using var unhandledRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "unhandled-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");
30+
using var unhandledRequestsRecorder = new InstrumentRecorder<long>(meterFactory, HostingMetrics.MeterName, "http-server-unhandled-requests");
3131

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

133133
await syncPoint.WaitForSyncPoint().DefaultTimeout();
134134

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

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

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

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

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

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

543543
var meterFactory = new TestMeterFactory();
544-
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
545-
using var diagnosticsRequestExceptionRecorder = new InstrumentRecorder<long>(meterFactory, DiagnosticsMetrics.MeterName, "diagnostics-handler-exception");
546-
using var measurementReporter = new MeasurementReporter<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "request-duration");
544+
using var requestDurationRecorder = new InstrumentRecorder<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "http-server-request-duration");
545+
using var requestExceptionRecorder = new InstrumentRecorder<long>(meterFactory, DiagnosticsMetrics.MeterName, "diagnostics-handler-exception");
546+
using var measurementReporter = new MeasurementReporter<double>(meterFactory, "Microsoft.AspNetCore.Hosting", "http-server-request-duration");
547547
measurementReporter.Register(m =>
548548
{
549549
tcs.SetResult();
@@ -588,7 +588,7 @@ public async Task UnhandledError_ExceptionNameTagAdded()
588588
Assert.Equal(500, (int)m.Tags.ToArray().Single(t => t.Key == "status-code").Value);
589589
Assert.Equal("System.Exception", (string)m.Tags.ToArray().Single(t => t.Key == "exception-name").Value);
590590
});
591-
Assert.Collection(diagnosticsRequestExceptionRecorder.GetMeasurements(),
591+
Assert.Collection(requestExceptionRecorder.GetMeasurements(),
592592
m => AssertRequestException(m, "System.Exception", "Unhandled"));
593593
}
594594

‎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());

0 commit comments

Comments
 (0)