Abzu-75062-Updated app insight configuration. (#195)

* Abzu-75062-Updated app insight configuration. Updated token parameter while adding pipeline lease * Abzu-75062-Removed application Insights telemetry
UKHO · Mar 22, 2023 · 827d256 · 827d256
1 parent 6681dd2
commit 827d256
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 25 deletions.
diff --git a/Deployment/add-lease.ps1 b/Deployment/add-lease.ps1
@@ -10,7 +10,7 @@ Param(
 
 try{
     $contentType = "application/json";
-    $headers = @{ Authorization = 'Bearer $accessToken' };
+    $headers = @{ Authorization = $accessToken };
     $rawRequest = @{ daysValid = $daysValid; definitionId = $definitionId; ownerId = $ownerId; protectPipeline = $false; runId = $buildId };
     $request = ConvertTo-Json @($rawRequest);
     $uri = "$collectionUri$teamProject/_apis/build/retention/leases?api-version=7.0";
@@ -23,6 +23,7 @@ try{
     Write-Host "Pipeline will be retained for $daysValid days"
 }
 catch{
+   Write-Host "##vso[task.LogIssue type=warning;]Pipeline retaintion failed."
    Write-Host $_
    Write-Host "##vso[task.complete result=SucceededWithIssues;]"
 }
diff --git a/Deployment/templates/retain-pipeline.yml b/Deployment/templates/retain-pipeline.yml
@@ -6,7 +6,7 @@ steps:
       targetType: filePath
       filePath: "$(Build.SourcesDirectory)/Deployment/add-lease.ps1"
       arguments: "-daysValid 365
-                  -accessToken '$(System.AccessToken)'
+                  -accessToken 'Bearer $(System.AccessToken)'
                   -definitionId $(System.DefinitionId)
                   -ownerId 'User:$(Build.RequestedForId)'
                   -buildId $(Build.BuildId)

diff --git a/UKHO.ExchangeSetService.API/UKHO.ExchangeSetService.CleanUpJob/Program.cs b/UKHO.ExchangeSetService.API/UKHO.ExchangeSetService.CleanUpJob/Program.cs
@@ -1,25 +1,24 @@
 using Azure.Extensions.AspNetCore.Configuration.Secrets;
 using Azure.Identity;
 using Azure.Security.KeyVault.Secrets;
+using Microsoft.ApplicationInsights.Channel;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Diagnostics.CodeAnalysis;
+using Microsoft.Extensions.Logging;
 using Serilog;
 using Serilog.Events;
-using Microsoft.Extensions.Logging;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using UKHO.ExchangeSetService.CleanUpJob.Configuration;
+using UKHO.ExchangeSetService.CleanUpJob.Helpers;
+using UKHO.ExchangeSetService.CleanUpJob.Services;
 using UKHO.ExchangeSetService.Common.Configuration;
 using UKHO.ExchangeSetService.Common.Helpers;
-using UKHO.ExchangeSetService.CleanUpJob.Services;
 using UKHO.ExchangeSetService.Common.Storage;
 using UKHO.Logging.EventHubLogProvider;
-using System.Reflection;
-using System.Linq;
-using UKHO.ExchangeSetService.CleanUpJob.Configuration;
-using UKHO.ExchangeSetService.CleanUpJob.Helpers;
-using System.Threading.Tasks;
-using Microsoft.ApplicationInsights.Channel;
-using Microsoft.ApplicationInsights.Extensibility;
 
 namespace UKHO.ExchangeSetService.CleanUpJob
 {
@@ -106,10 +105,7 @@ private static void ConfigureServices(IServiceCollection serviceCollection, ICon
                 string instrumentationKey = configuration["APPINSIGHTS_INSTRUMENTATIONKEY"];
                 if (!string.IsNullOrEmpty(instrumentationKey))
                 {
-                    loggingBuilder.AddApplicationInsights(
-                        configureTelemetryConfiguration: (config) => config.ConnectionString = instrumentationKey,
-                        configureApplicationInsightsLoggerOptions: (options) => { }
-                        );
+                    loggingBuilder.AddApplicationInsightsWebJobs(o => o.InstrumentationKey = instrumentationKey);
                 }
 
                 #if DEBUG
@@ -147,14 +143,6 @@ private static void ConfigureServices(IServiceCollection serviceCollection, ICon
                 }
             });
 
-            serviceCollection.Configure<TelemetryConfiguration>(
-                (config) =>
-                {
-                    config.TelemetryChannel = aiChannel;
-                    config.ConnectionString = configuration["APPINSIGHTS_INSTRUMENTATIONKEY"];
-                }
-            );
-
             serviceCollection.Configure<EssFulfilmentStorageConfiguration>(configuration.GetSection("EssFulfilmentStorageConfiguration"));
             serviceCollection.Configure<CleanUpConfiguration>(configuration.GetSection("CleanUpConfiguration"));
 

diff --git a/...tService.API/UKHO.ExchangeSetService.CleanUpJob/UKHO.ExchangeSetService.CleanUpJob.csproj b/...tService.API/UKHO.ExchangeSetService.CleanUpJob/UKHO.ExchangeSetService.CleanUpJob.csproj
@@ -25,6 +25,7 @@
 		<PackageReference Include="Serilog" Version="2.12.0" />
 		<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.33" />
 	</ItemGroup>
 
 	<ItemGroup>