PR feedback

JamesNK · JamesNK · commit 1725d2655cc6 · 2025-07-15T15:22:33.000+08:00
diff --git a/src/Identity/Core/src/SignInManagerMetrics.cs b/src/Identity/Core/src/SignInManagerMetrics.cs
@@ -49,7 +49,7 @@ internal void CheckPasswordSignIn(string userType, SignInResult? result, Excepti
             { "aspnetcore.identity.user_type", userType },
         };
         AddSignInResult(ref tags, result);
-        AddExceptionTags(ref tags, exception);
+        AddErrorTag(ref tags, exception);
 
         _checkPasswordCounter.Add(1, tags);
     }
@@ -69,7 +69,7 @@ internal void AuthenticateSignIn(string userType, string authenticationScheme, S
         };
         AddIsPersistent(ref tags, isPersistent);
         AddSignInResult(ref tags, result);
-        AddExceptionTags(ref tags, exception);
+        AddErrorTag(ref tags, exception);
 
         _authenticateCounter.Add(1, tags);
     }
@@ -87,7 +87,7 @@ internal void SignInUserPrincipal(string userType, string authenticationScheme,
             { "aspnetcore.identity.authentication_scheme", authenticationScheme },
         };
         AddIsPersistent(ref tags, isPersistent);
-        AddExceptionTags(ref tags, exception);
+        AddErrorTag(ref tags, exception);
 
         _signInUserPrincipalCounter.Add(1, tags);
     }
@@ -104,7 +104,7 @@ internal void SignOutUserPrincipal(string userType, string authenticationScheme,
             { "aspnetcore.identity.user_type", userType },
             { "aspnetcore.identity.authentication_scheme", authenticationScheme },
         };
-        AddExceptionTags(ref tags, exception);
+        AddErrorTag(ref tags, exception);
 
         _signOutUserPrincipalCounter.Add(1, tags);
     }
@@ -121,7 +121,7 @@ internal void RememberTwoFactorClient(string userType, string authenticationSche
             { "aspnetcore.identity.user_type", userType },
             { "aspnetcore.identity.authentication_scheme", authenticationScheme }
         };
-        AddExceptionTags(ref tags, exception);
+        AddErrorTag(ref tags, exception);
 
         _rememberTwoFactorClientCounter.Add(1, tags);
     }
@@ -138,7 +138,7 @@ internal void ForgetTwoFactorClient(string userType, string authenticationScheme
             { "aspnetcore.identity.user_type", userType },
             { "aspnetcore.identity.authentication_scheme", authenticationScheme }
         };
-        AddExceptionTags(ref tags, exception);
+        AddErrorTag(ref tags, exception);
 
         _forgetTwoFactorCounter.Add(1, tags);
     }
@@ -164,7 +164,7 @@ private static void AddSignInResult(ref TagList tags, SignInResult? result)
         }
     }
 
