Updates

Author: JamesNK

src/Identity/Core/src/SignInManager.cs

@@ -304,18 +304,20 @@ public virtual async Task SignInWithClaimsAsync(TUser user, AuthenticationProper
             {
                 userPrincipal.Identities.First().AddClaim(claim);
             }
+
+            authenticationProperties ??= new AuthenticationProperties();
             await Context.SignInAsync(AuthenticationScheme,
                 userPrincipal,
-                authenticationProperties ?? new AuthenticationProperties());
+                authenticationProperties);
 
             // This is useful for updating claims immediately when hitting MapIdentityApi's /account/info endpoint with cookies.
             Context.User = userPrincipal;
 
-            _metrics?.SignInUserPrincipal(typeof(TUser).FullName!, AuthenticationScheme);
+            _metrics?.SignInUserPrincipal(typeof(TUser).FullName!, AuthenticationScheme, authenticationProperties.IsPersistent);
         }
         catch (Exception ex)
         {
-            _metrics?.SignInUserPrincipal(typeof(TUser).FullName!, AuthenticationScheme, ex);
+            _metrics?.SignInUserPrincipal(typeof(TUser).FullName!, AuthenticationScheme, isPersistent: null, ex);
             throw;
         }
     }

src/Identity/Core/src/SignInManagerMetrics.cs

@@ -33,8 +33,8 @@ public SignInManagerMetrics(IMeterFactory meterFactory)
         _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 user principals signed in.");
-        _signOutUserPrincipalCounter = _meter.CreateCounter<long>(SignOutUserPrincipalCounterName, "count", "The number of user principals signed out.");
+        _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.");
     }
 
     internal void CheckPasswordSignIn(string userType, SignInResult? result, Exception? exception = null)
@@ -67,17 +67,14 @@ internal void AuthenticateSignIn(string userType, string authenticationScheme, S
             { "aspnetcore.identity.authentication_scheme", authenticationScheme },
             { "aspnetcore.identity.sign_in.type", GetSignInType(signInType) },
         };
-        if (isPersistent != null)
-        {
-            tags.Add("aspnetcore.identity.sign_in.is_persistent", isPersistent.Value);
-        }
+        AddIsPersistent(ref tags, isPersistent);
         AddSignInResult(ref tags, result);
         AddExceptionTags(ref tags, exception);
 
         _authenticateCounter.Add(1, tags);
     }
 
-    internal void SignInUserPrincipal(string userType, string authenticationScheme, Exception? exception = null)
+    internal void SignInUserPrincipal(string userType, string authenticationScheme, bool? isPersistent, Exception? exception = null)
     {
         if (!_signInUserPrincipalCounter.Enabled)
         {
@@ -89,6 +86,7 @@ internal void SignInUserPrincipal(string userType, string authenticationScheme,
             { "aspnetcore.identity.user_type", userType },
             { "aspnetcore.identity.authentication_scheme", authenticationScheme },
         };
+        AddIsPersistent(ref tags, isPersistent);
         AddExceptionTags(ref tags, exception);
 
         _signInUserPrincipalCounter.Add(1, tags);
@@ -150,6 +148,14 @@ public void Dispose()
         _meter.Dispose();
     }
 
+    private static void AddIsPersistent(ref TagList tags, bool? isPersistent)
+    {
+        if (isPersistent != null)
+        {
+            tags.Add("aspnetcore.identity.sign_in.is_persistent", isPersistent.Value);
+        }
+    }
+
     private static void AddSignInResult(ref TagList tags, SignInResult? result)
     {
         if (result != null)

src/Identity/test/Identity.Test/SignInManagerTest.cs

@@ -405,6 +405,7 @@ public async Task ExternalSignInRequiresVerificationIfNotBypassed(bool bypass)
                 [
                     KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
                     KeyValuePair.Create<string, object>("aspnetcore.identity.authentication_scheme", "Identity.Application"),
+                    KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.is_persistent", false),
                 ]));
         }
         else
@@ -471,6 +472,7 @@ public async Task CanPasskeySignIn()
             [
                 KeyValuePair.Create<string, object>("aspnetcore.identity.user_type", "Microsoft.AspNetCore.Identity.Test.PocoUser"),
                 KeyValuePair.Create<string, object>("aspnetcore.identity.authentication_scheme", "Identity.Application"),
+                KeyValuePair.Create<string, object>("aspnetcore.identity.sign_in.is_persistent", false),
             ]));
     }