From 7cdf5fbc755a3a256121044fb6fbdc88d3e46994 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Thu, 10 Sep 2020 07:48:14 -0500
Subject: [PATCH] =?UTF-8?q?feat(logging):=20=E2=9C=A8=20AddApplicationInsi?=
 =?UTF-8?q?ghtsTelemetry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                                        | 2 ++
 docker-compose.yml                                          | 2 ++
 .../ConfigurationExtensions.cs                              | 1 +
 .../ConfigurationExtensions.cs                              | 1 +
 .../ConfigurationExtensions.cs                              | 6 ++++++
 .../FilterLists.SharedKernel.Logging.csproj                 | 1 +
 6 files changed, 13 insertions(+)

diff --git a/.env b/.env
index c8e99a395..89b3432d2 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,10 @@
+ARCHIVAL_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY=
 ARCHIVAL_REDIS_CONNECTION_STRING=archival-scheduling-db:6379
 ARCHIVAL_GIT_REPOSITORY_DIRECTORY=archives
 ARCHIVAL_GIT_USER_NAME=FilterLists Archival
 ARCHIVAL_GIT_USER_EMAIL=noreply@filterlists.com
 
+DIRECTORY_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY=
 DIRECTORY_CONNECTION_STRING=Server=directory-db;Database=filterlists;User Id=filterlists;Password=filterlists;
 DIRECTORY_DB_USER=filterlists
 DIRECTORY_DB_PASSWORD=filterlists
diff --git a/docker-compose.yml b/docker-compose.yml
index 95c1f0218..505a78c1e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,7 @@ services:
       - archival-scheduling-db
       - directory-api
     environment:
+      ApplicationInsights__InstrumentationKey: ${ARCHIVAL_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY}
       ConnectionStrings__SchedulingConnection: ${ARCHIVAL_REDIS_CONNECTION_STRING}
 
   archival-scheduling-db:
@@ -40,6 +41,7 @@ services:
     depends_on:
       - directory-db
     environment:
+      ApplicationInsights__InstrumentationKey: ${DIRECTORY_APPLICATION_INSIGHTS_INSTRUMENTATION_KEY}
       ConnectionStrings__DirectoryConnection: ${DIRECTORY_CONNECTION_STRING}
 
   directory-db:
diff --git a/services/archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs b/services/archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs
index ae0c1684a..a4c5030c9 100644
--- a/services/archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs
+++ b/services/archival/src/FilterLists.Archival.Infrastructure/ConfigurationExtensions.cs
@@ -20,6 +20,7 @@ public static void AddInfrastructureServices(this IServiceCollection services, I
         {
             _ = configuration ?? throw new ArgumentNullException(nameof(configuration));
 
+            services.AddSharedKernelLogging();
             services.AddPersistenceServices(configuration);
             services.AddSchedulingServices(configuration);
         }
diff --git a/services/directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs b/services/directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs
index de47216da..736487e25 100644
--- a/services/directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs
+++ b/services/directory/src/FilterLists.Directory.Infrastructure/ConfigurationExtensions.cs
@@ -17,6 +17,7 @@ public static IHostBuilder UseInfrastructure(this IHostBuilder hostBuilder)
 
         public static void AddInfrastructureServices(this IServiceCollection services, IConfiguration configuration)
         {
+            services.AddSharedKernelLogging();
             services.AddDbContextPool<QueryDbContext>(o =>
             {
                 o.UseNpgsql(configuration.GetConnectionString("DirectoryConnection"),
diff --git a/services/sharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs b/services/sharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs
index a8c6184ab..f04f3e505 100644
--- a/services/sharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs
+++ b/services/sharedKernel/src/FilterLists.SharedKernel.Logging/ConfigurationExtensions.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Serilog;
 
@@ -11,6 +12,11 @@ public static IHostBuilder UseLogging(this IHostBuilder hostBuilder)
             return hostBuilder.UseSerilog();
         }
 
+        public static void AddSharedKernelLogging(this IServiceCollection services)
+        {
+            services.AddApplicationInsightsTelemetry();
+        }
+
         public static void UseLogging(this IApplicationBuilder app)
         {
             app.UseSerilogRequestLogging();
diff --git a/services/sharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj b/services/sharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj
index 287a8f0b0..764138e46 100644
--- a/services/sharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj
+++ b/services/sharedKernel/src/FilterLists.SharedKernel.Logging/FilterLists.SharedKernel.Logging.csproj
@@ -25,6 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.14.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>