-    private static void AddExceptionTags(ref TagList tags, Exception? exception)
+    private static void AddErrorTag(ref TagList tags, Exception? exception)
     {
         if (exception != null)
         {
diff --git a/src/Identity/Extensions.Core/src/UserManagerMetrics.cs b/src/Identity/Extensions.Core/src/UserManagerMetrics.cs
@@ -32,9 +32,9 @@ internal sealed class UserManagerMetrics : IDisposable
     public UserManagerMetrics(IMeterFactory meterFactory)
     {
         _meter = meterFactory.Create(MeterName);
-        _createCounter = _meter.CreateCounter<long>(CreateCounterName, "{create}", "The number of users created.");
-        _updateCounter = _meter.CreateCounter<long>(UpdateCounterName, "{update}", "The number of user updates.");
-        _deleteCounter = _meter.CreateCounter<long>(DeleteCounterName, "{delete}", "The number of users deleted.");
+        _createCounter = _meter.CreateCounter<long>(CreateCounterName, "{user}", "The number of users created.");
+        _updateCounter = _meter.CreateCounter<long>(UpdateCounterName, "{user}", "The number of users updated.");
+        _deleteCounter = _meter.CreateCounter<long>(DeleteCounterName, "{user}", "The number of users deleted.");
         _checkPasswordCounter = _meter.CreateCounter<long>(CheckPasswordCounterName, "{check}", "The number of check password attempts. Only checks whether the password is valid and not whether the user account is in a state that can log in.");
         _verifyTokenCounter = _meter.CreateCounter<long>(VerifyTokenCounterName, "{count}", "The number of token verification attempts.");
         _generateTokenCounter = _meter.CreateCounter<long>(GenerateTokenCounterName, "{count}", "The number of token generation attempts.");
@@ -52,7 +52,7 @@ internal void CreateUser(string userType, IdentityResult? result, Exception? exc
             { "aspnetcore.identity.user_type", userType }
         };
         AddIdentityResultTags(ref tags, result);
-        AddExceptionTags(ref tags, exception, result: result);
+        AddErrorTag(ref tags, exception, result: result);
 
         _createCounter.Add(1, tags);
     }
@@ -70,7 +70,7 @@ internal void UpdateUser(string userType, IdentityResult? result, UserUpdateType
             { "aspnetcore.identity.user.update_type", GetUpdateType(updateType) },
         };
         AddIdentityResultTags(ref tags, result);
-        AddExceptionTags(ref tags, exception, result: result);
+        AddErrorTag(ref tags, exception, result: result);
 
         _updateCounter.Add(1, tags);
     }
@@ -87,7 +87,7 @@ internal void DeleteUser(string userType, IdentityResult? result, Exception? exc
             { "aspnetcore.identity.user_type", userType }
         };
         AddIdentityResultTags(ref tags, result);
-        AddExceptionTags(ref tags, exception, result: result);
+        AddErrorTag(ref tags, exception, result: result);
 
         _deleteCounter.Add(1, tags);
     }
@@ -107,7 +107,7 @@ internal void CheckPassword(string userType, bool? userMissing, PasswordVerifica
         {
             tags.Add("aspnetcore.identity.password_check_result", GetPasswordResult(result, passwordMissing: null, userMissing));
         }
-        AddExceptionTags(ref tags, exception);
+        AddErrorTag(ref tags, exception);
 
         _checkPasswordCounter.Add(1, tags);
     }
@@ -128,7 +128,7 @@ internal void VerifyToken(string userType, bool? result, string purpose, Excepti
         {
             tags.Add("aspnetcore.identity.token_verified", result == true ? "success" : "failure");
         }
-        AddExceptionTags(ref tags, exception);
+        AddErrorTag(ref tags, exception);
 
         _verifyTokenCounter.Add(1, tags);
     }
@@ -145,7 +145,7 @@ internal void GenerateToken(string userType, string purpose, Exception? exceptio
             { "aspnetcore.identity.user_type", userType },
             { "aspnetcore.identity.token_purpose", GetTokenPurpose(purpose) },
         };
-        AddExceptionTags(ref tags, exception);
+        AddErrorTag(ref tags, exception);
 
         _generateTokenCounter.Add(1, tags);
     }
@@ -187,7 +187,7 @@ private static void AddIdentityResultTags(ref TagList tags, IdentityResult? resu
         }
     }
 
