Merge Changes

Author: Ruben Cerna

src/Service/Startup.cs

@@ -149,10 +149,7 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddSingleton(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(RuntimeConfigValidator).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.RUNTIMECONFIGVALIDATORFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.RUNTIME_CONFIG_VALIDATOR_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(RuntimeConfigValidator).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<RuntimeConfigValidator>();
             });
@@ -164,30 +161,21 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddSingleton<ILogger<SqlQueryEngine>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(SqlQueryEngine).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.SQLQUERYENGINEFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.SQL_QUERY_ENGINE_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(SqlQueryEngine).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<SqlQueryEngine>();
             });
 
             services.AddSingleton<ILogger<IQueryExecutor>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(IQueryExecutor).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.IQUERYEXECUTORFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.IQUERY_EXECUTOR_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(IQueryExecutor).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<IQueryExecutor>();
             });
 
             services.AddSingleton<ILogger<ISqlMetadataProvider>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(ISqlMetadataProvider).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.ISQLMETADATAPROVIDERFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.ISQL_METADATA_PROVIDER_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(ISqlMetadataProvider).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<ISqlMetadataProvider>();
             });
@@ -212,51 +200,36 @@ public void ConfigureServices(IServiceCollection services)
             // ILogger explicit creation required for logger to use --LogLevel startup argument specified.
             services.AddSingleton<ILogger<BasicHealthReportResponseWriter>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(BasicHealthReportResponseWriter).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.BASICHEALTHREPORTRESPONSEWRITERFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.BASIC_HEALTH_REPORT_RESPONSE_WRITER_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(BasicHealthReportResponseWriter).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<BasicHealthReportResponseWriter>();
             });
 
             // ILogger explicit creation required for logger to use --LogLevel startup argument specified.
             services.AddSingleton<ILogger<ComprehensiveHealthReportResponseWriter>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(ComprehensiveHealthReportResponseWriter).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.COMPREHENSIVEHEALTHREPORTRESPONSEWRITERFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.COMPREHENSIVE_HEALTH_REPORT_RESPONSE_WRITER_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(ComprehensiveHealthReportResponseWriter).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<ComprehensiveHealthReportResponseWriter>();
             });
 
             services.AddSingleton<ILogger<RestController>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(RestController).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.RESTCONTROLLERFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.REST_CONTROLLER_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(RestController).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<RestController>();
             });
 
             services.AddSingleton<ILogger<ClientRoleHeaderAuthenticationMiddleware>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(ClientRoleHeaderAuthenticationMiddleware).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.CLIENTROLEHEADERAUTHENTICATIONMIDDLEWAREFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.CLIENT_ROLE_HEADER_AUTHENTICATION_MIDDLEWARE_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(ClientRoleHeaderAuthenticationMiddleware).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<ClientRoleHeaderAuthenticationMiddleware>();
             });
 
             services.AddSingleton<ILogger<ConfigurationController>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(ConfigurationController).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.CONFIGURATIONCONTROLLERFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.CONFIGURATION_CONTROLLER_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(ConfigurationController).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<ConfigurationController>();
             });
@@ -279,19 +252,13 @@ public void ConfigureServices(IServiceCollection services)
             services.AddAuthorization();
             services.AddSingleton<ILogger<IAuthorizationHandler>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(IAuthorizationHandler).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.IAUTHORIZATIONHANDLERFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.IAUTHORIZATION_HANDLER_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(IAuthorizationHandler).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<IAuthorizationHandler>();
             });
             services.AddSingleton<ILogger<IAuthorizationResolver>>(implementationFactory: (serviceProvider) =>
             {
-                ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, typeof(IAuthorizationResolver).FullName);
-                RuntimeConfigProvider configProvider = serviceProvider.GetRequiredService<RuntimeConfigProvider>();
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, configProvider, LoggerFilters.IAUTHORIZATIONRESOLVERFILTER, _hotReloadEventHandler);
-                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, LoggerFilters.IAUTHORIZATION_RESOLVER_FILTER, _hotReloadEventHandler);
+                LogLevelInitializer logLevelRuntime = new(MinimumLogLevel, typeof(IAuthorizationResolver).FullName, _hotReloadEventHandler);
                 ILoggerFactory? loggerFactory = CreateLoggerFactoryForHostedAndNonHostedScenario(serviceProvider, logLevelRuntime);
                 return loggerFactory.CreateLogger<IAuthorizationResolver>();
             });
@@ -568,11 +535,6 @@ private static void EvictGraphQLSchema(IRequestExecutorResolver requestExecutorR
         /// </summary>
         public static ILoggerFactory CreateLoggerFactoryForHostedAndNonHostedScenario(IServiceProvider serviceProvider, LogLevelInitializer logLevelInitializer)
         {
-            if (loggerFilter == null)
-            {
-                loggerFilter = string.Empty;
-            }
-
             if (!IsLogLevelOverriddenByCli)
             {
                 // If the log level is not overridden by command line arguments specified through CLI,

src/Service/Telemetry/LogLevelInitializer.cs

@@ -16,11 +16,18 @@ public class LogLevelInitializer
 
         public LogLevel MinLogLevel { get; private set; }
 
-        public LogLevelInitializer(LogLevel logLevel, string loggerFilter, HotReloadEventHandler<HotReloadEventArgs>? handler)
+        public LogLevelInitializer(LogLevel logLevel, string? loggerFilter, HotReloadEventHandler<HotReloadEventArgs>? handler)
         {
             handler?.Subscribe(LOG_LEVEL_INITIALIZER_ON_CONFIG_CHANGE, OnConfigChanged);
             MinLogLevel = logLevel;
-            _loggerFilter = loggerFilter;
+            if (loggerFilter != null)
+            {
+                _loggerFilter = loggerFilter;
+            }
+            else
+            {
+                _loggerFilter = string.Empty;
+            }
         }
 
         public void SetLogLevel()