Instantiate metrics classes directly instead of registering in DI

Co-authored-by: JamesNK <[email protected]>

Author: Copilot

src/Identity/Core/src/IdentityBuilderExtensions.cs

@@ -45,7 +45,6 @@ private static void AddSignInManagerDeps(this IdentityBuilder builder)
         builder.Services.AddScoped(typeof(ISecurityStampValidator), typeof(SecurityStampValidator<>).MakeGenericType(builder.UserType));
         builder.Services.AddScoped(typeof(ITwoFactorSecurityStampValidator), typeof(TwoFactorSecurityStampValidator<>).MakeGenericType(builder.UserType));
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<SecurityStampValidatorOptions>, PostConfigureSecurityStampValidatorOptions>());
-        builder.Services.TryAddSingleton<SignInManagerMetrics>();
     }
 
     /// <summary>

src/Identity/Core/src/IdentityServiceCollectionExtensions.cs

@@ -103,7 +103,6 @@ public static class IdentityServiceCollectionExtensions
         services.TryAddScoped<IUserClaimsPrincipalFactory<TUser>, UserClaimsPrincipalFactory<TUser, TRole>>();
         services.TryAddScoped<IUserConfirmation<TUser>, DefaultUserConfirmation<TUser>>();
         services.TryAddScoped<IPasskeyHandler<TUser>, PasskeyHandler<TUser>>();
-        services.TryAddSingleton<SignInManagerMetrics>();
         services.TryAddScoped<UserManager<TUser>>();
         services.TryAddScoped<SignInManager<TUser>>();
         services.TryAddScoped<RoleManager<TRole>>();

src/Identity/Core/src/SignInManager.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Metrics;
 using System.Linq;
 using System.Security.Claims;
 using System.Text;
@@ -63,7 +64,9 @@ public SignInManager(UserManager<TUser> userManager,
         Logger = logger;
         _schemes = schemes;
         _confirmation = confirmation;
-        _metrics = userManager.ServiceProvider?.GetService<SignInManagerMetrics>();
+        
+        var meterFactory = userManager.ServiceProvider?.GetService<IMeterFactory>();
+        _metrics = meterFactory != null ? new SignInManagerMetrics(meterFactory) : null;
         _passkeyHandler = userManager.ServiceProvider?.GetService<IPasskeyHandler<TUser>>();
     }
 

src/Identity/Extensions.Core/src/IdentityServiceCollectionExtensions.cs

@@ -45,7 +45,6 @@ public static IdentityBuilder AddIdentityCore<TUser>(this IServiceCollection ser
         // No interface for the error describer so we can add errors without rev'ing the interface
         services.TryAddScoped<IdentityErrorDescriber>();
         services.TryAddScoped<IUserClaimsPrincipalFactory<TUser>, UserClaimsPrincipalFactory<TUser>>();
-        services.TryAddSingleton<UserManagerMetrics>();
         services.TryAddScoped<UserManager<TUser>>();
 
         if (setupAction != null)

src/Identity/Extensions.Core/src/UserManager.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Metrics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Claims;
@@ -85,7 +86,9 @@ public UserManager(IUserStore<TUser> store,
         ErrorDescriber = errors;
         Logger = logger;
         ServiceProvider = services;
-        _metrics = services?.GetService<UserManagerMetrics>();
+        
+        var meterFactory = services?.GetService<IMeterFactory>();
+        _metrics = meterFactory != null ? new UserManagerMetrics(meterFactory) : null;
 
         if (userValidators != null)
         {

src/Identity/test/Shared/MockHelpers.cs

@@ -22,7 +22,6 @@ public static Mock<UserManager<TUser>> MockUserManager<TUser>(
         var services = new ServiceCollection();
         if (meterFactory != null)
         {
-            services.AddSingleton<SignInManagerMetrics>();
             services.AddSingleton(meterFactory);
         }
         if (passkeyHandler != null)
@@ -61,8 +60,6 @@ public static UserManager<TUser> TestUserManager<TUser>(IUserStore<TUser> store
         var services = new ServiceCollection();
         if (meterFactory != null)
         {
-            services.AddSingleton<UserManagerMetrics>();
-            services.AddSingleton<SignInManagerMetrics>();
             services.AddSingleton(meterFactory);
         }
         var userManager = new UserManager<TUser>(store, options.Object, new PasswordHasher<TUser>(),