-    private static void AddExceptionTags(ref TagList tags, Exception? exception, IdentityResult? result = null)
+    private static void AddErrorTag(ref TagList tags, Exception? exception, IdentityResult? result = null)
     {
         var value = exception?.GetType().FullName ?? result?.Errors.FirstOrDefault()?.Code;
         if (value != null)

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ internal void CheckPasswordSignIn(string userType, SignInResult? result, Excepti`
`49`	`49`	`{ "aspnetcore.identity.user_type", userType },`
`50`	`50`	`};`
`51`	`51`	`AddSignInResult(ref tags, result);`
`52`		`- AddExceptionTags(ref tags, exception);`
	`52`	`+ AddErrorTag(ref tags, exception);`
`53`	`53`
`54`	`54`	`_checkPasswordCounter.Add(1, tags);`
`55`	`55`	`}`
`@@ -69,7 +69,7 @@ internal void AuthenticateSignIn(string userType, string authenticationScheme, S`
`69`	`69`	`};`
`70`	`70`	`AddIsPersistent(ref tags, isPersistent);`
`71`	`71`	`AddSignInResult(ref tags, result);`
`72`		`- AddExceptionTags(ref tags, exception);`
	`72`	`+ AddErrorTag(ref tags, exception);`
`73`	`73`
`74`	`74`	`_authenticateCounter.Add(1, tags);`
`75`	`75`	`}`
`@@ -87,7 +87,7 @@ internal void SignInUserPrincipal(string userType, string authenticationScheme,`
`87`	`87`	`{ "aspnetcore.identity.authentication_scheme", authenticationScheme },`
`88`	`88`	`};`
`89`	`89`	`AddIsPersistent(ref tags, isPersistent);`
`90`		`- AddExceptionTags(ref tags, exception);`
	`90`	`+ AddErrorTag(ref tags, exception);`
`91`	`91`
`92`	`92`	`_signInUserPrincipalCounter.Add(1, tags);`
`93`	`93`	`}`
`@@ -104,7 +104,7 @@ internal void SignOutUserPrincipal(string userType, string authenticationScheme,`
`104`	`104`	`{ "aspnetcore.identity.user_type", userType },`
`105`	`105`	`{ "aspnetcore.identity.authentication_scheme", authenticationScheme },`
`106`	`106`	`};`
`107`		`- AddExceptionTags(ref tags, exception);`
	`107`	`+ AddErrorTag(ref tags, exception);`
`108`	`108`
`109`	`109`	`_signOutUserPrincipalCounter.Add(1, tags);`
`110`	`110`	`}`
`@@ -121,7 +121,7 @@ internal void RememberTwoFactorClient(string userType, string authenticationSche`
`121`	`121`	`{ "aspnetcore.identity.user_type", userType },`
`122`	`122`	`{ "aspnetcore.identity.authentication_scheme", authenticationScheme }`
`123`	`123`	`};`
`124`		`- AddExceptionTags(ref tags, exception);`
	`124`	`+ AddErrorTag(ref tags, exception);`
`125`	`125`
`126`	`126`	`_rememberTwoFactorClientCounter.Add(1, tags);`
`127`	`127`	`}`
`@@ -138,7 +138,7 @@ internal void ForgetTwoFactorClient(string userType, string authenticationScheme`
`138`	`138`	`{ "aspnetcore.identity.user_type", userType },`
`139`	`139`	`{ "aspnetcore.identity.authentication_scheme", authenticationScheme }`
`140`	`140`	`};`
`141`		`- AddExceptionTags(ref tags, exception);`
	`141`	`+ AddErrorTag(ref tags, exception);`
`142`	`142`
`143`	`143`	`_forgetTwoFactorCounter.Add(1, tags);`
`144`	`144`	`}`
`@@ -164,7 +164,7 @@ private static void AddSignInResult(ref TagList tags, SignInResult? result)`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`
`167`		`- private static void AddExceptionTags(ref TagList tags, Exception? exception)`
	`167`	`+ private static void AddErrorTag(ref TagList tags, Exception? exception)`
