Skip to content

Commit 0e8cbde

Browse files
authored
Auth metrics updates (#63030)
1 parent 828955c commit 0e8cbde

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

src/Http/Authentication.Core/src/AuthenticationMetrics.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@ public AuthenticationMetrics(IMeterFactory meterFactory)
3131

3232
_challengeCount = _meter.CreateCounter<long>(
3333
"aspnetcore.authentication.challenges",
34-
unit: "{request}",
34+
unit: "{challenge}",
3535
description: "The total number of times a scheme is challenged.");
3636

3737
_forbidCount = _meter.CreateCounter<long>(
3838
"aspnetcore.authentication.forbids",
39-
unit: "{request}",
39+
unit: "{forbid}",
4040
description: "The total number of times an authenticated user attempts to access a resource they are not permitted to access.");
4141

4242
_signInCount = _meter.CreateCounter<long>(
4343
"aspnetcore.authentication.sign_ins",
44-
unit: "{request}",
44+
unit: "{sign_in}",
4545
description: "The total number of times a principal is signed in with a scheme.");
4646

4747
_signOutCount = _meter.CreateCounter<long>(
4848
"aspnetcore.authentication.sign_outs",
49-
unit: "{request}",
49+
unit: "{sign_out}",
5050
description: "The total number of times a principal is signed out with a scheme.");
5151
}
5252

src/Security/Authorization/Core/src/AuthorizationMetrics.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,31 @@ internal sealed class AuthorizationMetrics
1818
public const string MeterName = "Microsoft.AspNetCore.Authorization";
1919

2020
private readonly Meter _meter;
21-
private readonly Counter<long> _authorizedRequestCount;
21+
private readonly Counter<long> _authorizedCount;
2222

2323
public AuthorizationMetrics(IMeterFactory meterFactory)
2424
{
2525
_meter = meterFactory.Create(MeterName);
2626

27-
_authorizedRequestCount = _meter.CreateCounter<long>(
27+
_authorizedCount = _meter.CreateCounter<long>(
2828
"aspnetcore.authorization.attempts",
29-
unit: "{request}",
30-
description: "The total number of requests for which authorization was attempted.");
29+
unit: "{attempt}",
30+
description: "The total number of authorization attempts.");
3131
}
3232

33-
public void AuthorizedRequestCompleted(ClaimsPrincipal user, string? policyName, AuthorizationResult? result, Exception? exception)
33+
public void AuthorizeAttemptCompleted(ClaimsPrincipal user, string? policyName, AuthorizationResult? result, Exception? exception)
3434
{
35-
if (_authorizedRequestCount.Enabled)
35+
if (_authorizedCount.Enabled)
3636
{
37-
AuthorizedRequestCompletedCore(user, policyName, result, exception);
37+
AuthorizeAttemptCore(user, policyName, result, exception);
3838
}
3939
}
4040

4141
[MethodImpl(MethodImplOptions.NoInlining)]
42-
private void AuthorizedRequestCompletedCore(ClaimsPrincipal user, string? policyName, AuthorizationResult? result, Exception? exception)
42+
private void AuthorizeAttemptCore(ClaimsPrincipal user, string? policyName, AuthorizationResult? result, Exception? exception)
4343
{
4444
var tags = new TagList([
45-
new("user.is_authenticated", user.Identity?.IsAuthenticated ?? false)
45+
new("aspnetcore.user.is_authenticated", user.Identity?.IsAuthenticated ?? false)
4646
]);
4747

4848
if (policyName is not null)
@@ -61,6 +61,6 @@ private void AuthorizedRequestCompletedCore(ClaimsPrincipal user, string? policy
6161
tags.Add("error.type", exception.GetType().FullName);
6262
}
6363

64-
_authorizedRequestCount.Add(1, tags);
64+
_authorizedCount.Add(1, tags);
6565
}
6666
}

src/Security/Authorization/Core/src/DefaultAuthorizationServiceImpl.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public override async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal u
3030
}
3131
catch (Exception ex)
3232
{
33-
metrics.AuthorizedRequestCompleted(user, policyName: null, result: null, ex);
33+
metrics.AuthorizeAttemptCompleted(user, policyName: null, result: null, ex);
3434
throw;
3535
}
3636

