Identity metrics clean up (#62671)

JamesNK · web-flow · commit 1f0c98bb585e · 2025-07-19T13:49:17.000+08:00
diff --git a/src/Identity/Core/src/SignInManagerMetrics.cs b/src/Identity/Core/src/SignInManagerMetrics.cs
@@ -14,8 +14,8 @@ internal sealed class SignInManagerMetrics : IDisposable
     public const string RememberTwoFactorCounterName = "aspnetcore.identity.sign_in.remember_two_factor";
     public const string ForgetTwoFactorCounterName = "aspnetcore.identity.sign_in.forget_two_factor";
     public const string CheckPasswordCounterName = "aspnetcore.identity.sign_in.check_password";
-    public const string SignInUserPrincipalCounterName = "aspnetcore.identity.sign_in.sign_in_principal";
-    public const string SignOutUserPrincipalCounterName = "aspnetcore.identity.sign_in.sign_out_principal";
+    public const string SignInUserPrincipalCounterName = "aspnetcore.identity.sign_in.sign_in";
+    public const string SignOutUserPrincipalCounterName = "aspnetcore.identity.sign_in.sign_out";
 
     private readonly Meter _meter;
     private readonly Counter<long> _authenticateCounter;
@@ -29,12 +29,12 @@ public SignInManagerMetrics(IMeterFactory meterFactory)
     {
         _meter = meterFactory.Create(MeterName);
 
-        _authenticateCounter = _meter.CreateCounter<long>(AuthenticateCounterName, "count", "The number of authenticate attempts. The authenticate counter is incremented by sign in methods such as PasswordSignInAsync and TwoFactorSignInAsync.");
-        _rememberTwoFactorClientCounter = _meter.CreateCounter<long>(RememberTwoFactorCounterName, "count", "The number of two factor clients remembered.");
-        _forgetTwoFactorCounter = _meter.CreateCounter<long>(ForgetTwoFactorCounterName, "count", "The number of two factor clients forgotten.");
-        _checkPasswordCounter = _meter.CreateCounter<long>(CheckPasswordCounterName, "count", "The number of check password attempts. Checks that the account is in a state that can log in and that the password is valid using the UserManager.CheckPasswordAsync method.");
-        _signInUserPrincipalCounter = _meter.CreateCounter<long>(SignInUserPrincipalCounterName, "count", "The number of calls to sign in user principals.");
-        _signOutUserPrincipalCounter = _meter.CreateCounter<long>(SignOutUserPrincipalCounterName, "count", "The number of calls to sign out user principals.");
+        _authenticateCounter = _meter.CreateCounter<long>(AuthenticateCounterName, "{count}", "The number of authenticate attempts. The authenticate counter is incremented by sign in methods such as PasswordSignInAsync and TwoFactorSignInAsync.");
+        _rememberTwoFactorClientCounter = _meter.CreateCounter<long>(RememberTwoFactorCounterName, "{count}", "The number of two factor clients remembered.");
+        _forgetTwoFactorCounter = _meter.CreateCounter<long>(ForgetTwoFactorCounterName, "{count}", "The number of two factor clients forgotten.");
+        _checkPasswordCounter = _meter.CreateCounter<long>(CheckPasswordCounterName, "{check}", "The number of check password attempts. Checks that the account is in a state that can log in and that the password is valid using the UserManager.CheckPasswordAsync method.");
+        _signInUserPrincipalCounter = _meter.CreateCounter<long>(SignInUserPrincipalCounterName, "{sign_in}", "The number of calls to sign in user principals.");
+        _signOutUserPrincipalCounter = _meter.CreateCounter<long>(SignOutUserPrincipalCounterName, "{sign_out}", "The number of calls to sign out user principals.");
     }
 
     internal void CheckPasswordSignIn(string userType, SignInResult? result, Exception? exception = null)
@@ -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)
         {
@@ -182,7 +182,7 @@ private static string GetSignInType(SignInType signInType)
             SignInType.TwoFactor => "two_factor",
             SignInType.External => "external",
             SignInType.Passkey => "passkey",
-            _ => "_UNKNOWN"
+            _ => "_OTHER"
         };
     }
 