`168`	`168`	`{`
`169`	`169`	`if (exception != null)`
`170`	`170`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ internal sealed class UserManagerMetrics : IDisposable`
`32`	`32`	`public UserManagerMetrics(IMeterFactory meterFactory)`
`33`	`33`	`{`
`34`	`34`	`_meter = meterFactory.Create(MeterName);`
`35`		`- _createCounter = _meter.CreateCounter<long>(CreateCounterName, "{create}", "The number of users created.");`
`36`		`- _updateCounter = _meter.CreateCounter<long>(UpdateCounterName, "{update}", "The number of user updates.");`
`37`		`- _deleteCounter = _meter.CreateCounter<long>(DeleteCounterName, "{delete}", "The number of users deleted.");`
	`35`	`+ _createCounter = _meter.CreateCounter<long>(CreateCounterName, "{user}", "The number of users created.");`
	`36`	`+ _updateCounter = _meter.CreateCounter<long>(UpdateCounterName, "{user}", "The number of users updated.");`
	`37`	`+ _deleteCounter = _meter.CreateCounter<long>(DeleteCounterName, "{user}", "The number of users deleted.");`
`38`	`38`	`_checkPasswordCounter = _meter.CreateCounter<long>(CheckPasswordCounterName, "{check}", "The number of check password attempts. Only checks whether the password is valid and not whether the user account is in a state that can log in.");`
`39`	`39`	`_verifyTokenCounter = _meter.CreateCounter<long>(VerifyTokenCounterName, "{count}", "The number of token verification attempts.");`
`40`	`40`	`_generateTokenCounter = _meter.CreateCounter<long>(GenerateTokenCounterName, "{count}", "The number of token generation attempts.");`
`@@ -52,7 +52,7 @@ internal void CreateUser(string userType, IdentityResult? result, Exception? exc`
`52`	`52`	`{ "aspnetcore.identity.user_type", userType }`
`53`	`53`	`};`
`54`	`54`	`AddIdentityResultTags(ref tags, result);`
`55`		`- AddExceptionTags(ref tags, exception, result: result);`
	`55`	`+ AddErrorTag(ref tags, exception, result: result);`
`56`	`56`
`57`	`57`	`_createCounter.Add(1, tags);`
`58`	`58`	`}`
`@@ -70,7 +70,7 @@ internal void UpdateUser(string userType, IdentityResult? result, UserUpdateType`
`70`	`70`	`{ "aspnetcore.identity.user.update_type", GetUpdateType(updateType) },`
`71`	`71`	`};`
`72`	`72`	`AddIdentityResultTags(ref tags, result);`
`73`		`- AddExceptionTags(ref tags, exception, result: result);`
	`73`	`+ AddErrorTag(ref tags, exception, result: result);`
`74`	`74`
`75`	`75`	`_updateCounter.Add(1, tags);`
`76`	`76`	`}`
`@@ -87,7 +87,7 @@ internal void DeleteUser(string userType, IdentityResult? result, Exception? exc`
`87`	`87`	`{ "aspnetcore.identity.user_type", userType }`
`88`	`88`	`};`
`89`	`89`	`AddIdentityResultTags(ref tags, result);`
`90`		`- AddExceptionTags(ref tags, exception, result: result);`
	`90`	`+ AddErrorTag(ref tags, exception, result: result);`
`91`	`91`
`92`	`92`	`_deleteCounter.Add(1, tags);`
`93`	`93`	`}`
`@@ -107,7 +107,7 @@ internal void CheckPassword(string userType, bool? userMissing, PasswordVerifica`
`107`	`107`	`{`
`108`	`108`	`tags.Add("aspnetcore.identity.password_check_result", GetPasswordResult(result, passwordMissing: null, userMissing));`
`109`	`109`	`}`
`110`		`- AddExceptionTags(ref tags, exception);`
	`110`	`+ AddErrorTag(ref tags, exception);`
`111`	`111`
`112`	`112`	`_checkPasswordCounter.Add(1, tags);`
`113`	`113`	`}`
`@@ -128,7 +128,7 @@ internal void VerifyToken(string userType, bool? result, string purpose, Excepti`
`128`	`128`	`{`
`129`	`129`	`tags.Add("aspnetcore.identity.token_verified", result == true ? "success" : "failure");`
`130`	`130`	`}`
`131`		`- AddExceptionTags(ref tags, exception);`
	`131`	`+ AddErrorTag(ref tags, exception);`
`132`	`132`
`133`	`133`	`_verifyTokenCounter.Add(1, tags);`
`134`	`134`	`}`
`@@ -145,7 +145,7 @@ internal void GenerateToken(string userType, string purpose, Exception? exceptio`
`145`	`145`	`{ "aspnetcore.identity.user_type", userType },`
`146`	`146`	`{ "aspnetcore.identity.token_purpose", GetTokenPurpose(purpose) },`
`147`	`147`	`};`
`148`		`- AddExceptionTags(ref tags, exception);`
	`148`	`+ AddErrorTag(ref tags, exception);`
`149`	`149`
`150`	`150`	`_generateTokenCounter.Add(1, tags);`
`151`	`151`	`}`
`@@ -187,7 +187,7 @@ private static void AddIdentityResultTags(ref TagList tags, IdentityResult? resu`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
`190`		`- private static void AddExceptionTags(ref TagList tags, Exception? exception, IdentityResult? result = null)`
	`190`	`+ private static void AddErrorTag(ref TagList tags, Exception? exception, IdentityResult? result = null)`
`191`	`191`	`{`
`192`	`192`	`var value = exception?.GetType().FullName ?? result?.Errors.FirstOrDefault()?.Code;`
`193`	`193`	`if (value != null)`