Revert "temporarily disabling AzureMonitor logger"

This reverts commit e3cdda2.

Author: brettsam

src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs

@@ -14,6 +14,8 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Azure.WebJobs.Script.WebHost
 {
@@ -50,6 +52,21 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP
 
                     loggingBuilder.AddWebJobsSystem<SystemLoggerProvider>();
                     loggingBuilder.Services.AddSingleton<ILoggerProvider, UserLogMetricsLoggerProvider>();
+                    loggingBuilder.Services.AddSingleton<ILoggerProvider>(services =>
+                    {
+                        IEnvironment environment = services.GetService<IEnvironment>();
+                        IScriptWebHostEnvironment hostEnvironment = services.GetService<IScriptWebHostEnvironment>();
+
+                        if (!hostEnvironment.InStandbyMode &&
+                            !string.IsNullOrEmpty(environment.GetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteHostName)))
+                        {
+                            IEventGenerator eventGenerator = services.GetService<IEventGenerator>();
+                            IOptions<ScriptJobHostOptions> options = services.GetService<IOptions<ScriptJobHostOptions>>();
+                            return new AzureMonitorDiagnosticLoggerProvider(options, eventGenerator, environment);
+                        }
+
+                        return NullLoggerProvider.Instance;
+                    });
 
                     ConfigureRegisteredBuilders(loggingBuilder, rootServiceProvider);
                 })

test/WebJobs.Script.Tests/Configuration/LoggingConfigurationTests.cs

@@ -11,6 +11,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Logging.Console;
 using Microsoft.Extensions.Options;
 using Microsoft.WebJobs.Script.Tests;
@@ -177,11 +178,12 @@ public void LoggerProviders_Default()
 
             IEnumerable<ILoggerProvider> loggerProviders = host.Services.GetService<IEnumerable<ILoggerProvider>>();
 
-            Assert.Equal(4, loggerProviders.Count());
+            Assert.Equal(5, loggerProviders.Count());
             loggerProviders.OfType<SystemLoggerProvider>().Single();
             loggerProviders.OfType<HostFileLoggerProvider>().Single();
             loggerProviders.OfType<FunctionFileLoggerProvider>().Single();
             loggerProviders.OfType<UserLogMetricsLoggerProvider>().Single();
+            loggerProviders.OfType<NullLoggerProvider>().Single();
         }
 
         [Fact]
@@ -194,12 +196,13 @@ public void LoggerProviders_ConsoleEnabled_IfDevelopmentEnvironment()
 
             IEnumerable<ILoggerProvider> loggerProviders = host.Services.GetService<IEnumerable<ILoggerProvider>>();
 
-            Assert.Equal(5, loggerProviders.Count());
+            Assert.Equal(6, loggerProviders.Count());
             loggerProviders.OfType<SystemLoggerProvider>().Single();
             loggerProviders.OfType<HostFileLoggerProvider>().Single();
             loggerProviders.OfType<FunctionFileLoggerProvider>().Single();
             loggerProviders.OfType<ConsoleLoggerProvider>().Single();
             loggerProviders.OfType<UserLogMetricsLoggerProvider>().Single();
+            loggerProviders.OfType<NullLoggerProvider>().Single();
         }
 
         [Fact]
@@ -218,12 +221,13 @@ public void LoggerProviders_ConsoleEnabled_InConfiguration()
 
             IEnumerable<ILoggerProvider> loggerProviders = host.Services.GetService<IEnumerable<ILoggerProvider>>();
 
-            Assert.Equal(5, loggerProviders.Count());
+            Assert.Equal(6, loggerProviders.Count());
             loggerProviders.OfType<SystemLoggerProvider>().Single();
             loggerProviders.OfType<HostFileLoggerProvider>().Single();
             loggerProviders.OfType<FunctionFileLoggerProvider>().Single();
             loggerProviders.OfType<ConsoleLoggerProvider>().Single();
             loggerProviders.OfType<UserLogMetricsLoggerProvider>().Single();
+            loggerProviders.OfType<NullLoggerProvider>().Single();
         }
 
         [Fact]
@@ -242,12 +246,36 @@ public void LoggerProviders_ApplicationInsights()
 
             IEnumerable<ILoggerProvider> loggerProviders = host.Services.GetService<IEnumerable<ILoggerProvider>>();
 
-            Assert.Equal(5, loggerProviders.Count());
+            Assert.Equal(6, loggerProviders.Count());
             loggerProviders.OfType<SystemLoggerProvider>().Single();
             loggerProviders.OfType<HostFileLoggerProvider>().Single();
             loggerProviders.OfType<FunctionFileLoggerProvider>().Single();
             loggerProviders.OfType<ApplicationInsightsLoggerProvider>().Single();
             loggerProviders.OfType<UserLogMetricsLoggerProvider>().Single();
+            loggerProviders.OfType<NullLoggerProvider>().Single();
+        }
+
+        [Fact]
+        public void LoggerProviders_AzureMonitor()
+        {
+            IHost host = new HostBuilder()
+              .ConfigureDefaultTestWebScriptHost()
+              .ConfigureServices(s =>
+              {
+                  TestEnvironment environment = new TestEnvironment();
+                  environment.SetEnvironmentVariable(EnvironmentSettingNames.AzureWebsiteHostName, "something.azurewebsites.net");
+                  s.AddSingleton<IEnvironment>(environment);
+              })
+              .Build();
+
+            IEnumerable<ILoggerProvider> loggerProviders = host.Services.GetService<IEnumerable<ILoggerProvider>>();
+
+            Assert.Equal(5, loggerProviders.Count());
+            loggerProviders.OfType<SystemLoggerProvider>().Single();
+            loggerProviders.OfType<HostFileLoggerProvider>().Single();
+            loggerProviders.OfType<FunctionFileLoggerProvider>().Single();
+            loggerProviders.OfType<UserLogMetricsLoggerProvider>().Single();
+            loggerProviders.OfType<AzureMonitorDiagnosticLoggerProvider>().Single();
         }
     }
 }