Skip to content

Commit 8c95215

Browse files
xavierdecosterxavierdecoster
committed
No longer depend on Obsolete AppInsights APIs
1 parent 850bd62 commit 8c95215

24 files changed

+312
-213
lines changed

‎src/AccountDeleter/AccountDeleter.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<PrivateAssets>all</PrivateAssets>
108108
</PackageReference>
109109
<PackageReference Include="NuGet.Services.Validation.Common.Job">
110-
<Version>4.3.0-dev-3159955</Version>
110+
<Version>4.3.0-dev-3309631</Version>
111111
</PackageReference>
112112
</ItemGroup>
113113
<ItemGroup>

‎src/AccountDeleter/Job.cs

+4-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
using System.ComponentModel.Design;
77
using System.IO;
88
using System.Linq;
9-
using System.ServiceModel.Configuration;
109
using Autofac;
1110
using Autofac.Core;
1211
using Microsoft.Extensions.Configuration;
@@ -101,14 +100,14 @@ protected override void ConfigureJobServices(IServiceCollection services, IConfi
101100
services.AddTransient<IMessageServiceConfiguration, CoreMessageServiceConfiguration>();
102101
}
103102

104-
105103
services.AddScoped<IEmailBuilderFactory, EmailBuilderFactory>();
106-
services.AddScoped<ITelemetryClient, TelemetryClientWrapper>();
104+
services.AddScoped<ITelemetryClient, TelemetryClientWrapper>(
105+
sp => TelemetryClientWrapper.UseTelemetryConfiguration(ApplicationInsightsConfiguration.TelemetryConfiguration));
107106

108-
ConfigureGalleryServices(services, configurationRoot);
107+
ConfigureGalleryServices(services);
109108
}
110109

111-
protected void ConfigureGalleryServices(IServiceCollection services, IConfigurationRoot configurationRoot)
110+
protected void ConfigureGalleryServices(IServiceCollection services)
112111
{
113112
if (IsDebugMode)
114113
{
@@ -127,7 +126,6 @@ protected void ConfigureGalleryServices(IServiceCollection services, IConfigurat
127126
services.AddScoped<IDeleteAccountService, DeleteAccountService>();
128127

129128
services.AddScoped<IUserService, AccountDeleteUserService>();
130-
services.AddScoped<ITelemetryClient>(sp => { return TelemetryClientWrapper.Instance; });
131129
services.AddScoped<IDiagnosticsService, DiagnosticsService>();
132130

133131
services.AddScoped<IPackageService, PackageService>();

‎src/DatabaseMigrationTools/DatabaseMigrationTools.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
<PrivateAssets>all</PrivateAssets>
6565
</PackageReference>
6666
<PackageReference Include="NuGet.Jobs.Common">
67-
<Version>4.3.0-dev-3159955</Version>
67+
<Version>4.3.0-dev-3309631</Version>
6868
</PackageReference>
6969
<PackageReference Include="NuGet.Services.Validation">
70-
<Version>2.58.0</Version>
70+
<Version>2.61.0</Version>
7171
</PackageReference>
7272
</ItemGroup>
7373
<ItemGroup>

‎src/DatabaseMigrationTools/Program.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ static int Main(string[] args)
1616
var exitCode = JobRunner.RunOnce(job, args).GetAwaiter().GetResult();
1717

1818
// Have to use Thread.Sleep() and wait for the logger.
19-
// "TelemetryConfiguration.Active.TelemetryChannel.Flush()" is not reliable.
19+
// Calling "TelemetryChannel.Flush()" on TelemetryConfiguration is not reliable.
2020
// Hit the issue: https://github.com/Microsoft/ApplicationInsights-dotnet/issues/407
2121
Thread.Sleep(30000);
2222

‎src/GitHubVulnerabilities2Db/GitHubVulnerabilities2Db.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@
8585
<PrivateAssets>all</PrivateAssets>
8686
</PackageReference>
8787
<PackageReference Include="NuGet.Jobs.Common">
88-
<Version>4.3.0-dev-3159955</Version>
88+
<Version>4.3.0-dev-3309631</Version>
8989
</PackageReference>
9090
<PackageReference Include="NuGet.Services.Cursor">
91-
<Version>2.58.0</Version>
91+
<Version>2.61.0</Version>
9292
</PackageReference>
9393
</ItemGroup>
9494
<ItemGroup>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<Version>4.8.0</Version>
7878
</PackageReference>
7979
<PackageReference Include="NuGet.Jobs.Common">
80-
<Version>4.3.0-dev-3159955</Version>
80+
<Version>4.3.0-dev-3309631</Version>
8181
</PackageReference>
8282
</ItemGroup>
8383
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/NuGetGallery.Core/NuGetGallery.Core.csproj

+13-4
Original file line numberDiff line numberDiff line change
@@ -241,16 +241,25 @@
241241
</ItemGroup>
242242
<ItemGroup>
243243
<PackageReference Include="NuGet.Services.FeatureFlags">
244-
<Version>2.58.0</Version>
244+
<Version>2.61.0</Version>
245245
</PackageReference>
246246
<PackageReference Include="NuGet.Services.Messaging.Email">
247-
<Version>2.58.0</Version>
247+
<Version>2.61.0</Version>
248248
</PackageReference>
249249
<PackageReference Include="NuGet.Services.Validation">
250-
<Version>2.58.0</Version>
250+
<Version>2.61.0</Version>
251251
</PackageReference>
252252
<PackageReference Include="NuGet.Services.Validation.Issues">
253-
<Version>2.58.0</Version>
253+
<Version>2.61.0</Version>
254+
</PackageReference>
255+
<PackageReference Include="NuGet.Services.Messaging.Email">
256+
<Version>2.61.0</Version>
257+
</PackageReference>
258+
<PackageReference Include="NuGet.Services.Validation">
259+
<Version>2.61.0</Version>
260+
</PackageReference>
261+
<PackageReference Include="NuGet.Services.Validation.Issues">
262+
<Version>2.61.0</Version>
254263
</PackageReference>
255264
<PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
256265
<Version>1.2.0</Version>

‎src/NuGetGallery.Services/Diagnostics/DiagnosticsService.cs

-5
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ public DiagnosticsService(ITelemetryClient telemetryClient)
1515
_telemetryClient = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));
1616
}
1717