diff --git a/src/Identity/Extensions.Core/src/UserManagerMetrics.cs b/src/Identity/Extensions.Core/src/UserManagerMetrics.cs
@@ -32,12 +32,12 @@ internal sealed class UserManagerMetrics : IDisposable
     public UserManagerMetrics(IMeterFactory meterFactory)
     {
         _meter = meterFactory.Create(MeterName);
-        _createCounter = _meter.CreateCounter<long>(CreateCounterName, "count", "The number of users created.");
-        _updateCounter = _meter.CreateCounter<long>(UpdateCounterName, "count", "The number of user updates.");
-        _deleteCounter = _meter.CreateCounter<long>(DeleteCounterName, "count", "The number of users deleted.");
-        _checkPasswordCounter = _meter.CreateCounter<long>(CheckPasswordCounterName, "count", "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.");
+        _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.");
     }
 
     internal void CreateUser(string userType, IdentityResult? result, Exception? exception = null)
@@ -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);
+        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);
+        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);
+        AddErrorTag(ref tags, exception, result: result);
 
         _deleteCounter.Add(1, tags);
     }
@@ -105,9 +105,9 @@ internal void CheckPassword(string userType, bool? userMissing, PasswordVerifica
         };
         if (userMissing != null || result != null)
         {
-            tags.Add("aspnetcore.identity.user.password_result", GetPasswordResult(result, passwordMissing: null, userMissing));
+            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,14 +145,14 @@ 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);
     }
 
     private static string GetTokenPurpose(string purpose)
     {
-        // Purpose could be any value and can't be used as a tag value. However, there are known purposes
+        // Purpose could be any value and can't be used directly as a tag value. However, there are known purposes
         // on UserManager that we can detect and use as a tag value. Some could have a ':' in them followed by user data.
         // We need to trim them to content before ':' and then match to known values.
         ReadOnlySpan<char> trimmedPurpose = purpose;
@@ -161,15 +161,16 @@ private static string GetTokenPurpose(string purpose)
         {
             trimmedPurpose = purpose.AsSpan(0, colonIndex);
         }
-        
+
+        // These are known purposes that are specified in ASP.NET Core Identity.
         return trimmedPurpose switch
         {
             "ResetPassword" => "reset_password",
             "ChangePhoneNumber" => "change_phone_number",
             "EmailConfirmation" => "email_confirmation",
             "ChangeEmail" => "change_email",
             "TwoFactor" => "two_factor",
-            _ => "_UNKNOWN"
+            _ => "_OTHER"
         };
     }
 
@@ -183,15 +184,16 @@ private static void AddIdentityResultTags(ref TagList tags, IdentityResult? resu
         tags.Add("aspnetcore.identity.result", result.Succeeded ? "success" : "failure");
         if (!result.Succeeded && result.Errors.FirstOrDefault()?.Code is { Length: > 0 } code)
         {
-            tags.Add("aspnetcore.identity.result_error_code", code);
+            tags.Add("aspnetcore.identity.error_code", code);
         }
     }
 
-    private static void AddExceptionTags(ref TagList tags, Exception? exception)
+    private static void AddErrorTag(ref TagList tags, Exception? exception, IdentityResult? result = null)
     {
-        if (exception != null)
+        var value = exception?.GetType().FullName ?? result?.Errors.FirstOrDefault()?.Code;
+        if (value != null)
         {
-            tags.Add("error.type", exception.GetType().FullName!);
+            tags.Add("error.type", value);
         }
     }
 
