Skip to content

Remove pop from the names of token counts in diagnostics #2055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2025
Merged

Remove pop from the names of token counts in diagnostics #2055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions ...entityServer/Licensing/V2/Diagnostics/DiagnosticEntries/TokenIssueCountDiagnosticEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ internal class TokenIssueCountDiagnosticEntry : IDiagnosticEntry
private long _jwtTokenIssued;
private long _referenceTokenIssued;
private long _refreshTokenIssued;
private long _jwtPoPDPoPTokenIssued;
private long _referencePoPDPoPTokenIssued;
private long _jwtPoPmTLSTokenIssued;
private long _referencePoPmTLSTokenIssued;
private long _jwtDPoPTokenIssued;
private long _referenceDPoPTokenIssued;
private long _jwtMTLSTokenIssued;
private long _referenceMTLSTokenIssued;
private long _idTokenIssued;

private long _implicitGrantTypeFlows;
Expand Down Expand Up @@ -53,10 +53,10 @@ public Task WriteAsync(Utf8JsonWriter writer)

writer.WriteNumber("Jwt", _jwtTokenIssued);
writer.WriteNumber("Reference", _referenceTokenIssued);
writer.WriteNumber("JwtPoPDPoP", _jwtPoPDPoPTokenIssued);
writer.WriteNumber("ReferencePoPDPoP", _referencePoPDPoPTokenIssued);
writer.WriteNumber("JwtPoPmTLS", _jwtPoPmTLSTokenIssued);
writer.WriteNumber("ReferencePoPmTLS", _referencePoPmTLSTokenIssued);
writer.WriteNumber("JwtDPoP", _jwtDPoPTokenIssued);
writer.WriteNumber("ReferenceDPoP", _referenceDPoPTokenIssued);
writer.WriteNumber("JwtMTLS", _jwtMTLSTokenIssued);
writer.WriteNumber("ReferenceMTLS", _referenceMTLSTokenIssued);
writer.WriteNumber("Refresh", _refreshTokenIssued);
writer.WriteNumber("Id", _idTokenIssued);
writer.WriteNumber(GrantType.Implicit, _implicitGrantTypeFlows);
Expand Down Expand Up @@ -128,16 +128,16 @@ private void HandleLongMeasurementRecorded(Instrument instrument, long value, Re
Interlocked.Increment(ref _referenceTokenIssued);
break;
case ProofType.DPoP when accessTokenType == AccessTokenType.Jwt:
Interlocked.Increment(ref _jwtPoPDPoPTokenIssued);
Interlocked.Increment(ref _jwtDPoPTokenIssued);
break;
case ProofType.DPoP when accessTokenType == AccessTokenType.Reference:
Interlocked.Increment(ref _referencePoPDPoPTokenIssued);
Interlocked.Increment(ref _referenceDPoPTokenIssued);
break;
case ProofType.ClientCertificate when accessTokenType == AccessTokenType.Jwt:
Interlocked.Increment(ref _jwtPoPmTLSTokenIssued);
Interlocked.Increment(ref _jwtMTLSTokenIssued);
break;
case ProofType.ClientCertificate when accessTokenType == AccessTokenType.Reference:
Interlocked.Increment(ref _referencePoPmTLSTokenIssued);
Interlocked.Increment(ref _referenceMTLSTokenIssued);
break;
}
}
Expand Down
26 changes: 13 additions & 13 deletions ...ityServer.UnitTests/Licensing/v2/DiagnosticEntries/TokenIssueCountDiagnosticEntryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public async Task Should_Count_JwtDPoPToken()

var result = await DiagnosticEntryTestHelper.WriteEntryToJson(_subject);

result.RootElement.GetProperty("TokenIssueCounts").GetProperty("JwtPoPDPoP").GetInt64().ShouldBe(1);
result.RootElement.GetProperty("TokenIssueCounts").GetProperty("JwtDPoP").GetInt64().ShouldBe(1);
}

[Fact]
Expand All @@ -48,7 +48,7 @@ public async Task Should_Count_ReferenceDPoPToken()

var result = await DiagnosticEntryTestHelper.WriteEntryToJson(_subject);

result.RootElement.GetProperty("TokenIssueCounts").GetProperty("ReferencePoPDPoP").GetInt64().ShouldBe(1);
result.RootElement.GetProperty("TokenIssueCounts").GetProperty("ReferenceDPoP").GetInt64().ShouldBe(1);
}

[Fact]
Expand All @@ -58,7 +58,7 @@ public async Task Should_Count_JwtMTlsToken()

var result = await DiagnosticEntryTestHelper.WriteEntryToJson(_subject);

result.RootElement.GetProperty("TokenIssueCounts").GetProperty("JwtPoPmTLS").GetInt64().ShouldBe(1);
result.RootElement.GetProperty("TokenIssueCounts").GetProperty("JwtMTLS").GetInt64().ShouldBe(1);
}

[Fact]
Expand All @@ -68,7 +68,7 @@ public async Task Should_Count_ReferenceMTlsToken()

var result = await DiagnosticEntryTestHelper.WriteEntryToJson(_subject);

result.RootElement.GetProperty("TokenIssueCounts").GetProperty("ReferencePoPmTLS").GetInt64().ShouldBe(1);
result.RootElement.GetProperty("TokenIssueCounts").GetProperty("ReferenceMTLS").GetInt64().ShouldBe(1);
}

[Fact]
Expand Down Expand Up @@ -101,7 +101,7 @@ public async Task Should_Handle_Multiple_Token_Types()

var tokenIssueCounts = result.RootElement.GetProperty("TokenIssueCounts");
tokenIssueCounts.GetProperty("Jwt").GetInt64().ShouldBe(1);
tokenIssueCounts.GetProperty("JwtPoPDPoP").GetInt64().ShouldBe(1);
tokenIssueCounts.GetProperty("JwtDPoP").GetInt64().ShouldBe(1);
tokenIssueCounts.GetProperty("Refresh").GetInt64().ShouldBe(1);
}

Expand All @@ -115,10 +115,10 @@ public async Task Should_Handle_No_Token_Issued()
var tokenIssueCounts = result.RootElement.GetProperty("TokenIssueCounts");
tokenIssueCounts.GetProperty("Jwt").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("Reference").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("JwtPoPDPoP").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("JwtPoPmTLS").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("ReferencePoPDPoP").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("ReferencePoPmTLS").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("JwtDPoP").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("JwtMTLS").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("ReferenceDPoP").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("ReferenceMTLS").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("Refresh").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("Id").GetInt64().ShouldBe(0);
}
Expand Down Expand Up @@ -190,10 +190,10 @@ public async Task Should_Ignore_Non_TokenIssued_Instruments()
var tokenIssueCounts = result.RootElement.GetProperty("TokenIssueCounts");
tokenIssueCounts.GetProperty("Jwt").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("Reference").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("JwtPoPDPoP").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("JwtPoPmTLS").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("ReferencePoPDPoP").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("ReferencePoPmTLS").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("JwtDPoP").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("JwtMTLS").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("ReferenceDPoP").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("ReferenceMTLS").GetInt64().ShouldBe(0);
tokenIssueCounts.GetProperty("Refresh").GetInt64().ShouldBe(0);
}

Expand Down
Loading