Use IDiagnosticsSource for automatic RequireOrganizationTenantPolicy logs (#6871)

Author: Scott Bommarito

src/NuGetGallery/Services/UserService.cs

@@ -12,6 +12,7 @@
 using NuGet.Services.Entities;
 using NuGetGallery.Auditing;
 using NuGetGallery.Configuration;
+using NuGetGallery.Diagnostics;
 using NuGetGallery.Infrastructure.Authentication;
 using NuGetGallery.Security;
 using Crypto = NuGetGallery.CryptographyService;
@@ -40,7 +41,7 @@ public class UserService : IUserService
 
         public ITelemetryService TelemetryService { get; protected set; }
 
-        public ILogger<UserService> Logger { get; protected set; }
+        public IDiagnosticsSource DiagnosticsSource { get; protected set; }
 
         protected UserService() { }
 
@@ -56,7 +57,7 @@ public UserService(
             IDateTimeProvider dateTimeProvider,
             ICredentialBuilder credentialBuilder,
             ITelemetryService telemetryService,
-            ILogger<UserService> logger)
+            IDiagnosticsService diagnosticsService)
             : this()
         {
             Config = config;
@@ -69,7 +70,7 @@ public UserService(
             SecurityPolicyService = securityPolicyService;
             DateTimeProvider = dateTimeProvider;
             TelemetryService = telemetryService;
-            Logger = logger;
+            DiagnosticsSource = diagnosticsService.SafeGetSource(nameof(UserService));
         }
 
         public async Task<MembershipRequest> AddMembershipRequestAsync(Organization organization, string memberName, bool isAdmin)
@@ -598,19 +599,19 @@ private async Task SubscribeOrganizationToTenantPolicyIfTenantIdIsSupported(User
             var tenantId = adminUser.Credentials.GetAzureActiveDirectoryCredential()?.TenantId;
             if (string.IsNullOrEmpty(tenantId))
             {
-                Logger.LogInformation("Will not apply tenant policy to organization because admin user does not have an AAD credential.");
+                DiagnosticsSource.LogInformation("Will not apply tenant policy to organization because admin user does not have an AAD credential.");
                 return;
             }
 
             if (!ContentObjectService.LoginDiscontinuationConfiguration.IsTenantIdPolicySupportedForOrganization(
                 organization.EmailAddress ?? organization.UnconfirmedEmailAddress, 
                 tenantId))
             {
-                Logger.LogInformation("Will not apply tenant policy to organization because policy is not supported for email-tenant pair.");
+                DiagnosticsSource.LogInformation("Will not apply tenant policy to organization because policy is not supported for email-tenant pair.");
                 return;
             }
 
-            Logger.LogInformation("Applying tenant policy to organization.");
+            DiagnosticsSource.LogInformation("Applying tenant policy to organization.");
             var tenantPolicy = RequireOrganizationTenantPolicy.Create(tenantId);
             await SecurityPolicyService.SubscribeAsync(organization, tenantPolicy, commitChanges);
         }

tests/NuGetGallery.Facts/TestUtils/TestServiceUtility.cs

@@ -5,10 +5,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using Microsoft.Extensions.Logging;
 using Moq;
 using NuGet.Services.Entities;
 using NuGetGallery.Configuration;
+using NuGetGallery.Diagnostics;
 using NuGetGallery.Framework;
 using NuGetGallery.Security;
 
@@ -26,7 +26,7 @@ public class TestableUserService : UserService
         public Mock<IContentObjectService> MockConfigObjectService { get; protected set; }
         public Mock<IDateTimeProvider> MockDateTimeProvider { get; protected set; }
         public Mock<ITelemetryService> MockTelemetryService { get; protected set; }
-        public Mock<ILogger<TestableUserService>> MockLogger { get; protected set; }
+        public Mock<IDiagnosticsSource> MockDiagnosticsSource { get; protected set; }
 
         public TestableUserService()
         {
@@ -40,7 +40,7 @@ public TestableUserService()
             DateTimeProvider = (MockDateTimeProvider = new Mock<IDateTimeProvider>()).Object;
             Auditing = new TestAuditingService();
             TelemetryService = (MockTelemetryService = new Mock<ITelemetryService>()).Object;
-            Logger = (MockLogger = new Mock<ILogger<TestableUserService>>()).Object;
+            DiagnosticsSource = (MockDiagnosticsSource = new Mock<IDiagnosticsSource>()).Object;
 
             // Set ConfirmEmailAddress to a default of true
             MockConfig.Setup(c => c.ConfirmEmailAddresses).Returns(true);