From f7d5f3e64ed5e53e14a503266569ba18f997d3bc Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Wed, 11 Apr 2018 15:55:44 -0700 Subject: [PATCH] Enable trace for test app (#178) --- .../Startup.cs | 7 +++++-- .../ApplicationInsightsLoggerStartupFilter.cs | 8 ++++++++ .../ApplicationInsightsStartupLoader.cs | 14 +++++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/sample/ApplicationInsightsHostingStartupSample/Startup.cs b/sample/ApplicationInsightsHostingStartupSample/Startup.cs index 8202d3705c..2432b77912 100644 --- a/sample/ApplicationInsightsHostingStartupSample/Startup.cs +++ b/sample/ApplicationInsightsHostingStartupSample/Startup.cs @@ -24,7 +24,9 @@ namespace IISSample public void ConfigureJavaScript(IApplicationBuilder app) { + Console.WriteLine("ConfigureJavaScript 1"); app.UseMvcWithDefaultRoute(); + Console.WriteLine("ConfigureJavaScript 2"); } public void ConfigureDefaultLogging(IApplicationBuilder app, ILoggerFactory loggerFactory) @@ -73,11 +75,12 @@ namespace IISSample public static void Main(string[] args) { + Console.WriteLine("Main 1"); var config = new ConfigurationBuilder() .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) .AddCommandLine(args) .Build(); - + Console.WriteLine("Main 2"); var host = new WebHostBuilder() .UseConfiguration(config) .ConfigureLogging((hostingContext, builder) => @@ -89,7 +92,7 @@ namespace IISSample .UseStartup() .UseContentRoot(Directory.GetCurrentDirectory()) .Build(); - + Console.WriteLine("Main 3"); host.Run(); } } diff --git a/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs index 6fb2a502a7..00e91a3241 100644 --- a/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs +++ b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs @@ -13,19 +13,27 @@ namespace Microsoft.AspNetCore.ApplicationInsights.HostingStartup { public Action Configure(Action next) { + Console.WriteLine("ApplicationInsightsLoggerStartupFilter 1"); return builder => { + Console.WriteLine("ApplicationInsightsLoggerStartupFilter 2"); var loggerFactory = builder.ApplicationServices.GetService(); // We need to disable filtering on logger, filtering would be done by LoggerFactory var loggerEnabled = true; + Console.WriteLine("ApplicationInsightsLoggerStartupFilter 3"); + loggerFactory.AddApplicationInsights( builder.ApplicationServices, (s, level) => loggerEnabled, () => loggerEnabled = false); + Console.WriteLine("ApplicationInsightsLoggerStartupFilter 4"); + next(builder); + + Console.WriteLine("ApplicationInsightsLoggerStartupFilter 5"); }; } } diff --git a/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs index 68ae6aee96..ba45a250c0 100644 --- a/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs +++ b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs @@ -29,9 +29,13 @@ namespace Microsoft.AspNetCore.ApplicationInsights.HostingStartup /// public void Configure(IWebHostBuilder builder) { + Console.WriteLine("ApplicationInsightsHostingStartup 1"); builder.UseApplicationInsights(); + Console.WriteLine("ApplicationInsightsHostingStartup 2"); builder.ConfigureServices(InitializeServices); + + Console.WriteLine("ApplicationInsightsHostingStartup 3"); } @@ -41,18 +45,26 @@ namespace Microsoft.AspNetCore.ApplicationInsights.HostingStartup /// The associated with the application. private void InitializeServices(IServiceCollection services) { + Console.WriteLine("ApplicationInsightsHostingStartup 4"); services.AddSingleton(); services.AddSingleton(); + Console.WriteLine("ApplicationInsightsHostingStartup 5"); var home = Environment.GetEnvironmentVariable("HOME"); if (!string.IsNullOrEmpty(home)) { + Console.WriteLine("ApplicationInsightsHostingStartup 6"); var settingsFile = Path.Combine(home, "site", "diagnostics", ApplicationInsightsSettingsFile); var configurationBuilder = new ConfigurationBuilder() .AddJsonFile(settingsFile, optional: true, reloadOnChange: true); - services.AddLogging(builder => builder.AddConfiguration(configurationBuilder.Build().GetSection("Logging"))); + Console.WriteLine("ApplicationInsightsHostingStartup 7"); + var config = configurationBuilder.Build().GetSection("Logging"); + + Console.WriteLine("ApplicationInsightsHostingStartup 8"); + services.AddLogging(builder => builder.AddConfiguration(config)); } + Console.WriteLine("ApplicationInsightsHostingStartup 9"); } } }