Update tests

Author: MackinnonBuck

src/Security/Authentication/test/AuthenticationMetricsTest.cs

@@ -24,7 +24,7 @@ public async Task Authenticate_Success()
         var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
         var meter = meterFactory.Meters.Single();
 
-        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.request.duration");
+        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.authenticate.duration");
 
         // Act
         await authenticationService.AuthenticateAsync(httpContext, scheme: "custom");
@@ -52,7 +52,7 @@ public async Task Authenticate_Failure()
         var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
         var meter = meterFactory.Meters.Single();
 
-        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.request.duration");
+        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.authenticate.duration");
 
         // Act
         await authenticationService.AuthenticateAsync(httpContext, scheme: "custom");
@@ -80,7 +80,7 @@ public async Task Authenticate_NoResult()
         var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
         var meter = meterFactory.Meters.Single();
 
-        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.request.duration");
+        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.authenticate.duration");
 
         // Act
         await authenticationService.AuthenticateAsync(httpContext, scheme: "custom");
@@ -108,7 +108,7 @@ public async Task Authenticate_ExceptionThrownInHandler()
         var authenticationService = CreateAuthenticationService(authenticationHandler.Object, meterFactory);
         var meter = meterFactory.Meters.Single();
 
-        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.request.duration");
+        using var authenticationRequestsCollector = new MetricCollector<double>(meterFactory, AuthenticationMetrics.MeterName, "aspnetcore.authentication.authenticate.duration");
 
         // Act
         var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => authenticationService.AuthenticateAsync(httpContext, scheme: "custom"));

src/Security/Authorization/test/AuthorizationMetricsTest.cs

@@ -19,7 +19,7 @@ public async Task Authorize_WithPolicyName_Success()
         var meter = meterFactory.Meters.Single();
         var user = new ClaimsPrincipal(new ClaimsIdentity([new Claim("Permission", "CanViewPage")], authenticationType: "someAuthentication"));
 
-        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.requests");
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
 
         // Act
         await authorizationService.AuthorizeAsync(user, "Basic");
@@ -44,7 +44,7 @@ public async Task Authorize_WithPolicyName_Failure()
         var meter = meterFactory.Meters.Single();
         var user = new ClaimsPrincipal(new ClaimsIdentity([])); // Will fail due to missing required claim
 
-        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.requests");
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
 
         // Act
         await authorizationService.AuthorizeAsync(user, "Basic");
@@ -69,7 +69,7 @@ public async Task Authorize_WithPolicyName_PolicyNotFound()
         var meter = meterFactory.Meters.Single();
         var user = new ClaimsPrincipal(new ClaimsIdentity([])); // Will fail due to missing required claim
 
-        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.requests");
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
 
         // Act
         await Assert.ThrowsAsync<InvalidOperationException>(() => authorizationService.AuthorizeAsync(user, "UnknownPolicy"));
@@ -98,7 +98,7 @@ public async Task Authorize_WithoutPolicyName_Success()
         var meter = meterFactory.Meters.Single();
         var user = new ClaimsPrincipal(new ClaimsIdentity([]));
 
-        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.requests");
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
 
         // Act
         await authorizationService.AuthorizeAsync(user, resource: null, new TestRequirement());
@@ -123,7 +123,7 @@ public async Task Authorize_WithoutPolicyName_Failure()
         var meter = meterFactory.Meters.Single();
         var user = new ClaimsPrincipal(new ClaimsIdentity([]));
 
-        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.requests");
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
 
         // Act
         await authorizationService.AuthorizeAsync(user, resource: null, new TestRequirement());
@@ -151,7 +151,7 @@ public async Task Authorize_WithoutPolicyName_ExceptionThrownInHandler()
         var meter = meterFactory.Meters.Single();
         var user = new ClaimsPrincipal(new ClaimsIdentity([]));
 
-        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.requests");
+        using var authorizedRequestsCollector = new MetricCollector<long>(meterFactory, AuthorizationMetrics.MeterName, "aspnetcore.authorization.attempts");
 
         // Act
         var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => authorizationService.AuthorizeAsync(user, resource: null, new TestRequirement()));