clean code

Author: Manikanta Nallagatla

src/WebJobs.Script.WebHost/Diagnostics/AzureMonitorDiagnosticLogger.cs

@@ -54,8 +54,7 @@ public AzureMonitorDiagnosticLogger(string category, string hostInstanceId, IEve
 
         public bool IsEnabled(LogLevel logLevel)
         {
-            if ((_environment.IsFlexConsumptionSku() || _environment.IsLinuxConsumptionOnLegion())
-                && !_environment.IsAzureMonitorEnabledOnLegionSkus())
+            if (_environment.IsLegionBasedSku() && !_environment.IsAzureMonitorEnabled(useCache:true))
             {
                 return false;
             }

src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs

@@ -95,7 +95,9 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP
                     loggingBuilder.AddWebJobsSystem<SystemLoggerProvider>();
                     if (environment.IsAzureMonitorEnabled())
                     {
-                        loggingBuilder.Services.AddOptions<LoggerFilterOptions>()
+                        if (environment.IsLegionBasedSku())
+                        {
+                            loggingBuilder.Services.AddOptions<LoggerFilterOptions>()
                             .Configure<IConfiguration>((options, config) =>
                             {
                                 string setting = config[EnvironmentSettingNames.AzureMonitorCategories];
@@ -109,8 +111,11 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP
                                     return categories.Contains(ScriptConstants.AzureMonitorTraceCategory);
                                 });
                             });
-
-                        loggingBuilder.Services.AddSingleton<ILoggerProvider, AzureMonitorDiagnosticLoggerProvider>();
+                        }
+                        else
+                        {
+                            loggingBuilder.Services.AddSingleton<ILoggerProvider, AzureMonitorDiagnosticLoggerProvider>();
+                        }
                     }
 
                     if (!FeatureFlags.IsEnabled(ScriptConstants.FeatureFlagDisableDiagnosticEventLogging))

src/WebJobs.Script/Environment/EnvironmentExtensions.cs

@@ -68,21 +68,7 @@ public static bool IsEasyAuthEnabled(this IEnvironment environment)
         /// <summary>
         /// Returns true if any Functions AzureMonitor log categories are enabled.
         /// </summary>
-        public static bool IsAzureMonitorEnabled(this IEnvironment environment)
-        {
-            string value = environment.GetEnvironmentVariable(AzureMonitorCategories);
-            if (value == null)
-            {
-                return true;
-            }
-            string[] categories = value.Split(',');
-            return categories.Contains(ScriptConstants.AzureMonitorTraceCategory);
-        }
-
-        /// <summary>
-        /// Returns true if any Functions AzureMonitor log categories are enabled on legion based SKUs.
-        /// </summary>
-        public static bool IsAzureMonitorEnabledOnLegionSkus(this IEnvironment environment)
+        public static bool IsAzureMonitorEnabled(this IEnvironment environment, bool useCache=false)
         {
             string value = environment.GetEnvironmentVariable(AzureMonitorCategories);
             if (value == null)
@@ -95,13 +81,12 @@ public static bool IsAzureMonitorEnabledOnLegionSkus(this IEnvironment environme
                 // This is set when customer does not subscribe any category.
                 return false;
             }
-            // If control came here, it means customer has subscribed to someazure monitor log categories.
-            // So, cache whether FunctionsLogs category is subscribed.
-            if (isAzureMonitorLogsSubscribed == null)
+            if (useCache && isAzureMonitorLogsSubscribed != null)
             {
-                string[] categories = value.Split(',');
-                isAzureMonitorLogsSubscribed = categories.Contains(ScriptConstants.AzureMonitorTraceCategory);
+                return isAzureMonitorLogsSubscribed.Value;
             }
+            string[] categories = value.Split(',');
+            isAzureMonitorLogsSubscribed = categories.Contains(ScriptConstants.AzureMonitorTraceCategory);
             return isAzureMonitorLogsSubscribed.Value;
         }
 
@@ -278,6 +263,16 @@ public static bool IsFlexConsumptionSku(this IEnvironment environment)
             return !environment.WebsiteSkuIsDynamic();
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the application is running in Legion.
+        /// </summary>
+        /// <param name="environment">The environment to verify.</param>
+        /// <returns><see cref="true"/> if running on legion, false otherwise.</returns>
+        public static bool IsLegionBasedSku(this IEnvironment environment)
+        {
+            return environment.IsFlexConsumptionSku() || environment.IsLinuxConsumptionOnLegion();
+        }
+
         /// <summary>
         /// Returns true if the app is running on Virtual Machine Scale Sets (VMSS).
         /// </summary>