37-
metrics.AuthorizedRequestCompleted(user, policyName: null, result, exception: null);
37+
metrics.AuthorizeAttemptCompleted(user, policyName: null, result, exception: null);
3838
return result;
3939
}
4040

@@ -52,11 +52,11 @@ public override async Task<AuthorizationResult> AuthorizeAsync(ClaimsPrincipal u
5252
}
5353
catch (Exception ex)
5454
{
55-
metrics.AuthorizedRequestCompleted(user, policyName, result: null, ex);
55+
metrics.AuthorizeAttemptCompleted(user, policyName, result: null, ex);
5656
throw;
5757
}
5858

59-
metrics.AuthorizedRequestCompleted(user, policyName, result, exception: null);
59+
metrics.AuthorizeAttemptCompleted(user, policyName, result, exception: null);
6060
return result;
6161
}
6262
}

src/Security/Authorization/test/AuthorizationMetricsTest.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public async Task Authorize_WithPolicyName_Success()
3232
Assert.Equal(1, measurement.Value);
3333
Assert.Equal("Basic", (string)measurement.Tags["aspnetcore.authorization.policy"]);
3434
Assert.Equal("success", (string)measurement.Tags["aspnetcore.authorization.result"]);
35-
Assert.True((bool)measurement.Tags["user.is_authenticated"]);
35+
Assert.True((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
3636
}
3737

3838
[Fact]
@@ -57,7 +57,7 @@ public async Task Authorize_WithPolicyName_Failure()
5757
Assert.Equal(1, measurement.Value);
5858
Assert.Equal("Basic", (string)measurement.Tags["aspnetcore.authorization.policy"]);
5959
Assert.Equal("failure", (string)measurement.Tags["aspnetcore.authorization.result"]);
60-
Assert.False((bool)measurement.Tags["user.is_authenticated"]);
60+
Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
6161
}
6262

6363
[Fact]
@@ -82,7 +82,7 @@ public async Task Authorize_WithPolicyName_PolicyNotFound()
8282
Assert.Equal(1, measurement.Value);
8383
Assert.Equal("UnknownPolicy", (string)measurement.Tags["aspnetcore.authorization.policy"]);
8484
Assert.Equal("System.InvalidOperationException", (string)measurement.Tags["error.type"]);
85-
Assert.False((bool)measurement.Tags["user.is_authenticated"]);
85+
Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
8686
Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.result"));
8787
}
8888

@@ -110,7 +110,7 @@ public async Task Authorize_WithoutPolicyName_Success()
110110
var measurement = Assert.Single(authorizedRequestsCollector.GetMeasurementSnapshot());
111111
Assert.Equal(1, measurement.Value);
112112
Assert.Equal("success", (string)measurement.Tags["aspnetcore.authorization.result"]);
113-
Assert.False((bool)measurement.Tags["user.is_authenticated"]);
113+
Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
114114
Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.policy"));
115115
}
116116

@@ -135,7 +135,7 @@ public async Task Authorize_WithoutPolicyName_Failure()
135135
var measurement = Assert.Single(authorizedRequestsCollector.GetMeasurementSnapshot());
136136
Assert.Equal(1, measurement.Value);
137137
Assert.Equal("failure", (string)measurement.Tags["aspnetcore.authorization.result"]);
138-
Assert.False((bool)measurement.Tags["user.is_authenticated"]);
138+
Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
139139
Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.policy"));
140140
}
141141

@@ -164,7 +164,7 @@ public async Task Authorize_WithoutPolicyName_ExceptionThrownInHandler()
164164
var measurement = Assert.Single(authorizedRequestsCollector.GetMeasurementSnapshot());
165165
Assert.Equal(1, measurement.Value);
166166
Assert.Equal("System.InvalidOperationException", (string)measurement.Tags["error.type"]);
167-
Assert.False((bool)measurement.Tags["user.is_authenticated"]);
167+
Assert.False((bool)measurement.Tags["aspnetcore.user.is_authenticated"]);
168168
Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.policy"));
169169
Assert.False(measurement.Tags.ContainsKey("aspnetcore.authorization.result"));
170170
}

0 commit comments

Comments
 (0)