18-
// Test constructor
19-
internal DiagnosticsService() : this(TelemetryClientWrapper.Instance)
20-
{
21-
}
22-
2318
public IDiagnosticsSource GetSource(string name)
2419
{
2520
if (string.IsNullOrEmpty(name))

‎src/NuGetGallery.Services/NuGetGallery.Services.csproj

+5-2
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,13 @@
293293
<Version>5.0.0-preview1.5665</Version>
294294
</PackageReference>
295295
<PackageReference Include="NuGet.Services.KeyVault">
296-
<Version>2.58.0</Version>
296+
<Version>2.61.0</Version>
297297
</PackageReference>
298298
<PackageReference Include="NuGet.Services.Logging">
299-
<Version>2.58.0</Version>
299+
<Version>2.61.0</Version>
300+
</PackageReference>
301+
<PackageReference Include="NuGet.Services.Logging">
302+
<Version>2.61.0</Version>
300303
</PackageReference>
301304
<PackageReference Include="NuGet.StrongName.WebBackgrounder">
302305
<Version>0.2.0</Version>

‎src/NuGetGallery.Services/Telemetry/QuietLog.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ namespace NuGetGallery
1111
{
1212
public static class QuietLog
1313
{
14-
public static ITelemetryClient Telemetry = TelemetryClientWrapper.Instance;
14+
private static ITelemetryClient Telemetry;
15+
16+
public static void UseTelemetryClient(ITelemetryClient telemetryClient)
17+
{
18+
Telemetry = telemetryClient ?? throw new ArgumentNullException(nameof(telemetryClient));
19+
}
1520

1621
public static void LogHandledException(Exception e)
1722
{

‎src/NuGetGallery.Services/Telemetry/TelemetryClientWrapper.cs

+9-8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Collections.Generic;
66
using Microsoft.ApplicationInsights;
77
using Microsoft.ApplicationInsights.DataContracts;
8+
using Microsoft.ApplicationInsights.Extensibility;
89
using Microsoft.Extensions.Logging;
910

1011
namespace NuGetGallery
@@ -18,19 +19,19 @@ public class TelemetryClientWrapper : ITelemetryClient
1819
private const string TelemetryPropertyEventName = "EventName";
1920

2021
private static readonly Lazy<TelemetryClientWrapper> Singleton
21-
= new Lazy<TelemetryClientWrapper>(() => new TelemetryClientWrapper());
22+
= new Lazy<TelemetryClientWrapper>(() => new TelemetryClientWrapper(TelemetryConfiguration));
2223

23-
public static TelemetryClientWrapper Instance
24+
private static TelemetryConfiguration TelemetryConfiguration;
25+
26+
public static TelemetryClientWrapper UseTelemetryConfiguration(TelemetryConfiguration configuration)
2427
{
25-
get
26-
{
27-
return Singleton.Value;
28-
}
28+
TelemetryConfiguration = configuration;
29+
return Singleton.Value;
2930
}
3031

31-
private TelemetryClientWrapper()
32+
private TelemetryClientWrapper(TelemetryConfiguration telemetryConfiguration)
3233
{
33-
UnderlyingClient = new TelemetryClient();
34+
UnderlyingClient = new TelemetryClient(telemetryConfiguration);
3435
}
3536

3637
public TelemetryClient UnderlyingClient { get; }

0 commit comments

Comments
 (0)