@@ -204,7 +206,7 @@ private static string GetPasswordResult(PasswordVerificationResult? result, bool
             (PasswordVerificationResult.Failed, false, false) => "failure",
             (null, true, false) => "password_missing",
             (null, false, true) => "user_missing",
-            _ => "_UNKNOWN"
+            _ => "_OTHER"
         };
     }
 
@@ -244,7 +246,7 @@ private static string GetUpdateType(UserUpdateType updateType)
             UserUpdateType.RedeemTwoFactorRecoveryCode => "redeem_two_factor_recovery_code",
             UserUpdateType.SetPasskey => "set_passkey",
             UserUpdateType.RemovePasskey => "remove_passkey",
-            _ => "_UNKNOWN"
+            _ => "_OTHER"
         };
     }
 
diff --git a/src/Identity/test/Identity.Test/UserManagerTest.cs b/src/Identity/test/Identity.Test/UserManagerTest.cs
@@ -174,7 +174,7 @@ public async Task DeleteCallsStore_Failure()
             [
                 KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
                 KeyValuePair.Create<string, object>("aspnetcore.identity.result", "failure"),
-                KeyValuePair.Create<string, object>("aspnetcore.identity.result_error_code", "ConcurrencyFailure")
+                KeyValuePair.Create<string, object>("aspnetcore.identity.error_code", "ConcurrencyFailure")
             ]));
     }
 
@@ -664,7 +664,7 @@ public async Task CheckPasswordWillRehashPasswordWhenNeeded()
         Assert.Collection(checkPassword.GetMeasurementSnapshot(),
             m => MetricsHelpers.AssertContainsTags(m.Tags,
             [
-                KeyValuePair.Create<string, object>("aspnetcore.identity.user.password_result", "success_rehash_needed")
+                KeyValuePair.Create<string, object>("aspnetcore.identity.password_check_result", "success_rehash_needed")
             ]));
     }
 
@@ -871,7 +871,7 @@ public async Task CheckPasswordWithNullUserReturnsFalse()
         Assert.Collection(checkPassword.GetMeasurementSnapshot(),
             m => MetricsHelpers.AssertContainsTags(m.Tags,
             [
-                KeyValuePair.Create<string, object>("aspnetcore.identity.user.password_result", "user_missing")
+                KeyValuePair.Create<string, object>("aspnetcore.identity.password_check_result", "user_missing")
             ]));
     }
 
