From a0b0b63d69908bfb62ccfa526ceb181007eb25ac Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Fri, 25 Sep 2020 19:27:03 -0500
Subject: [PATCH] =?UTF-8?q?Revert=20"fix(logging):=20=F0=9F=90=9B=20try=20?=
 =?UTF-8?q?fully=20inline=20initialization=20to=20fix=20AppInsights"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5bff4c322996f19f83bba1bbd6e3869471e0110d.
---
 .../ConfigurationExtensions.cs                     | 14 +-------------
 .../FilterLists.SharedKernel.Logging/HostRunner.cs |  9 +++++++++
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs
index e3139547b..76ab48a6e 100644
--- a/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs
+++ b/services/SharedKernel/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs
@@ -1,14 +1,12 @@
 using System;
 using FilterLists.SharedKernel.Logging.Options;
 using Microsoft.ApplicationInsights.Channel;
-using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
-using Serilog.Events;
 
 namespace FilterLists.SharedKernel.Logging
 {
@@ -16,17 +14,7 @@ public static class ConfigurationExtensions
     {
         public static IHostBuilder UseLogging(this IHostBuilder hostBuilder)
         {
-            return hostBuilder.UseSerilog((_, services, lc) =>
-                lc.MinimumLevel.Debug()
-                    .MinimumLevel.Override("Microsoft", LogEventLevel.Information)
-                    .MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning)
-                    .Enrich.FromLogContext()
-                    .WriteTo.Console()
-                    .WriteTo.Conditional(
-                        __ => services.GetService<IHostEnvironment>().IsProduction(),
-                        sc => sc.ApplicationInsights(
-                            services.GetRequiredService<TelemetryConfiguration>(),
-                            TelemetryConverter.Traces)));
+            return hostBuilder.UseSerilog();
         }
 
         public static void AddSharedKernelLogging(this IServiceCollection services, IConfiguration configuration)
diff --git a/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs b/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs
index e18221883..2532135e9 100644
--- a/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs
+++ b/services/SharedKernel/FilterLists.SharedKernel.Logging/HostRunner.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Threading.Tasks;
+using Microsoft.ApplicationInsights;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 
@@ -11,6 +13,13 @@ public static async Task TryRunWithLoggingAsync(this IHost host, Func<Task>? run
         {
             _ = host ?? throw new ArgumentNullException(nameof(host));
 
+            var telemetryClient = (TelemetryClient)host.Services.GetService(typeof(TelemetryClient));
+            Log.Logger = ConfigurationBuilder.BaseLoggerConfiguration
+                .WriteTo.Conditional(
+                    _ => host.Services.GetService<IHostEnvironment>().IsProduction(),
+                    c => c.ApplicationInsights(telemetryClient, TelemetryConverter.Traces))
+                .CreateLogger();
+
             try
             {
                 if (runPreHostAsync != null)