From e96e2872f56914c8b5a83ab2df31b3ca98526f6c Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Tue, 2 May 2017 15:35:53 -0700
Subject: [PATCH] React to Logging API changes (#33)

---
 .../Startup.cs                                        | 11 +++++++----
 .../AzureAppServicesHostingStartupSample/Startup.cs   |  6 ++++--
 sample/AzureAppServicesSample/Startup.cs              |  6 ++++--
 .../ApplicationInsightsLoggingTest.cs                 |  4 +---
 .../AppServicesWebHostBuilderExtensionsTest.cs        |  2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/sample/ApplicationInsightsHostingStartupSample/Startup.cs b/sample/ApplicationInsightsHostingStartupSample/Startup.cs
index 1bc32c032d..c0c172a3d3 100644
--- a/sample/ApplicationInsightsHostingStartupSample/Startup.cs
+++ b/sample/ApplicationInsightsHostingStartupSample/Startup.cs
@@ -24,12 +24,10 @@ namespace IISSample
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IServiceProvider serviceProvider)
         {
-            loggerFactory.AddConsole(LogLevel.Debug);
-
             var logger = loggerFactory.CreateLogger("Requests");
 
             app.UseMvcWithDefaultRoute();
-            app.Map("/log", logApp => logApp.Run((context) =>
+            app.Map("/log", logApp => logApp.Run(context =>
             {
                 TelemetryConfiguration.Active.TelemetryChannel = new CurrentResponseTelemetryChannel(context.Response);
 
@@ -55,7 +53,7 @@ namespace IISSample
 
                 TelemetryConfiguration.Active.TelemetryChannel = null;
 
-                return Task.FromResult(true);
+                return Task.CompletedTask;
             }));
             app.Run(async (context) =>
             {
@@ -110,6 +108,11 @@ namespace IISSample
                 .Build();
 
             var host = new WebHostBuilder()
+                .ConfigureLogging((hostingContext, factory) =>
+                {
+                    factory.UseConfiguration(hostingContext.Configuration.GetSection("Logging"))
+                           .AddConsole();
+                })
                 .UseKestrel()
                 .UseStartup<Startup>()
                 .UseContentRoot(Directory.GetCurrentDirectory())
diff --git a/sample/AzureAppServicesHostingStartupSample/Startup.cs b/sample/AzureAppServicesHostingStartupSample/Startup.cs
index cbb697e1e9..84f5da1dad 100644
--- a/sample/AzureAppServicesHostingStartupSample/Startup.cs
+++ b/sample/AzureAppServicesHostingStartupSample/Startup.cs
@@ -16,8 +16,6 @@ namespace IISSample
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory)
         {
-            loggerfactory.AddConsole(LogLevel.Debug);
-
             var logger = loggerfactory.CreateLogger("Requests");
 
             app.Run(async (context) =>
@@ -68,6 +66,10 @@ namespace IISSample
         public static void Main(string[] args)
         {
             var host = new WebHostBuilder()
+                .ConfigureLogging(factory =>
+                {
+                    factory.AddConsole();
+                })
                 .UseKestrel()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/sample/AzureAppServicesSample/Startup.cs b/sample/AzureAppServicesSample/Startup.cs
index 779f700a2d..4638758d90 100644
--- a/sample/AzureAppServicesSample/Startup.cs
+++ b/sample/AzureAppServicesSample/Startup.cs
@@ -23,8 +23,6 @@ namespace IISSample
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory)
         {
-            loggerfactory.AddConsole(LogLevel.Debug);
-
             var logger = loggerfactory.CreateLogger("Requests");
 
             app.Run(async (context) =>
@@ -75,6 +73,10 @@ namespace IISSample
         public static void Main(string[] args)
         {
             var host = new WebHostBuilder()
+                .ConfigureLogging(factory =>
+                {
+                    factory.AddConsole();
+                })
                 .UseKestrel()
                 .UseAzureAppServices()
                 .UseStartup<Startup>()
diff --git a/test/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests/ApplicationInsightsLoggingTest.cs b/test/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests/ApplicationInsightsLoggingTest.cs
index c84a578684..ef8086af5d 100644
--- a/test/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests/ApplicationInsightsLoggingTest.cs
+++ b/test/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests/ApplicationInsightsLoggingTest.cs
@@ -6,8 +6,6 @@ using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
-using Microsoft.AspNetCore.Testing.xunit;
-using Microsoft.Extensions.Logging;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -19,7 +17,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest
         {
         }
 
-        [ConditionalTheory(Skip = "https://github.com/aspnet/AzureIntegration/issues/41")]
+        [Theory]
         [InlineData(ApplicationType.Portable)]
         [InlineData(ApplicationType.Standalone)]
         public async Task ScriptInjected(ApplicationType applicationType)
diff --git a/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/AppServicesWebHostBuilderExtensionsTest.cs b/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/AppServicesWebHostBuilderExtensionsTest.cs
index ed6e49ed15..2f1d7ae0f4 100644
--- a/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/AppServicesWebHostBuilderExtensionsTest.cs
+++ b/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/AppServicesWebHostBuilderExtensionsTest.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Hosting.Azure.AppServices.Tests
 
             mock.Object.UseAzureAppServices();
 
-            mock.Verify(builder => builder.ConfigureLogging(It.IsNotNull<Action<ILoggerFactory>>()), Times.Once);
+            mock.Verify(builder => builder.ConfigureLogging(It.IsNotNull<Action<LoggerFactory>>()), Times.Once);
         }
     }
 }