Revert "No longer depend on Obsolete AppInsights APIs" (#7776)

This reverts commit bb5a8eb.

src/AccountDeleter/AccountDeleter.csproj

@@ -107,7 +107,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Common.Job">
-      <Version>4.3.0-dev-3309631</Version>
+      <Version>4.3.0-dev-3159955</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

src/AccountDeleter/Job.cs

@@ -6,6 +6,7 @@
 using System.ComponentModel.Design;
 using System.IO;
 using System.Linq;
+using System.ServiceModel.Configuration;
 using Autofac;
 using Autofac.Core;
 using Microsoft.Extensions.Configuration;
@@ -100,14 +101,14 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi
                 services.AddTransient<IMessageServiceConfiguration, CoreMessageServiceConfiguration>();
             }
 
+
             services.AddScoped<IEmailBuilderFactory, EmailBuilderFactory>();
-            services.AddScoped<ITelemetryClient, TelemetryClientWrapper>(
-                sp => TelemetryClientWrapper.UseTelemetryConfiguration(ApplicationInsightsConfiguration.TelemetryConfiguration));
+            services.AddScoped<ITelemetryClient, TelemetryClientWrapper>();
 
-            ConfigureGalleryServices(services);
+            ConfigureGalleryServices(services, configurationRoot);
         }
 
-        protected void ConfigureGalleryServices(IServiceCollection services)
+        protected void ConfigureGalleryServices(IServiceCollection services, IConfigurationRoot configurationRoot)
         {
             if (IsDebugMode)
             {
@@ -126,6 +127,7 @@ protected void ConfigureGalleryServices(IServiceCollection services)
                 services.AddScoped<IDeleteAccountService, DeleteAccountService>();
 
                 services.AddScoped<IUserService, AccountDeleteUserService>();
+                services.AddScoped<ITelemetryClient>(sp => { return TelemetryClientWrapper.Instance; });
                 services.AddScoped<IDiagnosticsService, DiagnosticsService>();
 
                 services.AddScoped<IPackageService, PackageService>();

src/DatabaseMigrationTools/DatabaseMigrationTools.csproj

@@ -64,10 +64,10 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Jobs.Common">
-      <Version>4.3.0-dev-3309631</Version>
+      <Version>4.3.0-dev-3159955</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.61.0</Version>
+      <Version>2.58.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

src/DatabaseMigrationTools/Program.cs

@@ -16,7 +16,7 @@ static int Main(string[] args)
             var exitCode = JobRunner.RunOnce(job, args).GetAwaiter().GetResult();
 
             // Have to use Thread.Sleep() and wait for the logger.
-            // Calling "TelemetryChannel.Flush()" on TelemetryConfiguration is not reliable.
+            // "TelemetryConfiguration.Active.TelemetryChannel.Flush()" is not reliable.
             // Hit the issue: https://github.com/Microsoft/ApplicationInsights-dotnet/issues/407
             Thread.Sleep(30000);
 

src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj

@@ -86,10 +86,10 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="NuGet.Jobs.Common">
-      <Version>4.3.0-dev-3309631</Version>
+      <Version>4.3.0-dev-3159955</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Cursor">
-      <Version>2.61.0</Version>
+      <Version>2.58.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj

@@ -77,7 +77,7 @@
       <Version>4.8.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Jobs.Common">
-      <Version>4.3.0-dev-3309631</Version>
+      <Version>4.3.0-dev-3159955</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/NuGetGallery.Core/NuGetGallery.Core.csproj

@@ -242,16 +242,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NuGet.Services.FeatureFlags">
-      <Version>2.61.0</Version>
+      <Version>2.58.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Messaging.Email">
-      <Version>2.61.0</Version>
+      <Version>2.58.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation">
-      <Version>2.61.0</Version>
+      <Version>2.58.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Validation.Issues">
-      <Version>2.61.0</Version>
+      <Version>2.58.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
       <Version>1.2.0</Version>

src/NuGetGallery.Services/Diagnostics/DiagnosticsService.cs

@@ -15,6 +15,11 @@ public DiagnosticsService(ITelemetryClient telemetryClient)
             _telemetryClient = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));
         }
 
+        // Test constructor
+        internal DiagnosticsService() : this(TelemetryClientWrapper.Instance)
+        {
+        }
+
         public IDiagnosticsSource GetSource(string name)
         {
             if (string.IsNullOrEmpty(name))

src/NuGetGallery.Services/NuGetGallery.Services.csproj

@@ -293,10 +293,10 @@
       <Version>5.0.0-preview1.5665</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.KeyVault">
-      <Version>2.61.0</Version>
+      <Version>2.58.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Logging">
-      <Version>2.61.0</Version>
+      <Version>2.58.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.StrongName.WebBackgrounder">
       <Version>0.2.0</Version>

src/NuGetGallery.Services/Telemetry/QuietLog.cs

@@ -11,12 +11,7 @@ namespace NuGetGallery
 {
     public static class QuietLog
     {
-        private static ITelemetryClient Telemetry;
-
-        public static void UseTelemetryClient(ITelemetryClient telemetryClient)
-        {
-            Telemetry = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));
-        }
+        public static ITelemetryClient Telemetry = TelemetryClientWrapper.Instance;
 
         public static void LogHandledException(Exception e)
         {

src/NuGetGallery.Services/Telemetry/TelemetryClientWrapper.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.DataContracts;
-using Microsoft.ApplicationInsights.Extensibility;
 using Microsoft.Extensions.Logging;
 
 namespace NuGetGallery
@@ -19,19 +18,19 @@ public class TelemetryClientWrapper : ITelemetryClient
         private const string TelemetryPropertyEventName = "EventName";
 
         private static readonly Lazy<TelemetryClientWrapper> Singleton
-            = new Lazy<TelemetryClientWrapper>(() => new TelemetryClientWrapper(TelemetryConfiguration));
+            = new Lazy<TelemetryClientWrapper>(() => new TelemetryClientWrapper());
 
-        private static TelemetryConfiguration TelemetryConfiguration;
-
-        public static TelemetryClientWrapper UseTelemetryConfiguration(TelemetryConfiguration configuration)
+        public static TelemetryClientWrapper Instance
         {
-            TelemetryConfiguration = configuration;
-            return Singleton.Value;
+            get
+            {
+                return Singleton.Value;
+            }
         }
 
-        private TelemetryClientWrapper(TelemetryConfiguration telemetryConfiguration)
+        private TelemetryClientWrapper()
         {
-            UnderlyingClient = new TelemetryClient(telemetryConfiguration);
+            UnderlyingClient = new TelemetryClient();
         }
 
         public TelemetryClient UnderlyingClient { get; }