@@ -952,13 +952,13 @@ await Assert.ThrowsAsync<NotSupportedException>(
         Assert.Collection(generateToken.GetMeasurementSnapshot(),
             m => MetricsHelpers.AssertContainsTags(m.Tags,
             [
-                KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_UNKNOWN"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_OTHER"),
                 KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
             ]));
         Assert.Collection(verifyToken.GetMeasurementSnapshot(),
             m => MetricsHelpers.AssertContainsTags(m.Tags,
             [
-                KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_UNKNOWN"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_OTHER"),
                 KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),
             ]));
     }

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ 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, "count", "The number of users created.");`
`36`		`- _updateCounter = _meter.CreateCounter<long>(UpdateCounterName, "count", "The number of user updates.");`
`37`		`- _deleteCounter = _meter.CreateCounter<long>(DeleteCounterName, "count", "The number of users deleted.");`
`38`		`- _checkPasswordCounter = _meter.CreateCounter<long>(CheckPasswordCounterName, "count", "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`		`- _verifyTokenCounter = _meter.CreateCounter<long>(VerifyTokenCounterName, "count", "The number of token verification attempts.");`
`40`		`- _generateTokenCounter = _meter.CreateCounter<long>(GenerateTokenCounterName, "count", "The number of token generation attempts.");`
	`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`	`+ _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`	`+ _verifyTokenCounter = _meter.CreateCounter<long>(VerifyTokenCounterName, "{count}", "The number of token verification attempts.");`
	`40`	`+ _generateTokenCounter = _meter.CreateCounter<long>(GenerateTokenCounterName, "{count}", "The number of token generation attempts.");`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`internal void CreateUser(string userType, IdentityResult? result, Exception? exception = null)`
`@@ -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);`
	`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);`
	`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);`
	`90`	`+ AddErrorTag(ref tags, exception, result: result);`
`91`	`91`
`92`	`92`	`_deleteCounter.Add(1, tags);`
`93`	`93`	`}`
`@@ -105,9 +105,9 @@ internal void CheckPassword(string userType, bool? userMissing, PasswordVerifica`
`105`	`105`	`};`
`106`	`106`	`if (userMissing != null \|\| result != null)`
`107`	`107`	`{`
`108`		`- tags.Add("aspnetcore.identity.user.password_result", GetPasswordResult(result, passwordMissing: null, userMissing));`
	`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,14 +145,14 @@ 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`	`}`
`152`	`152`
`153`	`153`	`private static string GetTokenPurpose(string purpose)`
`154`	`154`	`{`
`155`		`- // Purpose could be any value and can't be used as a tag value. However, there are known purposes`
	`155`	`+ // Purpose could be any value and can't be used directly as a tag value. However, there are known purposes`
`156`	`156`	`// on UserManager that we can detect and use as a tag value. Some could have a ':' in them followed by user data.`
`157`	`157`	`// We need to trim them to content before ':' and then match to known values.`
`158`	`158`	`ReadOnlySpan<char> trimmedPurpose = purpose;`
`@@ -161,15 +161,16 @@ private static string GetTokenPurpose(string purpose)`
`161`	`161`	`{`
`162`	`162`	`trimmedPurpose = purpose.AsSpan(0, colonIndex);`
`163`	`163`	`}`
`164`		`-`
	`164`	`+`
	`165`	`+ // These are known purposes that are specified in ASP.NET Core Identity.`
`165`	`166`	`return trimmedPurpose switch`
`166`	`167`	`{`
`167`	`168`	`"ResetPassword" => "reset_password",`
`168`	`169`	`"ChangePhoneNumber" => "change_phone_number",`
`169`	`170`	`"EmailConfirmation" => "email_confirmation",`
`170`	`171`	`"ChangeEmail" => "change_email",`
`171`	`172`	`"TwoFactor" => "two_factor",`
`172`		`- _ => "_UNKNOWN"`
	`173`	`+ _ => "_OTHER"`
`173`	`174`	`};`
`174`	`175`	`}`
`175`	`176`
`@@ -183,15 +184,16 @@ private static void AddIdentityResultTags(ref TagList tags, IdentityResult? resu`
`183`	`184`	`tags.Add("aspnetcore.identity.result", result.Succeeded ? "success" : "failure");`
`184`	`185`	`if (!result.Succeeded && result.Errors.FirstOrDefault()?.Code is { Length: > 0 } code)`
`185`	`186`	`{`
`186`		`- tags.Add("aspnetcore.identity.result_error_code", code);`
	`187`	`+ tags.Add("aspnetcore.identity.error_code", code);`
`187`	`188`	`}`
`188`	`189`	`}`
`189`	`190`
`190`		`- private static void AddExceptionTags(ref TagList tags, Exception? exception)`
	`191`	`+ private static void AddErrorTag(ref TagList tags, Exception? exception, IdentityResult? result = null)`
`191`	`192`	`{`
`192`		`- if (exception != null)`
	`193`	`+ var value = exception?.GetType().FullName ?? result?.Errors.FirstOrDefault()?.Code;`
	`194`	`+ if (value != null)`
`193`	`195`	`{`
`194`		`- tags.Add("error.type", exception.GetType().FullName!);`
	`196`	`+ tags.Add("error.type", value);`
`195`	`197`	`}`
`196`	`198`	`}`
`197`	`199`
`@@ -204,7 +206,7 @@ private static string GetPasswordResult(PasswordVerificationResult? result, bool`
`204`	`206`	`(PasswordVerificationResult.Failed, false, false) => "failure",`
`205`	`207`	`(null, true, false) => "password_missing",`
`206`	`208`	`(null, false, true) => "user_missing",`
`207`		`- _ => "_UNKNOWN"`
	`209`	`+ _ => "_OTHER"`
`208`	`210`	`};`
`209`	`211`	`}`
`210`	`212`
`@@ -244,7 +246,7 @@ private static string GetUpdateType(UserUpdateType updateType)`
`244`	`246`	`UserUpdateType.RedeemTwoFactorRecoveryCode => "redeem_two_factor_recovery_code",`
`245`	`247`	`UserUpdateType.SetPasskey => "set_passkey",`
`246`	`248`	`UserUpdateType.RemovePasskey => "remove_passkey",`
`247`		`- _ => "_UNKNOWN"`
	`249`	`+ _ => "_OTHER"`
`248`	`250`	`};`
`249`	`251`	`}`
`250`	`252`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public async Task DeleteCallsStore_Failure()`
`174`	`174`	`[`
`175`	`175`	`KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),`
`176`	`176`	`KeyValuePair.Create<string, object>("aspnetcore.identity.result", "failure"),`
`177`		`- KeyValuePair.Create<string, object>("aspnetcore.identity.result_error_code", "ConcurrencyFailure")`
	`177`	`+ KeyValuePair.Create<string, object>("aspnetcore.identity.error_code", "ConcurrencyFailure")`
`178`	`178`	`]));`
`179`	`179`	`}`
`180`	`180`
`@@ -664,7 +664,7 @@ public async Task CheckPasswordWillRehashPasswordWhenNeeded()`
`664`	`664`	`Assert.Collection(checkPassword.GetMeasurementSnapshot(),`
`665`	`665`	`m => MetricsHelpers.AssertContainsTags(m.Tags,`
`666`	`666`	`[`
`667`		`- KeyValuePair.Create<string, object>("aspnetcore.identity.user.password_result", "success_rehash_needed")`
	`667`	`+ KeyValuePair.Create<string, object>("aspnetcore.identity.password_check_result", "success_rehash_needed")`
`668`	`668`	`]));`
`669`	`669`	`}`
`670`	`670`
`@@ -871,7 +871,7 @@ public async Task CheckPasswordWithNullUserReturnsFalse()`
`871`	`871`	`Assert.Collection(checkPassword.GetMeasurementSnapshot(),`
`872`	`872`	`m => MetricsHelpers.AssertContainsTags(m.Tags,`
`873`	`873`	`[`
`874`		`- KeyValuePair.Create<string, object>("aspnetcore.identity.user.password_result", "user_missing")`
	`874`	`+ KeyValuePair.Create<string, object>("aspnetcore.identity.password_check_result", "user_missing")`
`875`	`875`	`]));`
`876`	`876`	`}`
`877`	`877`
`@@ -952,13 +952,13 @@ await Assert.ThrowsAsync<NotSupportedException>(`
`952`	`952`	`Assert.Collection(generateToken.GetMeasurementSnapshot(),`
`953`	`953`	`m => MetricsHelpers.AssertContainsTags(m.Tags,`
`954`	`954`	`[`
`955`		`- KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_UNKNOWN"),`
	`955`	`+ KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_OTHER"),`
`956`	`956`	`KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),`
`957`	`957`	`]));`
`958`	`958`	`Assert.Collection(verifyToken.GetMeasurementSnapshot(),`
`959`	`959`	`m => MetricsHelpers.AssertContainsTags(m.Tags,`
`960`	`960`	`[`
`961`		`- KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_UNKNOWN"),`
	`961`	`+ KeyValuePair.Create<string, object>("aspnetcore.identity.token_purpose", "_OTHER"),`
`962`	`962`	`KeyValuePair.Create<string, object>("error.type", "System.NotSupportedException"),`
`963`	`963`	`]));`
`964`	`964`	`}`