From d2b29d4752643aadf363e542f4f91bc9049ea2e1 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 26 Sep 2020 09:23:45 -0500
Subject: [PATCH] =?UTF-8?q?refactor(archival):=20=F0=9F=94=A5=20rm=20unnec?=
 =?UTF-8?q?essary=20explicit=20logging=20flush?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigurationExtensions.cs                |  5 ++--
 .../Logging/ConfigurationExtensions.cs        | 22 --------------
 .../TelemetryClientFlushPostProcessor.cs      | 29 -------------------
 3 files changed, 2 insertions(+), 54 deletions(-)
 delete mode 100644 services/Archival/FilterLists.Archival.Infrastructure/Logging/ConfigurationExtensions.cs
 delete mode 100644 services/Archival/FilterLists.Archival.Infrastructure/Logging/TelemetryClientFlushPostProcessor.cs

diff --git a/services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs
index 217ae4bf1..1838d468c 100644
--- a/services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs
+++ b/services/Archival/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using FilterLists.Archival.Infrastructure.Clients;
-using FilterLists.Archival.Infrastructure.Logging;
 using FilterLists.Archival.Infrastructure.Persistence;
 using FilterLists.Archival.Infrastructure.Scheduling;
 using FilterLists.Directory.Api.Contracts;
@@ -23,7 +22,7 @@ public static void AddInfrastructureServices(this IServiceCollection services, I
         {
             _ = configuration ?? throw new ArgumentNullException(nameof(configuration));
 
-            services.AddArchivalLogging(configuration);
+            services.AddSharedKernelLogging(configuration);
             services.AddSchedulingServices(configuration);
             services.AddDirectoryApiClient(configuration);
             services.AddClients();
@@ -32,7 +31,7 @@ public static void AddInfrastructureServices(this IServiceCollection services, I
 
         public static void UseInfrastructure(this IApplicationBuilder app)
         {
-            app.UseArchivalLogging();
+            app.UseLogging();
             app.UseScheduling();
         }
     }
diff --git a/services/Archival/FilterLists.Archival.Infrastructure/Logging/ConfigurationExtensions.cs b/services/Archival/FilterLists.Archival.Infrastructure/Logging/ConfigurationExtensions.cs
deleted file mode 100644
index 82f66edb4..000000000
--- a/services/Archival/FilterLists.Archival.Infrastructure/Logging/ConfigurationExtensions.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using FilterLists.SharedKernel.Logging;
-using MediatR.Pipeline;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace FilterLists.Archival.Infrastructure.Logging
-{
-    internal static class ConfigurationExtensions
-    {
-        public static void AddArchivalLogging(this IServiceCollection services, IConfiguration configuration)
-        {
-            services.AddSharedKernelLogging(configuration);
-            services.AddTransient(typeof(IRequestPostProcessor<,>), typeof(TelemetryClientFlushPostProcessor<,>));
-        }
-
-        public static void UseArchivalLogging(this IApplicationBuilder app)
-        {
-            app.UseLogging();
-        }
-    }
-}
diff --git a/services/Archival/FilterLists.Archival.Infrastructure/Logging/TelemetryClientFlushPostProcessor.cs b/services/Archival/FilterLists.Archival.Infrastructure/Logging/TelemetryClientFlushPostProcessor.cs
deleted file mode 100644
index 83dde1816..000000000
--- a/services/Archival/FilterLists.Archival.Infrastructure/Logging/TelemetryClientFlushPostProcessor.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediatR.Pipeline;
-using Microsoft.ApplicationInsights;
-
-namespace FilterLists.Archival.Infrastructure.Logging
-{
-    /// <remarks>https://docs.microsoft.com/en-us/azure/azure-monitor/app/api-custom-events-metrics#flushing-data</remarks>
-    public class TelemetryClientFlushPostProcessor<TRequest, TResponse> : IRequestPostProcessor<TRequest, TResponse>
-        where TRequest : notnull
-    {
-        private readonly TelemetryClient _telemetryClient;
-
-        public TelemetryClientFlushPostProcessor(TelemetryClient telemetryClient)
-        {
-            _telemetryClient = telemetryClient;
-        }
-
-        public Task Process(TRequest request, TResponse response, CancellationToken cancellationToken)
-        {
-            _telemetryClient.Flush();
-
-            // Allow some time for flushing before shutdown.
-            Thread.Sleep(5000);
-
-            return Task.CompletedTask;
-        }
-    }
-}