From ea8165b7f5c0443a3f2b2d29fe693164a3f6c4db Mon Sep 17 00:00:00 2001 From: George Pollard Date: Wed, 2 Nov 2022 21:40:11 +0000 Subject: [PATCH 1/6] Improve AppInsights setup --- src/ApiService/ApiService/ApiService.csproj | 3 +- src/ApiService/ApiService/Log.cs | 8 +- src/ApiService/ApiService/Program.cs | 19 +- src/ApiService/ApiService/packages.lock.json | 227 +++++++++++++++++-- 4 files changed, 212 insertions(+), 45 deletions(-) diff --git a/src/ApiService/ApiService/ApiService.csproj b/src/ApiService/ApiService/ApiService.csproj index 3e42f47511..2d27978b2d 100644 --- a/src/ApiService/ApiService/ApiService.csproj +++ b/src/ApiService/ApiService/ApiService.csproj @@ -8,7 +8,7 @@ - + @@ -20,7 +20,6 @@ - diff --git a/src/ApiService/ApiService/Log.cs b/src/ApiService/ApiService/Log.cs index 04a19f2f5b..8cb92b0e8d 100644 --- a/src/ApiService/ApiService/Log.cs +++ b/src/ApiService/ApiService/Log.cs @@ -65,8 +65,8 @@ public interface ILog { class AppInsights : ILog { private readonly TelemetryClient _telemetryClient; - public AppInsights(TelemetryConfiguration config) { - _telemetryClient = new TelemetryClient(config); + public AppInsights(TelemetryClient client) { + _telemetryClient = client; } public void Log(Guid correlationId, LogStringHandler message, SeverityLevel level, IReadOnlyDictionary tags, string? caller) { @@ -366,12 +366,12 @@ public interface ILogSinks { public class LogSinks : ILogSinks { private readonly List _loggers; - public LogSinks(IServiceConfig config, TelemetryConfiguration telemetryConfiguration) { + public LogSinks(IServiceConfig config, TelemetryClient telemetryClient) { _loggers = new List(); foreach (var dest in config.LogDestinations) { _loggers.Add( dest switch { - LogDestination.AppInsights => new AppInsights(telemetryConfiguration), + LogDestination.AppInsights => new AppInsights(telemetryClient), LogDestination.Console => new Console(), _ => throw new Exception($"Unhandled Log Destination type: {dest}"), } diff --git a/src/ApiService/ApiService/Program.cs b/src/ApiService/ApiService/Program.cs index 9e88a0f813..9f5a8a8588 100644 --- a/src/ApiService/ApiService/Program.cs +++ b/src/ApiService/ApiService/Program.cs @@ -44,6 +44,8 @@ public async Async.Task Invoke(FunctionContext context, FunctionExecutionDelegat //Move out expensive resources into separate class, and add those as Singleton // ArmClient, Table Client(s), Queue Client(s), HttpClient, etc. public static async Async.Task Main() { + var configuration = new ServiceConfiguration(); + using var host = new HostBuilder() .ConfigureFunctionsWorkerDefaults( @@ -110,18 +112,14 @@ public static async Async.Task Main() { .AddScoped() .AddScoped() .AddScoped() - - .AddSingleton(provider => { - var config = provider.GetRequiredService(); - return new() { - ConnectionString = $"InstrumentationKey={config.ApplicationInsightsInstrumentationKey}", - }; + .AddApplicationInsightsTelemetry(options => { + options.ConnectionString = $"InstrumentationKey={configuration.ApplicationInsightsInstrumentationKey}"; }) .AddSingleton(new GraphServiceClient(new DefaultAzureCredential())) .AddSingleton() .AddSingleton() .AddSingleton() - .AddSingleton() + .AddSingleton(configuration) .AddSingleton() .AddSingleton() .AddHttpClient() @@ -129,13 +127,6 @@ public static async Async.Task Main() { }) .Build(); - // Set up Application Insights dependency tracking: - { - var telemetryConfig = host.Services.GetRequiredService(); - var module = host.Services.GetRequiredService(); - module.Initialize(telemetryConfig); - } - // Initialize expected Storage tables: await SetupStorage( host.Services.GetRequiredService(), diff --git a/src/ApiService/ApiService/packages.lock.json b/src/ApiService/ApiService/packages.lock.json index 8ff9fc8b0a..fbd0ee1b7a 100644 --- a/src/ApiService/ApiService/packages.lock.json +++ b/src/ApiService/ApiService/packages.lock.json @@ -157,14 +157,23 @@ "resolved": "0.12.2", "contentHash": "JgMAGj8ekeAzKkagubXqf1UqgfHq89GyA1UQYWbkAe441uRr2Rh2rktkx5Z0LPwmD/aOqu9cxjekD2GZjP8rbw==" }, - "Microsoft.ApplicationInsights.DependencyCollector": { + "Microsoft.ApplicationInsights.AspNetCore": { "type": "Direct", "requested": "[2.21.0, )", "resolved": "2.21.0", - "contentHash": "XArm5tBEUdWs05eDKxnsUUQBduJ45DEQOMnpL7wNWxBpgxn+dbl8nObA2jzExbQhbw6P74lc/1f+RdV4iPaOgg==", + "contentHash": "d+7MB4YdUMc9Mtq2u6C7TritzC0eKfHkhGmlnNckDDQiOQuk9IHMPxUmPBRMm/tn+db8fI/BYno9jGxLhI+SZw==", "dependencies": { "Microsoft.ApplicationInsights": "2.21.0", - "System.Diagnostics.DiagnosticSource": "5.0.0" + "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.EventCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", + "Microsoft.AspNetCore.Hosting": "2.1.1", + "Microsoft.AspNetCore.Http": "2.1.22", + "Microsoft.Extensions.Configuration.Json": "3.1.0", + "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0", + "System.Text.Encodings.Web": "4.7.2" } }, "Microsoft.Azure.Functions.Worker": { @@ -261,16 +270,6 @@ "System.Net.Http": "4.3.0" } }, - "Microsoft.Extensions.Logging.ApplicationInsights": { - "type": "Direct", - "requested": "[2.21.0, )", - "resolved": "2.21.0", - "contentHash": "tjzErt5oaLs1caaThu6AbtJuHH0oIGDG/rYCXDruHVGig3m8MyCDuwDsGQwzimY7g4aFyLOKfHc3unBN2G96gw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.21.0", - "Microsoft.Extensions.Logging": "2.1.1" - } - }, "Microsoft.Graph": { "type": "Direct", "requested": "[4.37.0, )", @@ -424,6 +423,54 @@ "System.Diagnostics.DiagnosticSource": "5.0.0" } }, + "Microsoft.ApplicationInsights.DependencyCollector": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "XArm5tBEUdWs05eDKxnsUUQBduJ45DEQOMnpL7wNWxBpgxn+dbl8nObA2jzExbQhbw6P74lc/1f+RdV4iPaOgg==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "System.Diagnostics.DiagnosticSource": "5.0.0" + } + }, + "Microsoft.ApplicationInsights.EventCounterCollector": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "MfF9IKxx9UhaYHVFQ1VKw0LYvBhkjZtPNUmCTYlGws0N7D2EaupmeIj/EWalqP47sQRedR9+VzARsONcwH8OCA==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0" + } + }, + "Microsoft.ApplicationInsights.PerfCounterCollector": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "RcckSVkfu+NkDie6/HyM6AVLHmTMVZrUrYnDeJdvRByOc2a+DqTM6KXMtsTHW/5+K7DT9QK5ZrZdi0YbBW8PVA==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.Extensions.Caching.Memory": "1.0.0", + "System.Diagnostics.PerformanceCounter": "4.7.0" + } + }, + "Microsoft.ApplicationInsights.WindowsServer": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "Xbhss7dqbKyE5PENm1lRA9oxzhKEouKGMzgNqJ9xTHPZiogDwKVMK02qdbVhvaXKf9zG8RvvIpM5tnGR5o+Onw==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", + "System.Diagnostics.DiagnosticSource": "5.0.0" + } + }, + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "7D4oq+9YyagEPx+0kNNOXdG6c7IDM/2d+637nAYKFqdWhNN0IqHZEed0DuG28waj7hBSLM9lBO+B8qQqgfE4rw==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "System.IO.FileSystem.AccessControl": "4.7.0" + } + }, "Microsoft.AspNet.WebApi.Client": { "type": "Transitive", "resolved": "5.2.7", @@ -458,6 +505,94 @@ "resolved": "5.0.8", "contentHash": "ZI9S2NGjuOKXN3PxJcF8EKVwd1cqpWyUSqiVoH8gqq5tlHaXULwPmoR0DBOFON4sEFETRWI69f5RQ3tJWw205A==" }, + "Microsoft.AspNetCore.Hosting": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "MqYc0DUxrhAPnb5b4HFspxsoJT+gJlLsliSxIgovf4BsbmpaXQId0/pDiVzLuEbmks2w1/lRfY8w0lQOuK1jQQ==", + "dependencies": { + "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.1", + "Microsoft.AspNetCore.Http": "2.1.1", + "Microsoft.AspNetCore.Http.Extensions": "2.1.1", + "Microsoft.Extensions.Configuration": "2.1.1", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "2.1.1", + "Microsoft.Extensions.Configuration.FileExtensions": "2.1.1", + "Microsoft.Extensions.DependencyInjection": "2.1.1", + "Microsoft.Extensions.FileProviders.Physical": "2.1.1", + "Microsoft.Extensions.Hosting.Abstractions": "2.1.1", + "Microsoft.Extensions.Logging": "2.1.1", + "Microsoft.Extensions.Options": "2.1.1", + "System.Diagnostics.DiagnosticSource": "4.5.0", + "System.Reflection.Metadata": "1.6.0" + } + }, + "Microsoft.AspNetCore.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "76cKcp2pWhvdV2TXTqMg/DyW7N6cDzTEhtL8vVWFShQN+Ylwv3eO/vUQr2BS3Hz4IZHEpL+FOo2T+MtymHDqDQ==", + "dependencies": { + "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.1", + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.Extensions.Hosting.Abstractions": "2.1.1" + } + }, + "Microsoft.AspNetCore.Hosting.Server.Abstractions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "+vD7HJYzAXNq17t+NgRkpS38cxuAyOBu8ixruOiA3nWsybozolUdALWiZ5QFtGRzajSLPFA2YsbO3NPcqoUwcw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.1.1", + "Microsoft.Extensions.Configuration.Abstractions": "2.1.1" + } + }, + "Microsoft.AspNetCore.Http": { + "type": "Transitive", + "resolved": "2.1.22", + "contentHash": "+Blk++1JWqghbl8+3azQmKhiNZA5wAepL9dY2I6KVmu2Ri07MAcvAVC888qUvO7yd7xgRgZOMfihezKg14O/2A==", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.AspNetCore.WebUtilities": "2.1.1", + "Microsoft.Extensions.ObjectPool": "2.1.1", + "Microsoft.Extensions.Options": "2.1.1", + "Microsoft.Net.Http.Headers": "2.1.1" + } + }, + "Microsoft.AspNetCore.Http.Abstractions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "kQUEVOU4loc8CPSb2WoHFTESqwIa8Ik7ysCBfTwzHAd0moWovc9JQLmhDIHlYLjHbyexqZAlkq/FPRUZqokebw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.1.1", + "System.Text.Encodings.Web": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Extensions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "ncAgV+cqsWSqjLXFUTyObGh4Tr7ShYYs3uW8Q/YpRwZn7eLV7dux5Z6GLY+rsdzmIHiia3Q2NWbLULQi7aziHw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.Extensions.FileProviders.Abstractions": "2.1.1", + "Microsoft.Net.Http.Headers": "2.1.1", + "System.Buffers": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Features": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "VklZ7hWgSvHBcDtwYYkdMdI/adlf7ebxTZ9kdzAhX+gUs5jSHE9mZlTamdgf9miSsxc1QjNazHXTDJdVPZKKTw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1" + } + }, + "Microsoft.AspNetCore.WebUtilities": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "PGKIZt4+412Z/XPoSjvYu/QIbTxcAQuEFNoA1Pw8a9mgmO0ZhNBmfaNyhgXFf7Rq62kP0tT/2WXpxdcQhkFUPA==", + "dependencies": { + "Microsoft.Net.Http.Headers": "2.1.1", + "System.Text.Encodings.Web": "4.5.0" + } + }, "Microsoft.Azure.Functions.Worker.Core": { "type": "Transitive", "resolved": "1.4.0", @@ -715,6 +850,15 @@ "resolved": "5.0.0", "contentHash": "NxP6ahFcBnnSfwNBi2KH2Oz8Xl5Sm2krjId/jRR3I7teFphwiUoUeZPwTNA21EX+5PtjqmyAvKaOeBXcJjcH/w==" }, + "Microsoft.Extensions.Logging.ApplicationInsights": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "tjzErt5oaLs1caaThu6AbtJuHH0oIGDG/rYCXDruHVGig3m8MyCDuwDsGQwzimY7g4aFyLOKfHc3unBN2G96gw==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.Extensions.Logging": "2.1.1" + } + }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "5.0.0", @@ -778,6 +922,11 @@ "Microsoft.Extensions.Primitives": "5.0.0" } }, + "Microsoft.Extensions.ObjectPool": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "SErON45qh4ogDp6lr6UvVmFYW0FERihW+IQ+2JyFv1PUyWktcJytFaWH5zarufJvZwhci7Rf1IyGXr9pVEadTw==" + }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "5.0.0", @@ -876,6 +1025,15 @@ "System.Security.Cryptography.Cng": "4.5.0" } }, + "Microsoft.Net.Http.Headers": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "lPNIphl8b2EuhOE9dMH6EZDmu7pS882O+HMi5BJNsigxHaWlBrYxZHFZgE18cyaPp6SSZcTkKkuzfjV/RRQKlA==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1", + "System.Buffers": "4.5.0" + } + }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -1161,15 +1319,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "4.5.0", + "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" }, "System.Collections": { "type": "Transitive", @@ -1205,10 +1356,11 @@ }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.4.1", - "contentHash": "jz3TWKMAeuDEyrPCK5Jyt4bzQcmzUIMcY9Ud6PkElFxTfnsihV+9N/UCqvxe1z5gc7jMYAnj7V1COMS9QKIuHQ==", + "resolved": "4.7.0", + "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.4.0" + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Security.Permissions": "4.7.0" } }, "System.Console": { @@ -1259,6 +1411,17 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "kE9szT4i3TYT9bDE/BPfzg9/BL6enMiZlcUmnUEBrhRtxWvurKoa8qhXkLTRhrxMzBqaDleWlRfIPE02tulU+w==", + "dependencies": { + "Microsoft.NETCore.Platforms": "3.1.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Configuration.ConfigurationManager": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, "System.Diagnostics.Tools": { "type": "Transitive", "resolved": "4.3.0", @@ -1391,6 +1554,15 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "vMToiarpU81LR1/KZtnT7VDPvqAZfw9oOS5nY6pPP78nGYz3COLsQH3OfzbR+SjTgltd31R6KmKklz/zDpTmzw==", + "dependencies": { + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, "System.IO.FileSystem.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1584,6 +1756,11 @@ "System.Runtime": "4.3.0" } }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "1.6.0", + "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" + }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", From 8da60dc264fb7015ecbe536e6a741d31e89aefb8 Mon Sep 17 00:00:00 2001 From: George Pollard Date: Wed, 2 Nov 2022 22:07:06 +0000 Subject: [PATCH 2/6] Reduce allocations in AppInsights --- src/ApiService/ApiService/Log.cs | 70 ++++++++++++++-------------- src/ApiService/ApiService/Program.cs | 1 - 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/src/ApiService/ApiService/Log.cs b/src/ApiService/ApiService/Log.cs index 8cb92b0e8d..4b10b8e739 100644 --- a/src/ApiService/ApiService/Log.cs +++ b/src/ApiService/ApiService/Log.cs @@ -4,7 +4,6 @@ using System.Text; using Microsoft.ApplicationInsights; using Microsoft.ApplicationInsights.DataContracts; -using Microsoft.ApplicationInsights.Extensibility; namespace Microsoft.OneFuzz.Service; @@ -69,54 +68,57 @@ public AppInsights(TelemetryClient client) { _telemetryClient = client; } - public void Log(Guid correlationId, LogStringHandler message, SeverityLevel level, IReadOnlyDictionary tags, string? caller) { - Dictionary copyTags = new(tags); - copyTags["CorrelationId"] = correlationId.ToString(); - if (message.Tags is not null) { - foreach (var kv in message.Tags) { - copyTags[kv.Key] = kv.Value; + private static void Copy(IDictionary target, IReadOnlyDictionary? source) { + if (source is not null) { + foreach (var kvp in source) { + target[kvp.Key] = kvp.Value; } } + } - if (caller is not null) copyTags["CalledBy"] = caller; - _telemetryClient.TrackTrace(message.ToString(), level, copyTags); + public void Log(Guid correlationId, LogStringHandler message, SeverityLevel level, IReadOnlyDictionary tags, string? caller) { + var telemetry = new TraceTelemetry(message.ToString(), level); + + // copy properties + Copy(telemetry.Properties, tags); + telemetry.Properties["CorrelationId"] = correlationId.ToString(); + if (caller is not null) telemetry.Properties["CalledBy"] = caller; + Copy(telemetry.Properties, message.Tags); + + _telemetryClient.TrackTrace(telemetry); } public void LogEvent(Guid correlationId, LogStringHandler evt, IReadOnlyDictionary tags, IReadOnlyDictionary? metrics, string? caller) { - Dictionary copyTags = new(tags); - copyTags["CorrelationId"] = correlationId.ToString(); - if (caller is not null) copyTags["CalledBy"] = caller; + var telemetry = new EventTelemetry(evt.ToString()); - if (evt.Tags is not null) { - foreach (var kv in evt.Tags) { - copyTags[kv.Key] = kv.Value; - } - } + // copy properties + Copy(telemetry.Properties, tags); + telemetry.Properties["CorrelationId"] = correlationId.ToString(); + if (caller is not null) telemetry.Properties["CalledBy"] = caller; + Copy(telemetry.Properties, evt.Tags); - Dictionary? copyMetrics = null; - if (metrics is not null) { - copyMetrics = new(metrics); - } + // copy metrics + Copy(telemetry.Metrics, metrics); - _telemetryClient.TrackEvent(evt.ToString(), properties: copyTags, metrics: copyMetrics); + _telemetryClient.TrackEvent(telemetry); } public void LogException(Guid correlationId, Exception ex, LogStringHandler message, IReadOnlyDictionary tags, IReadOnlyDictionary? metrics, string? caller) { - Dictionary copyTags = new(tags); - copyTags["CorrelationId"] = correlationId.ToString(); - if (caller is not null) copyTags["CalledBy"] = caller; + { + var telemetry = new ExceptionTelemetry(ex); - if (message.Tags is not null) { - foreach (var kv in message.Tags) { - copyTags[kv.Key] = kv.Value; - } - } + // copy properties + Copy(telemetry.Properties, tags); + telemetry.Properties["CorrelationId"] = correlationId.ToString(); + if (caller is not null) telemetry.Properties["CalledBy"] = caller; + Copy(telemetry.Properties, message.Tags); + + // copy metrics + Copy(telemetry.Metrics, metrics); - Dictionary? copyMetrics = null; - if (metrics is not null) { - copyMetrics = new(metrics); + _telemetryClient.TrackException(telemetry); } - _telemetryClient.TrackException(ex, copyTags, copyMetrics); + Log(correlationId, $"[{message}] {ex.Message}", SeverityLevel.Error, tags, caller); } diff --git a/src/ApiService/ApiService/Program.cs b/src/ApiService/ApiService/Program.cs index 9f5a8a8588..b684951846 100644 --- a/src/ApiService/ApiService/Program.cs +++ b/src/ApiService/ApiService/Program.cs @@ -11,7 +11,6 @@ using Azure.Core.Serialization; using Azure.Identity; using Microsoft.ApplicationInsights.DependencyCollector; -using Microsoft.ApplicationInsights.Extensibility; using Microsoft.Azure.Functions.Worker; using Microsoft.Azure.Functions.Worker.Middleware; using Microsoft.Extensions.DependencyInjection; From 76ffb63442bec82f869b465c9923366c0ef1ef76 Mon Sep 17 00:00:00 2001 From: George Pollard Date: Wed, 2 Nov 2022 22:12:03 +0000 Subject: [PATCH 3/6] Update lockfiles --- .../IntegrationTests/packages.lock.json | 200 ++++++++++++++++-- src/ApiService/Tests/packages.lock.json | 200 ++++++++++++++++-- 2 files changed, 372 insertions(+), 28 deletions(-) diff --git a/src/ApiService/IntegrationTests/packages.lock.json b/src/ApiService/IntegrationTests/packages.lock.json index c7136ac100..fcb55b3315 100644 --- a/src/ApiService/IntegrationTests/packages.lock.json +++ b/src/ApiService/IntegrationTests/packages.lock.json @@ -272,6 +272,24 @@ "System.Diagnostics.DiagnosticSource": "5.0.0" } }, + "Microsoft.ApplicationInsights.AspNetCore": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "d+7MB4YdUMc9Mtq2u6C7TritzC0eKfHkhGmlnNckDDQiOQuk9IHMPxUmPBRMm/tn+db8fI/BYno9jGxLhI+SZw==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.EventCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", + "Microsoft.AspNetCore.Hosting": "2.1.1", + "Microsoft.AspNetCore.Http": "2.1.22", + "Microsoft.Extensions.Configuration.Json": "3.1.0", + "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0", + "System.Text.Encodings.Web": "4.7.2" + } + }, "Microsoft.ApplicationInsights.DependencyCollector": { "type": "Transitive", "resolved": "2.21.0", @@ -281,6 +299,45 @@ "System.Diagnostics.DiagnosticSource": "5.0.0" } }, + "Microsoft.ApplicationInsights.EventCounterCollector": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "MfF9IKxx9UhaYHVFQ1VKw0LYvBhkjZtPNUmCTYlGws0N7D2EaupmeIj/EWalqP47sQRedR9+VzARsONcwH8OCA==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0" + } + }, + "Microsoft.ApplicationInsights.PerfCounterCollector": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "RcckSVkfu+NkDie6/HyM6AVLHmTMVZrUrYnDeJdvRByOc2a+DqTM6KXMtsTHW/5+K7DT9QK5ZrZdi0YbBW8PVA==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.Extensions.Caching.Memory": "1.0.0", + "System.Diagnostics.PerformanceCounter": "4.7.0" + } + }, + "Microsoft.ApplicationInsights.WindowsServer": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "Xbhss7dqbKyE5PENm1lRA9oxzhKEouKGMzgNqJ9xTHPZiogDwKVMK02qdbVhvaXKf9zG8RvvIpM5tnGR5o+Onw==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", + "System.Diagnostics.DiagnosticSource": "5.0.0" + } + }, + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "7D4oq+9YyagEPx+0kNNOXdG6c7IDM/2d+637nAYKFqdWhNN0IqHZEed0DuG28waj7hBSLM9lBO+B8qQqgfE4rw==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "System.IO.FileSystem.AccessControl": "4.7.0" + } + }, "Microsoft.AspNet.WebApi.Client": { "type": "Transitive", "resolved": "5.2.7", @@ -315,6 +372,94 @@ "resolved": "5.0.8", "contentHash": "ZI9S2NGjuOKXN3PxJcF8EKVwd1cqpWyUSqiVoH8gqq5tlHaXULwPmoR0DBOFON4sEFETRWI69f5RQ3tJWw205A==" }, + "Microsoft.AspNetCore.Hosting": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "MqYc0DUxrhAPnb5b4HFspxsoJT+gJlLsliSxIgovf4BsbmpaXQId0/pDiVzLuEbmks2w1/lRfY8w0lQOuK1jQQ==", + "dependencies": { + "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.1", + "Microsoft.AspNetCore.Http": "2.1.1", + "Microsoft.AspNetCore.Http.Extensions": "2.1.1", + "Microsoft.Extensions.Configuration": "2.1.1", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "2.1.1", + "Microsoft.Extensions.Configuration.FileExtensions": "2.1.1", + "Microsoft.Extensions.DependencyInjection": "2.1.1", + "Microsoft.Extensions.FileProviders.Physical": "2.1.1", + "Microsoft.Extensions.Hosting.Abstractions": "2.1.1", + "Microsoft.Extensions.Logging": "2.1.1", + "Microsoft.Extensions.Options": "2.1.1", + "System.Diagnostics.DiagnosticSource": "4.5.0", + "System.Reflection.Metadata": "1.6.0" + } + }, + "Microsoft.AspNetCore.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "76cKcp2pWhvdV2TXTqMg/DyW7N6cDzTEhtL8vVWFShQN+Ylwv3eO/vUQr2BS3Hz4IZHEpL+FOo2T+MtymHDqDQ==", + "dependencies": { + "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.1", + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.Extensions.Hosting.Abstractions": "2.1.1" + } + }, + "Microsoft.AspNetCore.Hosting.Server.Abstractions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "+vD7HJYzAXNq17t+NgRkpS38cxuAyOBu8ixruOiA3nWsybozolUdALWiZ5QFtGRzajSLPFA2YsbO3NPcqoUwcw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.1.1", + "Microsoft.Extensions.Configuration.Abstractions": "2.1.1" + } + }, + "Microsoft.AspNetCore.Http": { + "type": "Transitive", + "resolved": "2.1.22", + "contentHash": "+Blk++1JWqghbl8+3azQmKhiNZA5wAepL9dY2I6KVmu2Ri07MAcvAVC888qUvO7yd7xgRgZOMfihezKg14O/2A==", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.AspNetCore.WebUtilities": "2.1.1", + "Microsoft.Extensions.ObjectPool": "2.1.1", + "Microsoft.Extensions.Options": "2.1.1", + "Microsoft.Net.Http.Headers": "2.1.1" + } + }, + "Microsoft.AspNetCore.Http.Abstractions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "kQUEVOU4loc8CPSb2WoHFTESqwIa8Ik7ysCBfTwzHAd0moWovc9JQLmhDIHlYLjHbyexqZAlkq/FPRUZqokebw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.1.1", + "System.Text.Encodings.Web": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Extensions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "ncAgV+cqsWSqjLXFUTyObGh4Tr7ShYYs3uW8Q/YpRwZn7eLV7dux5Z6GLY+rsdzmIHiia3Q2NWbLULQi7aziHw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.Extensions.FileProviders.Abstractions": "2.1.1", + "Microsoft.Net.Http.Headers": "2.1.1", + "System.Buffers": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Features": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "VklZ7hWgSvHBcDtwYYkdMdI/adlf7ebxTZ9kdzAhX+gUs5jSHE9mZlTamdgf9miSsxc1QjNazHXTDJdVPZKKTw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1" + } + }, + "Microsoft.AspNetCore.WebUtilities": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "PGKIZt4+412Z/XPoSjvYu/QIbTxcAQuEFNoA1Pw8a9mgmO0ZhNBmfaNyhgXFf7Rq62kP0tT/2WXpxdcQhkFUPA==", + "dependencies": { + "Microsoft.Net.Http.Headers": "2.1.1", + "System.Text.Encodings.Web": "4.5.0" + } + }, "Microsoft.Azure.Functions.Worker": { "type": "Transitive", "resolved": "1.6.0", @@ -734,6 +879,11 @@ "Microsoft.Extensions.Primitives": "5.0.0" } }, + "Microsoft.Extensions.ObjectPool": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "SErON45qh4ogDp6lr6UvVmFYW0FERihW+IQ+2JyFv1PUyWktcJytFaWH5zarufJvZwhci7Rf1IyGXr9pVEadTw==" + }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "5.0.0", @@ -860,6 +1010,15 @@ "System.Security.Cryptography.Cng": "4.5.0" } }, + "Microsoft.Net.Http.Headers": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "lPNIphl8b2EuhOE9dMH6EZDmu7pS882O+HMi5BJNsigxHaWlBrYxZHFZgE18cyaPp6SSZcTkKkuzfjV/RRQKlA==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1", + "System.Buffers": "4.5.0" + } + }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -1200,15 +1359,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "4.5.0", + "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" }, "System.Collections": { "type": "Transitive", @@ -1311,10 +1463,11 @@ }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.4.1", - "contentHash": "jz3TWKMAeuDEyrPCK5Jyt4bzQcmzUIMcY9Ud6PkElFxTfnsihV+9N/UCqvxe1z5gc7jMYAnj7V1COMS9QKIuHQ==", + "resolved": "4.7.0", + "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.4.0" + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Security.Permissions": "4.7.0" } }, "System.Console": { @@ -1365,6 +1518,17 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "kE9szT4i3TYT9bDE/BPfzg9/BL6enMiZlcUmnUEBrhRtxWvurKoa8qhXkLTRhrxMzBqaDleWlRfIPE02tulU+w==", + "dependencies": { + "Microsoft.NETCore.Platforms": "3.1.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Configuration.ConfigurationManager": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, "System.Diagnostics.Tools": { "type": "Transitive", "resolved": "4.3.0", @@ -1543,6 +1707,15 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "vMToiarpU81LR1/KZtnT7VDPvqAZfw9oOS5nY6pPP78nGYz3COLsQH3OfzbR+SjTgltd31R6KmKklz/zDpTmzw==", + "dependencies": { + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, "System.IO.FileSystem.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -2296,7 +2469,7 @@ "Azure.Storage.Blobs": "12.13.0", "Azure.Storage.Queues": "12.11.0", "Faithlife.Utility": "0.12.2", - "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.AspNetCore": "2.21.0", "Microsoft.Azure.Functions.Worker": "1.6.0", "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0", "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13", @@ -2306,7 +2479,6 @@ "Microsoft.Azure.Functions.Worker.Sdk": "1.3.0", "Microsoft.Azure.Management.Monitor": "0.28.0-preview", "Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview", - "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0", "Microsoft.Graph": "4.37.0", "Microsoft.Identity.Client": "4.46.2", "Microsoft.Identity.Web.TokenCache": "1.23.1", diff --git a/src/ApiService/Tests/packages.lock.json b/src/ApiService/Tests/packages.lock.json index b7366745e0..dfa4006dab 100644 --- a/src/ApiService/Tests/packages.lock.json +++ b/src/ApiService/Tests/packages.lock.json @@ -321,6 +321,24 @@ "System.Diagnostics.DiagnosticSource": "5.0.0" } }, + "Microsoft.ApplicationInsights.AspNetCore": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "d+7MB4YdUMc9Mtq2u6C7TritzC0eKfHkhGmlnNckDDQiOQuk9IHMPxUmPBRMm/tn+db8fI/BYno9jGxLhI+SZw==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.EventCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", + "Microsoft.AspNetCore.Hosting": "2.1.1", + "Microsoft.AspNetCore.Http": "2.1.22", + "Microsoft.Extensions.Configuration.Json": "3.1.0", + "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0", + "System.Text.Encodings.Web": "4.7.2" + } + }, "Microsoft.ApplicationInsights.DependencyCollector": { "type": "Transitive", "resolved": "2.21.0", @@ -330,6 +348,45 @@ "System.Diagnostics.DiagnosticSource": "5.0.0" } }, + "Microsoft.ApplicationInsights.EventCounterCollector": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "MfF9IKxx9UhaYHVFQ1VKw0LYvBhkjZtPNUmCTYlGws0N7D2EaupmeIj/EWalqP47sQRedR9+VzARsONcwH8OCA==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0" + } + }, + "Microsoft.ApplicationInsights.PerfCounterCollector": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "RcckSVkfu+NkDie6/HyM6AVLHmTMVZrUrYnDeJdvRByOc2a+DqTM6KXMtsTHW/5+K7DT9QK5ZrZdi0YbBW8PVA==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.Extensions.Caching.Memory": "1.0.0", + "System.Diagnostics.PerformanceCounter": "4.7.0" + } + }, + "Microsoft.ApplicationInsights.WindowsServer": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "Xbhss7dqbKyE5PENm1lRA9oxzhKEouKGMzgNqJ9xTHPZiogDwKVMK02qdbVhvaXKf9zG8RvvIpM5tnGR5o+Onw==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", + "System.Diagnostics.DiagnosticSource": "5.0.0" + } + }, + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "7D4oq+9YyagEPx+0kNNOXdG6c7IDM/2d+637nAYKFqdWhNN0IqHZEed0DuG28waj7hBSLM9lBO+B8qQqgfE4rw==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "System.IO.FileSystem.AccessControl": "4.7.0" + } + }, "Microsoft.AspNet.WebApi.Client": { "type": "Transitive", "resolved": "5.2.7", @@ -364,6 +421,94 @@ "resolved": "5.0.8", "contentHash": "ZI9S2NGjuOKXN3PxJcF8EKVwd1cqpWyUSqiVoH8gqq5tlHaXULwPmoR0DBOFON4sEFETRWI69f5RQ3tJWw205A==" }, + "Microsoft.AspNetCore.Hosting": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "MqYc0DUxrhAPnb5b4HFspxsoJT+gJlLsliSxIgovf4BsbmpaXQId0/pDiVzLuEbmks2w1/lRfY8w0lQOuK1jQQ==", + "dependencies": { + "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.1", + "Microsoft.AspNetCore.Http": "2.1.1", + "Microsoft.AspNetCore.Http.Extensions": "2.1.1", + "Microsoft.Extensions.Configuration": "2.1.1", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "2.1.1", + "Microsoft.Extensions.Configuration.FileExtensions": "2.1.1", + "Microsoft.Extensions.DependencyInjection": "2.1.1", + "Microsoft.Extensions.FileProviders.Physical": "2.1.1", + "Microsoft.Extensions.Hosting.Abstractions": "2.1.1", + "Microsoft.Extensions.Logging": "2.1.1", + "Microsoft.Extensions.Options": "2.1.1", + "System.Diagnostics.DiagnosticSource": "4.5.0", + "System.Reflection.Metadata": "1.6.0" + } + }, + "Microsoft.AspNetCore.Hosting.Abstractions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "76cKcp2pWhvdV2TXTqMg/DyW7N6cDzTEhtL8vVWFShQN+Ylwv3eO/vUQr2BS3Hz4IZHEpL+FOo2T+MtymHDqDQ==", + "dependencies": { + "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.1", + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.Extensions.Hosting.Abstractions": "2.1.1" + } + }, + "Microsoft.AspNetCore.Hosting.Server.Abstractions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "+vD7HJYzAXNq17t+NgRkpS38cxuAyOBu8ixruOiA3nWsybozolUdALWiZ5QFtGRzajSLPFA2YsbO3NPcqoUwcw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.1.1", + "Microsoft.Extensions.Configuration.Abstractions": "2.1.1" + } + }, + "Microsoft.AspNetCore.Http": { + "type": "Transitive", + "resolved": "2.1.22", + "contentHash": "+Blk++1JWqghbl8+3azQmKhiNZA5wAepL9dY2I6KVmu2Ri07MAcvAVC888qUvO7yd7xgRgZOMfihezKg14O/2A==", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.AspNetCore.WebUtilities": "2.1.1", + "Microsoft.Extensions.ObjectPool": "2.1.1", + "Microsoft.Extensions.Options": "2.1.1", + "Microsoft.Net.Http.Headers": "2.1.1" + } + }, + "Microsoft.AspNetCore.Http.Abstractions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "kQUEVOU4loc8CPSb2WoHFTESqwIa8Ik7ysCBfTwzHAd0moWovc9JQLmhDIHlYLjHbyexqZAlkq/FPRUZqokebw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.1.1", + "System.Text.Encodings.Web": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Extensions": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "ncAgV+cqsWSqjLXFUTyObGh4Tr7ShYYs3uW8Q/YpRwZn7eLV7dux5Z6GLY+rsdzmIHiia3Q2NWbLULQi7aziHw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", + "Microsoft.Extensions.FileProviders.Abstractions": "2.1.1", + "Microsoft.Net.Http.Headers": "2.1.1", + "System.Buffers": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Features": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "VklZ7hWgSvHBcDtwYYkdMdI/adlf7ebxTZ9kdzAhX+gUs5jSHE9mZlTamdgf9miSsxc1QjNazHXTDJdVPZKKTw==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1" + } + }, + "Microsoft.AspNetCore.WebUtilities": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "PGKIZt4+412Z/XPoSjvYu/QIbTxcAQuEFNoA1Pw8a9mgmO0ZhNBmfaNyhgXFf7Rq62kP0tT/2WXpxdcQhkFUPA==", + "dependencies": { + "Microsoft.Net.Http.Headers": "2.1.1", + "System.Text.Encodings.Web": "4.5.0" + } + }, "Microsoft.Azure.Functions.Worker": { "type": "Transitive", "resolved": "1.6.0", @@ -783,6 +928,11 @@ "Microsoft.Extensions.Primitives": "5.0.0" } }, + "Microsoft.Extensions.ObjectPool": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "SErON45qh4ogDp6lr6UvVmFYW0FERihW+IQ+2JyFv1PUyWktcJytFaWH5zarufJvZwhci7Rf1IyGXr9pVEadTw==" + }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "5.0.0", @@ -909,6 +1059,15 @@ "System.Security.Cryptography.Cng": "4.5.0" } }, + "Microsoft.Net.Http.Headers": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "lPNIphl8b2EuhOE9dMH6EZDmu7pS882O+HMi5BJNsigxHaWlBrYxZHFZgE18cyaPp6SSZcTkKkuzfjV/RRQKlA==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.1", + "System.Buffers": "4.5.0" + } + }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -1249,15 +1408,8 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.3.0", - "contentHash": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", - "dependencies": { - "System.Diagnostics.Debug": "4.3.0", - "System.Diagnostics.Tracing": "4.3.0", - "System.Resources.ResourceManager": "4.3.0", - "System.Runtime": "4.3.0", - "System.Threading": "4.3.0" - } + "resolved": "4.5.0", + "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" }, "System.Collections": { "type": "Transitive", @@ -1360,10 +1512,11 @@ }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "4.4.1", - "contentHash": "jz3TWKMAeuDEyrPCK5Jyt4bzQcmzUIMcY9Ud6PkElFxTfnsihV+9N/UCqvxe1z5gc7jMYAnj7V1COMS9QKIuHQ==", + "resolved": "4.7.0", + "contentHash": "/anOTeSZCNNI2zDilogWrZ8pNqCmYbzGNexUnNhjW8k0sHqEZ2nHJBp147jBV3hGYswu5lINpNg1vxR7bnqvVA==", "dependencies": { - "System.Security.Cryptography.ProtectedData": "4.4.0" + "System.Security.Cryptography.ProtectedData": "4.7.0", + "System.Security.Permissions": "4.7.0" } }, "System.Console": { @@ -1414,6 +1567,17 @@ "System.Security.Principal.Windows": "5.0.0" } }, + "System.Diagnostics.PerformanceCounter": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "kE9szT4i3TYT9bDE/BPfzg9/BL6enMiZlcUmnUEBrhRtxWvurKoa8qhXkLTRhrxMzBqaDleWlRfIPE02tulU+w==", + "dependencies": { + "Microsoft.NETCore.Platforms": "3.1.0", + "Microsoft.Win32.Registry": "4.7.0", + "System.Configuration.ConfigurationManager": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, "System.Diagnostics.Tools": { "type": "Transitive", "resolved": "4.3.0", @@ -1592,6 +1756,15 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.IO.FileSystem.AccessControl": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "vMToiarpU81LR1/KZtnT7VDPvqAZfw9oOS5nY6pPP78nGYz3COLsQH3OfzbR+SjTgltd31R6KmKklz/zDpTmzw==", + "dependencies": { + "System.Security.AccessControl": "4.7.0", + "System.Security.Principal.Windows": "4.7.0" + } + }, "System.IO.FileSystem.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -2423,7 +2596,7 @@ "Azure.Storage.Blobs": "12.13.0", "Azure.Storage.Queues": "12.11.0", "Faithlife.Utility": "0.12.2", - "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.AspNetCore": "2.21.0", "Microsoft.Azure.Functions.Worker": "1.6.0", "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0", "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13", @@ -2433,7 +2606,6 @@ "Microsoft.Azure.Functions.Worker.Sdk": "1.3.0", "Microsoft.Azure.Management.Monitor": "0.28.0-preview", "Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview", - "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0", "Microsoft.Graph": "4.37.0", "Microsoft.Identity.Client": "4.46.2", "Microsoft.Identity.Web.TokenCache": "1.23.1", From 7f71c1d41c5f9a278e5e6f66db503209b81212ed Mon Sep 17 00:00:00 2001 From: George Pollard Date: Wed, 2 Nov 2022 23:25:18 +0000 Subject: [PATCH 4/6] Update to using Functions preview package --- src/ApiService/ApiService/ApiService.csproj | 2 +- src/ApiService/ApiService/Program.cs | 6 +- src/ApiService/ApiService/packages.lock.json | 174 +++++------------- .../IntegrationTests/packages.lock.json | 169 +++++------------ src/ApiService/Tests/packages.lock.json | 169 +++++------------ 5 files changed, 133 insertions(+), 387 deletions(-) diff --git a/src/ApiService/ApiService/ApiService.csproj b/src/ApiService/ApiService/ApiService.csproj index 2d27978b2d..0f6a93d72f 100644 --- a/src/ApiService/ApiService/ApiService.csproj +++ b/src/ApiService/ApiService/ApiService.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/ApiService/ApiService/Program.cs b/src/ApiService/ApiService/Program.cs index b684951846..84ed3389cf 100644 --- a/src/ApiService/ApiService/Program.cs +++ b/src/ApiService/ApiService/Program.cs @@ -50,6 +50,9 @@ public static async Async.Task Main() { .ConfigureFunctionsWorkerDefaults( builder => { builder.UseMiddleware(); + builder.AddApplicationInsights(options => { + options.ConnectionString = $"InstrumentationKey={configuration.ApplicationInsightsInstrumentationKey}"; + }); } ) .ConfigureServices((context, services) => { @@ -111,9 +114,6 @@ public static async Async.Task Main() { .AddScoped() .AddScoped() .AddScoped() - .AddApplicationInsightsTelemetry(options => { - options.ConnectionString = $"InstrumentationKey={configuration.ApplicationInsightsInstrumentationKey}"; - }) .AddSingleton(new GraphServiceClient(new DefaultAzureCredential())) .AddSingleton() .AddSingleton() diff --git a/src/ApiService/ApiService/packages.lock.json b/src/ApiService/ApiService/packages.lock.json index fbd0ee1b7a..b336d4a66b 100644 --- a/src/ApiService/ApiService/packages.lock.json +++ b/src/ApiService/ApiService/packages.lock.json @@ -157,25 +157,6 @@ "resolved": "0.12.2", "contentHash": "JgMAGj8ekeAzKkagubXqf1UqgfHq89GyA1UQYWbkAe441uRr2Rh2rktkx5Z0LPwmD/aOqu9cxjekD2GZjP8rbw==" }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "Direct", - "requested": "[2.21.0, )", - "resolved": "2.21.0", - "contentHash": "d+7MB4YdUMc9Mtq2u6C7TritzC0eKfHkhGmlnNckDDQiOQuk9IHMPxUmPBRMm/tn+db8fI/BYno9jGxLhI+SZw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.21.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.21.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.21.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", - "Microsoft.AspNetCore.Hosting": "2.1.1", - "Microsoft.AspNetCore.Http": "2.1.22", - "Microsoft.Extensions.Configuration.Json": "3.1.0", - "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.Azure.Functions.Worker": { "type": "Direct", "requested": "[1.6.0, )", @@ -189,6 +170,16 @@ "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" } }, + "Microsoft.Azure.Functions.Worker.ApplicationInsights": { + "type": "Direct", + "requested": "[1.0.0-preview3, )", + "resolved": "1.0.0-preview3", + "contentHash": "VCbascK8UUq5FAZF+LsdmQKCL98knfT3ZBq4K757AbrUcgu/E+bTU0GkbQIa2mVuDmo+DJ2emmkqwur7lJZRbg==", + "dependencies": { + "Microsoft.ApplicationInsights.WorkerService": "2.21.0", + "Microsoft.Azure.Functions.Worker.Core": "1.8.0" + } + }, "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": { "type": "Direct", "requested": "[2.1.0, )", @@ -471,6 +462,21 @@ "System.IO.FileSystem.AccessControl": "4.7.0" } }, + "Microsoft.ApplicationInsights.WorkerService": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "Y/KcaQf+Jy92vdHTd2P8zoaW/IIUl4VkzGkvmBqi1IFQ0JXR4f6LXB73/2GMGhWMc7+QMVHeqW0QDjbLU6Fw5g==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.EventCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", + "Microsoft.Extensions.DependencyInjection": "2.1.1", + "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0" + } + }, "Microsoft.AspNet.WebApi.Client": { "type": "Transitive", "resolved": "5.2.7", @@ -505,102 +511,15 @@ "resolved": "5.0.8", "contentHash": "ZI9S2NGjuOKXN3PxJcF8EKVwd1cqpWyUSqiVoH8gqq5tlHaXULwPmoR0DBOFON4sEFETRWI69f5RQ3tJWw205A==" }, - "Microsoft.AspNetCore.Hosting": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "MqYc0DUxrhAPnb5b4HFspxsoJT+gJlLsliSxIgovf4BsbmpaXQId0/pDiVzLuEbmks2w1/lRfY8w0lQOuK1jQQ==", - "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.1", - "Microsoft.AspNetCore.Http": "2.1.1", - "Microsoft.AspNetCore.Http.Extensions": "2.1.1", - "Microsoft.Extensions.Configuration": "2.1.1", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "2.1.1", - "Microsoft.Extensions.Configuration.FileExtensions": "2.1.1", - "Microsoft.Extensions.DependencyInjection": "2.1.1", - "Microsoft.Extensions.FileProviders.Physical": "2.1.1", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.1", - "Microsoft.Extensions.Logging": "2.1.1", - "Microsoft.Extensions.Options": "2.1.1", - "System.Diagnostics.DiagnosticSource": "4.5.0", - "System.Reflection.Metadata": "1.6.0" - } - }, - "Microsoft.AspNetCore.Hosting.Abstractions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "76cKcp2pWhvdV2TXTqMg/DyW7N6cDzTEhtL8vVWFShQN+Ylwv3eO/vUQr2BS3Hz4IZHEpL+FOo2T+MtymHDqDQ==", - "dependencies": { - "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.1", - "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.1" - } - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "+vD7HJYzAXNq17t+NgRkpS38cxuAyOBu8ixruOiA3nWsybozolUdALWiZ5QFtGRzajSLPFA2YsbO3NPcqoUwcw==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.1", - "Microsoft.Extensions.Configuration.Abstractions": "2.1.1" - } - }, - "Microsoft.AspNetCore.Http": { - "type": "Transitive", - "resolved": "2.1.22", - "contentHash": "+Blk++1JWqghbl8+3azQmKhiNZA5wAepL9dY2I6KVmu2Ri07MAcvAVC888qUvO7yd7xgRgZOMfihezKg14O/2A==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", - "Microsoft.AspNetCore.WebUtilities": "2.1.1", - "Microsoft.Extensions.ObjectPool": "2.1.1", - "Microsoft.Extensions.Options": "2.1.1", - "Microsoft.Net.Http.Headers": "2.1.1" - } - }, - "Microsoft.AspNetCore.Http.Abstractions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "kQUEVOU4loc8CPSb2WoHFTESqwIa8Ik7ysCBfTwzHAd0moWovc9JQLmhDIHlYLjHbyexqZAlkq/FPRUZqokebw==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.1", - "System.Text.Encodings.Web": "4.5.0" - } - }, - "Microsoft.AspNetCore.Http.Extensions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "ncAgV+cqsWSqjLXFUTyObGh4Tr7ShYYs3uW8Q/YpRwZn7eLV7dux5Z6GLY+rsdzmIHiia3Q2NWbLULQi7aziHw==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", - "Microsoft.Extensions.FileProviders.Abstractions": "2.1.1", - "Microsoft.Net.Http.Headers": "2.1.1", - "System.Buffers": "4.5.0" - } - }, - "Microsoft.AspNetCore.Http.Features": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "VklZ7hWgSvHBcDtwYYkdMdI/adlf7ebxTZ9kdzAhX+gUs5jSHE9mZlTamdgf9miSsxc1QjNazHXTDJdVPZKKTw==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.1" - } - }, - "Microsoft.AspNetCore.WebUtilities": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "PGKIZt4+412Z/XPoSjvYu/QIbTxcAQuEFNoA1Pw8a9mgmO0ZhNBmfaNyhgXFf7Rq62kP0tT/2WXpxdcQhkFUPA==", - "dependencies": { - "Microsoft.Net.Http.Headers": "2.1.1", - "System.Text.Encodings.Web": "4.5.0" - } - }, "Microsoft.Azure.Functions.Worker.Core": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "6fTSb6JDm+1CNKsaPziL36c3tfN4xxYnC9XoJsm0g9tY+72dVqUa2aPc6RtkwBmT5sjNrsUDlUC+IhG+ehjppQ==", + "resolved": "1.8.0", + "contentHash": "8awXnik71Og7WAKUQLhPAatm236Icf9XAu0oerNCGjfAVjIF6o5U1M7id9V368ZvCsEXN3Ejq0sGRAEzjt/t6A==", "dependencies": { "Azure.Core": "1.10.0", "Microsoft.Extensions.Hosting": "5.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" + "Microsoft.Extensions.Hosting.Abstractions": "5.0.0", + "System.Collections.Immutable": "5.0.0" } }, "Microsoft.Azure.Functions.Worker.Extensions.Abstractions": { @@ -922,11 +841,6 @@ "Microsoft.Extensions.Primitives": "5.0.0" } }, - "Microsoft.Extensions.ObjectPool": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "SErON45qh4ogDp6lr6UvVmFYW0FERihW+IQ+2JyFv1PUyWktcJytFaWH5zarufJvZwhci7Rf1IyGXr9pVEadTw==" - }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "5.0.0", @@ -1025,15 +939,6 @@ "System.Security.Cryptography.Cng": "4.5.0" } }, - "Microsoft.Net.Http.Headers": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "lPNIphl8b2EuhOE9dMH6EZDmu7pS882O+HMi5BJNsigxHaWlBrYxZHFZgE18cyaPp6SSZcTkKkuzfjV/RRQKlA==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.1", - "System.Buffers": "4.5.0" - } - }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -1319,8 +1224,15 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" + "resolved": "4.3.0", + "contentHash": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } }, "System.Collections": { "type": "Transitive", @@ -1349,6 +1261,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==" + }, "System.ComponentModel.Annotations": { "type": "Transitive", "resolved": "4.4.1", @@ -1756,11 +1673,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", diff --git a/src/ApiService/IntegrationTests/packages.lock.json b/src/ApiService/IntegrationTests/packages.lock.json index fcb55b3315..81bd5cab95 100644 --- a/src/ApiService/IntegrationTests/packages.lock.json +++ b/src/ApiService/IntegrationTests/packages.lock.json @@ -272,24 +272,6 @@ "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "d+7MB4YdUMc9Mtq2u6C7TritzC0eKfHkhGmlnNckDDQiOQuk9IHMPxUmPBRMm/tn+db8fI/BYno9jGxLhI+SZw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.21.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.21.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.21.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", - "Microsoft.AspNetCore.Hosting": "2.1.1", - "Microsoft.AspNetCore.Http": "2.1.22", - "Microsoft.Extensions.Configuration.Json": "3.1.0", - "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.ApplicationInsights.DependencyCollector": { "type": "Transitive", "resolved": "2.21.0", @@ -338,6 +320,21 @@ "System.IO.FileSystem.AccessControl": "4.7.0" } }, + "Microsoft.ApplicationInsights.WorkerService": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "Y/KcaQf+Jy92vdHTd2P8zoaW/IIUl4VkzGkvmBqi1IFQ0JXR4f6LXB73/2GMGhWMc7+QMVHeqW0QDjbLU6Fw5g==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.EventCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", + "Microsoft.Extensions.DependencyInjection": "2.1.1", + "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0" + } + }, "Microsoft.AspNet.WebApi.Client": { "type": "Transitive", "resolved": "5.2.7", @@ -372,94 +369,6 @@ "resolved": "5.0.8", "contentHash": "ZI9S2NGjuOKXN3PxJcF8EKVwd1cqpWyUSqiVoH8gqq5tlHaXULwPmoR0DBOFON4sEFETRWI69f5RQ3tJWw205A==" }, - "Microsoft.AspNetCore.Hosting": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "MqYc0DUxrhAPnb5b4HFspxsoJT+gJlLsliSxIgovf4BsbmpaXQId0/pDiVzLuEbmks2w1/lRfY8w0lQOuK1jQQ==", - "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.1", - "Microsoft.AspNetCore.Http": "2.1.1", - "Microsoft.AspNetCore.Http.Extensions": "2.1.1", - "Microsoft.Extensions.Configuration": "2.1.1", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "2.1.1", - "Microsoft.Extensions.Configuration.FileExtensions": "2.1.1", - "Microsoft.Extensions.DependencyInjection": "2.1.1", - "Microsoft.Extensions.FileProviders.Physical": "2.1.1", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.1", - "Microsoft.Extensions.Logging": "2.1.1", - "Microsoft.Extensions.Options": "2.1.1", - "System.Diagnostics.DiagnosticSource": "4.5.0", - "System.Reflection.Metadata": "1.6.0" - } - }, - "Microsoft.AspNetCore.Hosting.Abstractions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "76cKcp2pWhvdV2TXTqMg/DyW7N6cDzTEhtL8vVWFShQN+Ylwv3eO/vUQr2BS3Hz4IZHEpL+FOo2T+MtymHDqDQ==", - "dependencies": { - "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.1", - "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.1" - } - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "+vD7HJYzAXNq17t+NgRkpS38cxuAyOBu8ixruOiA3nWsybozolUdALWiZ5QFtGRzajSLPFA2YsbO3NPcqoUwcw==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.1", - "Microsoft.Extensions.Configuration.Abstractions": "2.1.1" - } - }, - "Microsoft.AspNetCore.Http": { - "type": "Transitive", - "resolved": "2.1.22", - "contentHash": "+Blk++1JWqghbl8+3azQmKhiNZA5wAepL9dY2I6KVmu2Ri07MAcvAVC888qUvO7yd7xgRgZOMfihezKg14O/2A==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", - "Microsoft.AspNetCore.WebUtilities": "2.1.1", - "Microsoft.Extensions.ObjectPool": "2.1.1", - "Microsoft.Extensions.Options": "2.1.1", - "Microsoft.Net.Http.Headers": "2.1.1" - } - }, - "Microsoft.AspNetCore.Http.Abstractions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "kQUEVOU4loc8CPSb2WoHFTESqwIa8Ik7ysCBfTwzHAd0moWovc9JQLmhDIHlYLjHbyexqZAlkq/FPRUZqokebw==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.1", - "System.Text.Encodings.Web": "4.5.0" - } - }, - "Microsoft.AspNetCore.Http.Extensions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "ncAgV+cqsWSqjLXFUTyObGh4Tr7ShYYs3uW8Q/YpRwZn7eLV7dux5Z6GLY+rsdzmIHiia3Q2NWbLULQi7aziHw==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", - "Microsoft.Extensions.FileProviders.Abstractions": "2.1.1", - "Microsoft.Net.Http.Headers": "2.1.1", - "System.Buffers": "4.5.0" - } - }, - "Microsoft.AspNetCore.Http.Features": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "VklZ7hWgSvHBcDtwYYkdMdI/adlf7ebxTZ9kdzAhX+gUs5jSHE9mZlTamdgf9miSsxc1QjNazHXTDJdVPZKKTw==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.1" - } - }, - "Microsoft.AspNetCore.WebUtilities": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "PGKIZt4+412Z/XPoSjvYu/QIbTxcAQuEFNoA1Pw8a9mgmO0ZhNBmfaNyhgXFf7Rq62kP0tT/2WXpxdcQhkFUPA==", - "dependencies": { - "Microsoft.Net.Http.Headers": "2.1.1", - "System.Text.Encodings.Web": "4.5.0" - } - }, "Microsoft.Azure.Functions.Worker": { "type": "Transitive", "resolved": "1.6.0", @@ -472,14 +381,24 @@ "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" } }, + "Microsoft.Azure.Functions.Worker.ApplicationInsights": { + "type": "Transitive", + "resolved": "1.0.0-preview3", + "contentHash": "VCbascK8UUq5FAZF+LsdmQKCL98knfT3ZBq4K757AbrUcgu/E+bTU0GkbQIa2mVuDmo+DJ2emmkqwur7lJZRbg==", + "dependencies": { + "Microsoft.ApplicationInsights.WorkerService": "2.21.0", + "Microsoft.Azure.Functions.Worker.Core": "1.8.0" + } + }, "Microsoft.Azure.Functions.Worker.Core": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "6fTSb6JDm+1CNKsaPziL36c3tfN4xxYnC9XoJsm0g9tY+72dVqUa2aPc6RtkwBmT5sjNrsUDlUC+IhG+ehjppQ==", + "resolved": "1.8.0", + "contentHash": "8awXnik71Og7WAKUQLhPAatm236Icf9XAu0oerNCGjfAVjIF6o5U1M7id9V368ZvCsEXN3Ejq0sGRAEzjt/t6A==", "dependencies": { "Azure.Core": "1.10.0", "Microsoft.Extensions.Hosting": "5.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" + "Microsoft.Extensions.Hosting.Abstractions": "5.0.0", + "System.Collections.Immutable": "5.0.0" } }, "Microsoft.Azure.Functions.Worker.Extensions.Abstractions": { @@ -879,11 +798,6 @@ "Microsoft.Extensions.Primitives": "5.0.0" } }, - "Microsoft.Extensions.ObjectPool": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "SErON45qh4ogDp6lr6UvVmFYW0FERihW+IQ+2JyFv1PUyWktcJytFaWH5zarufJvZwhci7Rf1IyGXr9pVEadTw==" - }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "5.0.0", @@ -1010,15 +924,6 @@ "System.Security.Cryptography.Cng": "4.5.0" } }, - "Microsoft.Net.Http.Headers": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "lPNIphl8b2EuhOE9dMH6EZDmu7pS882O+HMi5BJNsigxHaWlBrYxZHFZgE18cyaPp6SSZcTkKkuzfjV/RRQKlA==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.1", - "System.Buffers": "4.5.0" - } - }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -1359,8 +1264,15 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" + "resolved": "4.3.0", + "contentHash": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } }, "System.Collections": { "type": "Transitive", @@ -1389,6 +1301,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==" + }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -2469,8 +2386,8 @@ "Azure.Storage.Blobs": "12.13.0", "Azure.Storage.Queues": "12.11.0", "Faithlife.Utility": "0.12.2", - "Microsoft.ApplicationInsights.AspNetCore": "2.21.0", "Microsoft.Azure.Functions.Worker": "1.6.0", + "Microsoft.Azure.Functions.Worker.ApplicationInsights": "1.0.0-preview3", "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0", "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13", "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0", diff --git a/src/ApiService/Tests/packages.lock.json b/src/ApiService/Tests/packages.lock.json index dfa4006dab..b8cd955597 100644 --- a/src/ApiService/Tests/packages.lock.json +++ b/src/ApiService/Tests/packages.lock.json @@ -321,24 +321,6 @@ "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "Transitive", - "resolved": "2.21.0", - "contentHash": "d+7MB4YdUMc9Mtq2u6C7TritzC0eKfHkhGmlnNckDDQiOQuk9IHMPxUmPBRMm/tn+db8fI/BYno9jGxLhI+SZw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.21.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.21.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.21.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", - "Microsoft.AspNetCore.Hosting": "2.1.1", - "Microsoft.AspNetCore.Http": "2.1.22", - "Microsoft.Extensions.Configuration.Json": "3.1.0", - "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.ApplicationInsights.DependencyCollector": { "type": "Transitive", "resolved": "2.21.0", @@ -387,6 +369,21 @@ "System.IO.FileSystem.AccessControl": "4.7.0" } }, + "Microsoft.ApplicationInsights.WorkerService": { + "type": "Transitive", + "resolved": "2.21.0", + "contentHash": "Y/KcaQf+Jy92vdHTd2P8zoaW/IIUl4VkzGkvmBqi1IFQ0JXR4f6LXB73/2GMGhWMc7+QMVHeqW0QDjbLU6Fw5g==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.21.0", + "Microsoft.ApplicationInsights.DependencyCollector": "2.21.0", + "Microsoft.ApplicationInsights.EventCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.PerfCounterCollector": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer": "2.21.0", + "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.21.0", + "Microsoft.Extensions.DependencyInjection": "2.1.1", + "Microsoft.Extensions.Logging.ApplicationInsights": "2.21.0" + } + }, "Microsoft.AspNet.WebApi.Client": { "type": "Transitive", "resolved": "5.2.7", @@ -421,94 +418,6 @@ "resolved": "5.0.8", "contentHash": "ZI9S2NGjuOKXN3PxJcF8EKVwd1cqpWyUSqiVoH8gqq5tlHaXULwPmoR0DBOFON4sEFETRWI69f5RQ3tJWw205A==" }, - "Microsoft.AspNetCore.Hosting": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "MqYc0DUxrhAPnb5b4HFspxsoJT+gJlLsliSxIgovf4BsbmpaXQId0/pDiVzLuEbmks2w1/lRfY8w0lQOuK1jQQ==", - "dependencies": { - "Microsoft.AspNetCore.Hosting.Abstractions": "2.1.1", - "Microsoft.AspNetCore.Http": "2.1.1", - "Microsoft.AspNetCore.Http.Extensions": "2.1.1", - "Microsoft.Extensions.Configuration": "2.1.1", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "2.1.1", - "Microsoft.Extensions.Configuration.FileExtensions": "2.1.1", - "Microsoft.Extensions.DependencyInjection": "2.1.1", - "Microsoft.Extensions.FileProviders.Physical": "2.1.1", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.1", - "Microsoft.Extensions.Logging": "2.1.1", - "Microsoft.Extensions.Options": "2.1.1", - "System.Diagnostics.DiagnosticSource": "4.5.0", - "System.Reflection.Metadata": "1.6.0" - } - }, - "Microsoft.AspNetCore.Hosting.Abstractions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "76cKcp2pWhvdV2TXTqMg/DyW7N6cDzTEhtL8vVWFShQN+Ylwv3eO/vUQr2BS3Hz4IZHEpL+FOo2T+MtymHDqDQ==", - "dependencies": { - "Microsoft.AspNetCore.Hosting.Server.Abstractions": "2.1.1", - "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", - "Microsoft.Extensions.Hosting.Abstractions": "2.1.1" - } - }, - "Microsoft.AspNetCore.Hosting.Server.Abstractions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "+vD7HJYzAXNq17t+NgRkpS38cxuAyOBu8ixruOiA3nWsybozolUdALWiZ5QFtGRzajSLPFA2YsbO3NPcqoUwcw==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.1", - "Microsoft.Extensions.Configuration.Abstractions": "2.1.1" - } - }, - "Microsoft.AspNetCore.Http": { - "type": "Transitive", - "resolved": "2.1.22", - "contentHash": "+Blk++1JWqghbl8+3azQmKhiNZA5wAepL9dY2I6KVmu2Ri07MAcvAVC888qUvO7yd7xgRgZOMfihezKg14O/2A==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", - "Microsoft.AspNetCore.WebUtilities": "2.1.1", - "Microsoft.Extensions.ObjectPool": "2.1.1", - "Microsoft.Extensions.Options": "2.1.1", - "Microsoft.Net.Http.Headers": "2.1.1" - } - }, - "Microsoft.AspNetCore.Http.Abstractions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "kQUEVOU4loc8CPSb2WoHFTESqwIa8Ik7ysCBfTwzHAd0moWovc9JQLmhDIHlYLjHbyexqZAlkq/FPRUZqokebw==", - "dependencies": { - "Microsoft.AspNetCore.Http.Features": "2.1.1", - "System.Text.Encodings.Web": "4.5.0" - } - }, - "Microsoft.AspNetCore.Http.Extensions": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "ncAgV+cqsWSqjLXFUTyObGh4Tr7ShYYs3uW8Q/YpRwZn7eLV7dux5Z6GLY+rsdzmIHiia3Q2NWbLULQi7aziHw==", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "2.1.1", - "Microsoft.Extensions.FileProviders.Abstractions": "2.1.1", - "Microsoft.Net.Http.Headers": "2.1.1", - "System.Buffers": "4.5.0" - } - }, - "Microsoft.AspNetCore.Http.Features": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "VklZ7hWgSvHBcDtwYYkdMdI/adlf7ebxTZ9kdzAhX+gUs5jSHE9mZlTamdgf9miSsxc1QjNazHXTDJdVPZKKTw==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.1" - } - }, - "Microsoft.AspNetCore.WebUtilities": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "PGKIZt4+412Z/XPoSjvYu/QIbTxcAQuEFNoA1Pw8a9mgmO0ZhNBmfaNyhgXFf7Rq62kP0tT/2WXpxdcQhkFUPA==", - "dependencies": { - "Microsoft.Net.Http.Headers": "2.1.1", - "System.Text.Encodings.Web": "4.5.0" - } - }, "Microsoft.Azure.Functions.Worker": { "type": "Transitive", "resolved": "1.6.0", @@ -521,14 +430,24 @@ "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" } }, + "Microsoft.Azure.Functions.Worker.ApplicationInsights": { + "type": "Transitive", + "resolved": "1.0.0-preview3", + "contentHash": "VCbascK8UUq5FAZF+LsdmQKCL98knfT3ZBq4K757AbrUcgu/E+bTU0GkbQIa2mVuDmo+DJ2emmkqwur7lJZRbg==", + "dependencies": { + "Microsoft.ApplicationInsights.WorkerService": "2.21.0", + "Microsoft.Azure.Functions.Worker.Core": "1.8.0" + } + }, "Microsoft.Azure.Functions.Worker.Core": { "type": "Transitive", - "resolved": "1.4.0", - "contentHash": "6fTSb6JDm+1CNKsaPziL36c3tfN4xxYnC9XoJsm0g9tY+72dVqUa2aPc6RtkwBmT5sjNrsUDlUC+IhG+ehjppQ==", + "resolved": "1.8.0", + "contentHash": "8awXnik71Og7WAKUQLhPAatm236Icf9XAu0oerNCGjfAVjIF6o5U1M7id9V368ZvCsEXN3Ejq0sGRAEzjt/t6A==", "dependencies": { "Azure.Core": "1.10.0", "Microsoft.Extensions.Hosting": "5.0.0", - "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" + "Microsoft.Extensions.Hosting.Abstractions": "5.0.0", + "System.Collections.Immutable": "5.0.0" } }, "Microsoft.Azure.Functions.Worker.Extensions.Abstractions": { @@ -928,11 +847,6 @@ "Microsoft.Extensions.Primitives": "5.0.0" } }, - "Microsoft.Extensions.ObjectPool": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "SErON45qh4ogDp6lr6UvVmFYW0FERihW+IQ+2JyFv1PUyWktcJytFaWH5zarufJvZwhci7Rf1IyGXr9pVEadTw==" - }, "Microsoft.Extensions.Options": { "type": "Transitive", "resolved": "5.0.0", @@ -1059,15 +973,6 @@ "System.Security.Cryptography.Cng": "4.5.0" } }, - "Microsoft.Net.Http.Headers": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "lPNIphl8b2EuhOE9dMH6EZDmu7pS882O+HMi5BJNsigxHaWlBrYxZHFZgE18cyaPp6SSZcTkKkuzfjV/RRQKlA==", - "dependencies": { - "Microsoft.Extensions.Primitives": "2.1.1", - "System.Buffers": "4.5.0" - } - }, "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "5.0.0", @@ -1408,8 +1313,15 @@ }, "System.Buffers": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "pL2ChpaRRWI/p4LXyy4RgeWlYF2sgfj/pnVMvBqwNFr5cXg7CXNnWZWxrOONLg8VGdFB8oB+EG2Qw4MLgTOe+A==" + "resolved": "4.3.0", + "contentHash": "ratu44uTIHgeBeI0dE8DWvmXVBSo4u7ozRZZHOMmK/JPpYyo0dAfgSiHlpiObMQ5lEtEyIXA40sKRYg5J6A8uQ==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } }, "System.Collections": { "type": "Transitive", @@ -1438,6 +1350,11 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "FXkLXiK0sVVewcso0imKQoOxjoPAj42R8HtjjbSjVPAzwDfzoyoznWxgA3c38LDbN9SJux1xXoXYAhz98j7r2g==" + }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -2596,8 +2513,8 @@ "Azure.Storage.Blobs": "12.13.0", "Azure.Storage.Queues": "12.11.0", "Faithlife.Utility": "0.12.2", - "Microsoft.ApplicationInsights.AspNetCore": "2.21.0", "Microsoft.Azure.Functions.Worker": "1.6.0", + "Microsoft.Azure.Functions.Worker.ApplicationInsights": "1.0.0-preview3", "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0", "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13", "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0", From 5158bc1fdb654a4bfd4eb199c287ba7ba470aeae Mon Sep 17 00:00:00 2001 From: George Pollard Date: Wed, 2 Nov 2022 23:26:07 +0000 Subject: [PATCH 5/6] Reformat --- src/ApiService/ApiService/Program.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/ApiService/ApiService/Program.cs b/src/ApiService/ApiService/Program.cs index 84ed3389cf..7db6db60f7 100644 --- a/src/ApiService/ApiService/Program.cs +++ b/src/ApiService/ApiService/Program.cs @@ -47,14 +47,12 @@ public static async Async.Task Main() { using var host = new HostBuilder() - .ConfigureFunctionsWorkerDefaults( - builder => { - builder.UseMiddleware(); - builder.AddApplicationInsights(options => { - options.ConnectionString = $"InstrumentationKey={configuration.ApplicationInsightsInstrumentationKey}"; - }); - } - ) + .ConfigureFunctionsWorkerDefaults(builder => { + builder.UseMiddleware(); + builder.AddApplicationInsights(options => { + options.ConnectionString = $"InstrumentationKey={configuration.ApplicationInsightsInstrumentationKey}"; + }); + }) .ConfigureServices((context, services) => { services.Configure(options => { options = EntityConverter.GetJsonSerializerOptions(); From 74f51aaab20eee7afb2526fedfe0f112c2e11584 Mon Sep 17 00:00:00 2001 From: George Pollard Date: Thu, 3 Nov 2022 00:01:14 +0000 Subject: [PATCH 6/6] Update packages --- src/ApiService/ApiService/ApiService.csproj | 4 +- src/ApiService/ApiService/packages.lock.json | 108 ++++++++++++------ .../IntegrationTests/packages.lock.json | 107 +++++++++++------ src/ApiService/Tests/packages.lock.json | 107 +++++++++++------ 4 files changed, 215 insertions(+), 111 deletions(-) diff --git a/src/ApiService/ApiService/ApiService.csproj b/src/ApiService/ApiService/ApiService.csproj index 0f6a93d72f..de0ef32cd3 100644 --- a/src/ApiService/ApiService/ApiService.csproj +++ b/src/ApiService/ApiService/ApiService.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/ApiService/ApiService/packages.lock.json b/src/ApiService/ApiService/packages.lock.json index b336d4a66b..62dc47a60b 100644 --- a/src/ApiService/ApiService/packages.lock.json +++ b/src/ApiService/ApiService/packages.lock.json @@ -159,13 +159,13 @@ }, "Microsoft.Azure.Functions.Worker": { "type": "Direct", - "requested": "[1.6.0, )", - "resolved": "1.6.0", - "contentHash": "Gzq2IPcMCym6wPpFayLbuvhrfr72OEInJJlKaIAqU9+HldVaTt54cm3hPe7kIok+QuWnwb/TtYtlmrkR0Nbhsg==", + "requested": "[1.10.0, )", + "resolved": "1.10.0", + "contentHash": "LBase3J7/ZBaCrAgcTu629tCXleoO+4oft+6Q/F0HL5oc6qFqpMZ5oxMiA34kGXhb9D3A/CghJtNEwiBF1qWCA==", "dependencies": { "Azure.Core": "1.10.0", - "Microsoft.Azure.Functions.Worker.Core": "1.4.0", - "Microsoft.Azure.Functions.Worker.Grpc": "1.3.1", + "Microsoft.Azure.Functions.Worker.Core": "1.8.0", + "Microsoft.Azure.Functions.Worker.Grpc": "1.6.0", "Microsoft.Extensions.Hosting": "5.0.0", "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" } @@ -230,11 +230,12 @@ }, "Microsoft.Azure.Functions.Worker.Sdk": { "type": "Direct", - "requested": "[1.3.0, )", - "resolved": "1.3.0", - "contentHash": "g9oXOl9xr1O3alWItAiYLNu3BnXebLW51BRB06yuO86LPGRZewyJu88EwUdC2NU9wnIeE3/ObMuEAnRALZeuTQ==", + "requested": "[1.7.0, )", + "resolved": "1.7.0", + "contentHash": "kJZEtB4EIB3VeXyUxfilXWE6c49rNnIZvPvPBN6tpTvNHqJQrXm7pgsjwmE3Qw2t2EwhDgVdFDckWNbQQnnS1w==", "dependencies": { - "Microsoft.Azure.Functions.Worker.Sdk.Analyzers": "1.1.0" + "Microsoft.Azure.Functions.Worker.Sdk.Analyzers": "1.1.0", + "Microsoft.Azure.Functions.Worker.Sdk.Generators": "1.0.0-preview1" } }, "Microsoft.Azure.Management.Monitor": { @@ -365,45 +366,41 @@ }, "Google.Protobuf": { "type": "Transitive", - "resolved": "3.15.8", - "contentHash": "tA0S9QXJq+r3CjwBlcn5glEUrbdAxhPWO4yhq5+ycn6WW6+nsvqzO6Qf6NE9XWbEz/F2QSpBTxjdTI7SvVy7CQ==", - "dependencies": { - "System.Memory": "4.5.3", - "System.Runtime.CompilerServices.Unsafe": "4.5.2" - } + "resolved": "3.21.7", + "contentHash": "0Q+wYqtEVjRxVbtfxXzTUzwLGMZJKqhmIgdDpwWyg8J4ykYqfPn0M60FPBcZkjiGgtJqvZp+8t2van9rxTCLWQ==" }, "Grpc.Core.Api": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "ubqW2nTpiHyDudYGVXM+Vjh6WbgsI1fVQxsDK14/GnyPgiNMuNl8+GQcAYp5QPhAk5H4fjHJPI+KvbpVk8z6iQ==", + "resolved": "2.49.0", + "contentHash": "6OTcSQ8iML+xzmELhH4anUZlNM3dHDKPFBsMLSdiT80LJaaZKxwZml/K9ZdfLIjSR/EzdMZzzU2Avbedz4N7BA==", "dependencies": { "System.Memory": "4.5.3" } }, "Grpc.Net.Client": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "oMDNXAPkBzfXljv/ZzlZSf22TEstBNI6je85/c3iztlFbbixTMLgi0sIu/uHtEKoEWUPr0nmBMvD+jtqKorGTg==", + "resolved": "2.49.0", + "contentHash": "mLXxEJzqnRHseVzRCzSQznA7y8pcSStVbstLTUuQRulN7kREovh82ctNkGpkfwONi/DHoWscX9mJLiAmh0gjOQ==", "dependencies": { - "Grpc.Net.Common": "2.37.0", + "Grpc.Net.Common": "2.49.0", "Microsoft.Extensions.Logging.Abstractions": "3.0.3" } }, "Grpc.Net.ClientFactory": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "zyeFej1A36+s5K6+zDUirmDEGHEFnHapQisT7YsR9nQqKsw1uYqjtG1gSVSg/Zvk0KYeLHs5/URtTU71kS4APg==", + "resolved": "2.49.0", + "contentHash": "4Ac7dsrARbcs1g2vrUSUadtZ0kIGTk6yhA5ccOBjgM+RTzY3L54TgMddmeaV7/Z4f9sZn6T1ls6FmUiG8Dms+Q==", "dependencies": { - "Grpc.Net.Client": "2.37.0", + "Grpc.Net.Client": "2.49.0", "Microsoft.Extensions.Http": "3.0.3" } }, "Grpc.Net.Common": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "V7fZb+87qB6Jio6uWXDHkxI9WT+y4EFwicAHkzB2lm/9wJazD0V35HhQjxvoONsldObaUimjqd4b/XZ0G07sDQ==", + "resolved": "2.49.0", + "contentHash": "G0TVTS8fjCk8b7td/E7C8/ssJPm3JnGVBKsveoj/89PIwIee72qkXG+tVn5c1gwTanEFPdyPoydna/bmU/NAaw==", "dependencies": { - "Grpc.Core.Api": "2.37.0" + "Grpc.Core.Api": "2.49.0" } }, "Microsoft.ApplicationInsights": { @@ -545,14 +542,14 @@ }, "Microsoft.Azure.Functions.Worker.Grpc": { "type": "Transitive", - "resolved": "1.3.1", - "contentHash": "lMlbyfRagSQZVWN73jnaB0tVTMhfKHSy6IvFXC7fCGh+7uA9LJNjcMOQbVkUnmvb/I/SxslMqD7xcebrxFL3TQ==", + "resolved": "1.6.0", + "contentHash": "r0bAEtBNy9ropO+Ii5V82l8X6R9mbYlGrXlTQPZI09JQuPJiQ86xc36+YLledVn8t8R2EiJMw5UUOpSOXY/ADw==", "dependencies": { "Azure.Core": "1.10.0", - "Google.Protobuf": "3.15.8", - "Grpc.Net.Client": "2.37.0", - "Grpc.Net.ClientFactory": "2.37.0", - "Microsoft.Azure.Functions.Worker.Core": "1.3.1", + "Google.Protobuf": "3.21.7", + "Grpc.Net.Client": "2.49.0", + "Grpc.Net.ClientFactory": "2.49.0", + "Microsoft.Azure.Functions.Worker.Core": "1.8.0", "Microsoft.Extensions.Hosting": "5.0.0", "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" } @@ -562,11 +559,46 @@ "resolved": "1.1.0", "contentHash": "J7AZ9iv/UCd4Di0c84h1P/Sa1aQr5uqO0EBUKwE0AZeWJ11dDfKAwxMiAxYOKR+giy31DWBnuFc4GKY3BQYUjg==" }, + "Microsoft.Azure.Functions.Worker.Sdk.Generators": { + "type": "Transitive", + "resolved": "1.0.0-preview1", + "contentHash": "XwJtFvfC0NlqpcNsZzcf8td9Pg4NlstU9+eKTrRxKp0kiNK5EowoixhUIeK/wseI9R0goILZdQ190tkwlojbTw==", + "dependencies": { + "Microsoft.CodeAnalysis.CSharp": "3.11.0" + } + }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.CodeAnalysis.Analyzers": { + "type": "Transitive", + "resolved": "3.3.2", + "contentHash": "7xt6zTlIEizUgEsYAIgm37EbdkiMmr6fP6J9pDoKEpiGM4pi32BCPGr/IczmSJI9Zzp0a6HOzpr9OvpMP+2veA==" + }, + "Microsoft.CodeAnalysis.Common": { + "type": "Transitive", + "resolved": "3.11.0", + "contentHash": "FDKSkRRXnaEWMa2ONkLMo0ZAt/uiV1XIXyodwKIgP1AMIKA7JJKXx/OwFVsvkkUT4BeobLwokoxFw70fICahNg==", + "dependencies": { + "Microsoft.CodeAnalysis.Analyzers": "3.3.2", + "System.Collections.Immutable": "5.0.0", + "System.Memory": "4.5.4", + "System.Reflection.Metadata": "5.0.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encoding.CodePages": "4.5.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.CodeAnalysis.CSharp": { + "type": "Transitive", + "resolved": "3.11.0", + "contentHash": "aDRRb7y/sXoJyDqFEQ3Il9jZxyUMHkShzZeCRjQf3SS84n2J0cTEi3TbwVZE9XJvAeMJhGfVVxwOdjYBg6ljmw==", + "dependencies": { + "Microsoft.CodeAnalysis.Common": "[3.11.0]" + } + }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.5.0", @@ -1673,6 +1705,11 @@ "System.Runtime": "4.3.0" } }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==" + }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1978,10 +2015,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "6JX7ZdaceBiLKLkYt8zJcp4xTJd1uYyXXEkPw6mnlUIjh1gZPIVKPtRXPmY5kLf6DwZmf5YLwR3QUrRonl7l0A==", + "resolved": "4.5.1", + "contentHash": "4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==", "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0" + "Microsoft.NETCore.Platforms": "2.1.2", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" } }, "System.Text.Encoding.Extensions": { diff --git a/src/ApiService/IntegrationTests/packages.lock.json b/src/ApiService/IntegrationTests/packages.lock.json index 81bd5cab95..6f063f9a70 100644 --- a/src/ApiService/IntegrationTests/packages.lock.json +++ b/src/ApiService/IntegrationTests/packages.lock.json @@ -223,45 +223,41 @@ }, "Google.Protobuf": { "type": "Transitive", - "resolved": "3.15.8", - "contentHash": "tA0S9QXJq+r3CjwBlcn5glEUrbdAxhPWO4yhq5+ycn6WW6+nsvqzO6Qf6NE9XWbEz/F2QSpBTxjdTI7SvVy7CQ==", - "dependencies": { - "System.Memory": "4.5.3", - "System.Runtime.CompilerServices.Unsafe": "4.5.2" - } + "resolved": "3.21.7", + "contentHash": "0Q+wYqtEVjRxVbtfxXzTUzwLGMZJKqhmIgdDpwWyg8J4ykYqfPn0M60FPBcZkjiGgtJqvZp+8t2van9rxTCLWQ==" }, "Grpc.Core.Api": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "ubqW2nTpiHyDudYGVXM+Vjh6WbgsI1fVQxsDK14/GnyPgiNMuNl8+GQcAYp5QPhAk5H4fjHJPI+KvbpVk8z6iQ==", + "resolved": "2.49.0", + "contentHash": "6OTcSQ8iML+xzmELhH4anUZlNM3dHDKPFBsMLSdiT80LJaaZKxwZml/K9ZdfLIjSR/EzdMZzzU2Avbedz4N7BA==", "dependencies": { "System.Memory": "4.5.3" } }, "Grpc.Net.Client": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "oMDNXAPkBzfXljv/ZzlZSf22TEstBNI6je85/c3iztlFbbixTMLgi0sIu/uHtEKoEWUPr0nmBMvD+jtqKorGTg==", + "resolved": "2.49.0", + "contentHash": "mLXxEJzqnRHseVzRCzSQznA7y8pcSStVbstLTUuQRulN7kREovh82ctNkGpkfwONi/DHoWscX9mJLiAmh0gjOQ==", "dependencies": { - "Grpc.Net.Common": "2.37.0", + "Grpc.Net.Common": "2.49.0", "Microsoft.Extensions.Logging.Abstractions": "3.0.3" } }, "Grpc.Net.ClientFactory": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "zyeFej1A36+s5K6+zDUirmDEGHEFnHapQisT7YsR9nQqKsw1uYqjtG1gSVSg/Zvk0KYeLHs5/URtTU71kS4APg==", + "resolved": "2.49.0", + "contentHash": "4Ac7dsrARbcs1g2vrUSUadtZ0kIGTk6yhA5ccOBjgM+RTzY3L54TgMddmeaV7/Z4f9sZn6T1ls6FmUiG8Dms+Q==", "dependencies": { - "Grpc.Net.Client": "2.37.0", + "Grpc.Net.Client": "2.49.0", "Microsoft.Extensions.Http": "3.0.3" } }, "Grpc.Net.Common": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "V7fZb+87qB6Jio6uWXDHkxI9WT+y4EFwicAHkzB2lm/9wJazD0V35HhQjxvoONsldObaUimjqd4b/XZ0G07sDQ==", + "resolved": "2.49.0", + "contentHash": "G0TVTS8fjCk8b7td/E7C8/ssJPm3JnGVBKsveoj/89PIwIee72qkXG+tVn5c1gwTanEFPdyPoydna/bmU/NAaw==", "dependencies": { - "Grpc.Core.Api": "2.37.0" + "Grpc.Core.Api": "2.49.0" } }, "Microsoft.ApplicationInsights": { @@ -371,12 +367,12 @@ }, "Microsoft.Azure.Functions.Worker": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "Gzq2IPcMCym6wPpFayLbuvhrfr72OEInJJlKaIAqU9+HldVaTt54cm3hPe7kIok+QuWnwb/TtYtlmrkR0Nbhsg==", + "resolved": "1.10.0", + "contentHash": "LBase3J7/ZBaCrAgcTu629tCXleoO+4oft+6Q/F0HL5oc6qFqpMZ5oxMiA34kGXhb9D3A/CghJtNEwiBF1qWCA==", "dependencies": { "Azure.Core": "1.10.0", - "Microsoft.Azure.Functions.Worker.Core": "1.4.0", - "Microsoft.Azure.Functions.Worker.Grpc": "1.3.1", + "Microsoft.Azure.Functions.Worker.Core": "1.8.0", + "Microsoft.Azure.Functions.Worker.Grpc": "1.6.0", "Microsoft.Extensions.Hosting": "5.0.0", "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" } @@ -467,24 +463,25 @@ }, "Microsoft.Azure.Functions.Worker.Grpc": { "type": "Transitive", - "resolved": "1.3.1", - "contentHash": "lMlbyfRagSQZVWN73jnaB0tVTMhfKHSy6IvFXC7fCGh+7uA9LJNjcMOQbVkUnmvb/I/SxslMqD7xcebrxFL3TQ==", + "resolved": "1.6.0", + "contentHash": "r0bAEtBNy9ropO+Ii5V82l8X6R9mbYlGrXlTQPZI09JQuPJiQ86xc36+YLledVn8t8R2EiJMw5UUOpSOXY/ADw==", "dependencies": { "Azure.Core": "1.10.0", - "Google.Protobuf": "3.15.8", - "Grpc.Net.Client": "2.37.0", - "Grpc.Net.ClientFactory": "2.37.0", - "Microsoft.Azure.Functions.Worker.Core": "1.3.1", + "Google.Protobuf": "3.21.7", + "Grpc.Net.Client": "2.49.0", + "Grpc.Net.ClientFactory": "2.49.0", + "Microsoft.Azure.Functions.Worker.Core": "1.8.0", "Microsoft.Extensions.Hosting": "5.0.0", "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" } }, "Microsoft.Azure.Functions.Worker.Sdk": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "g9oXOl9xr1O3alWItAiYLNu3BnXebLW51BRB06yuO86LPGRZewyJu88EwUdC2NU9wnIeE3/ObMuEAnRALZeuTQ==", + "resolved": "1.7.0", + "contentHash": "kJZEtB4EIB3VeXyUxfilXWE6c49rNnIZvPvPBN6tpTvNHqJQrXm7pgsjwmE3Qw2t2EwhDgVdFDckWNbQQnnS1w==", "dependencies": { - "Microsoft.Azure.Functions.Worker.Sdk.Analyzers": "1.1.0" + "Microsoft.Azure.Functions.Worker.Sdk.Analyzers": "1.1.0", + "Microsoft.Azure.Functions.Worker.Sdk.Generators": "1.0.0-preview1" } }, "Microsoft.Azure.Functions.Worker.Sdk.Analyzers": { @@ -492,6 +489,14 @@ "resolved": "1.1.0", "contentHash": "J7AZ9iv/UCd4Di0c84h1P/Sa1aQr5uqO0EBUKwE0AZeWJ11dDfKAwxMiAxYOKR+giy31DWBnuFc4GKY3BQYUjg==" }, + "Microsoft.Azure.Functions.Worker.Sdk.Generators": { + "type": "Transitive", + "resolved": "1.0.0-preview1", + "contentHash": "XwJtFvfC0NlqpcNsZzcf8td9Pg4NlstU9+eKTrRxKp0kiNK5EowoixhUIeK/wseI9R0goILZdQ190tkwlojbTw==", + "dependencies": { + "Microsoft.CodeAnalysis.CSharp": "3.11.0" + } + }, "Microsoft.Azure.Management.Monitor": { "type": "Transitive", "resolved": "0.28.0-preview", @@ -519,6 +524,33 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.CodeAnalysis.Analyzers": { + "type": "Transitive", + "resolved": "3.3.2", + "contentHash": "7xt6zTlIEizUgEsYAIgm37EbdkiMmr6fP6J9pDoKEpiGM4pi32BCPGr/IczmSJI9Zzp0a6HOzpr9OvpMP+2veA==" + }, + "Microsoft.CodeAnalysis.Common": { + "type": "Transitive", + "resolved": "3.11.0", + "contentHash": "FDKSkRRXnaEWMa2ONkLMo0ZAt/uiV1XIXyodwKIgP1AMIKA7JJKXx/OwFVsvkkUT4BeobLwokoxFw70fICahNg==", + "dependencies": { + "Microsoft.CodeAnalysis.Analyzers": "3.3.2", + "System.Collections.Immutable": "5.0.0", + "System.Memory": "4.5.4", + "System.Reflection.Metadata": "5.0.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encoding.CodePages": "4.5.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.CodeAnalysis.CSharp": { + "type": "Transitive", + "resolved": "3.11.0", + "contentHash": "aDRRb7y/sXoJyDqFEQ3Il9jZxyUMHkShzZeCRjQf3SS84n2J0cTEi3TbwVZE9XJvAeMJhGfVVxwOdjYBg6ljmw==", + "dependencies": { + "Microsoft.CodeAnalysis.Common": "[3.11.0]" + } + }, "Microsoft.CodeCoverage": { "type": "Transitive", "resolved": "17.1.0", @@ -1836,8 +1868,8 @@ }, "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" + "resolved": "5.0.0", + "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==" }, "System.Reflection.Primitives": { "type": "Transitive", @@ -2144,10 +2176,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "6JX7ZdaceBiLKLkYt8zJcp4xTJd1uYyXXEkPw6mnlUIjh1gZPIVKPtRXPmY5kLf6DwZmf5YLwR3QUrRonl7l0A==", + "resolved": "4.5.1", + "contentHash": "4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==", "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0" + "Microsoft.NETCore.Platforms": "2.1.2", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" } }, "System.Text.Encoding.Extensions": { @@ -2386,14 +2419,14 @@ "Azure.Storage.Blobs": "12.13.0", "Azure.Storage.Queues": "12.11.0", "Faithlife.Utility": "0.12.2", - "Microsoft.Azure.Functions.Worker": "1.6.0", + "Microsoft.Azure.Functions.Worker": "1.10.0", "Microsoft.Azure.Functions.Worker.ApplicationInsights": "1.0.0-preview3", "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0", "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13", "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0", "Microsoft.Azure.Functions.Worker.Extensions.Storage": "5.0.0", "Microsoft.Azure.Functions.Worker.Extensions.Timer": "4.1.0", - "Microsoft.Azure.Functions.Worker.Sdk": "1.3.0", + "Microsoft.Azure.Functions.Worker.Sdk": "1.7.0", "Microsoft.Azure.Management.Monitor": "0.28.0-preview", "Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview", "Microsoft.Graph": "4.37.0", diff --git a/src/ApiService/Tests/packages.lock.json b/src/ApiService/Tests/packages.lock.json index b8cd955597..64033bdf54 100644 --- a/src/ApiService/Tests/packages.lock.json +++ b/src/ApiService/Tests/packages.lock.json @@ -272,45 +272,41 @@ }, "Google.Protobuf": { "type": "Transitive", - "resolved": "3.15.8", - "contentHash": "tA0S9QXJq+r3CjwBlcn5glEUrbdAxhPWO4yhq5+ycn6WW6+nsvqzO6Qf6NE9XWbEz/F2QSpBTxjdTI7SvVy7CQ==", - "dependencies": { - "System.Memory": "4.5.3", - "System.Runtime.CompilerServices.Unsafe": "4.5.2" - } + "resolved": "3.21.7", + "contentHash": "0Q+wYqtEVjRxVbtfxXzTUzwLGMZJKqhmIgdDpwWyg8J4ykYqfPn0M60FPBcZkjiGgtJqvZp+8t2van9rxTCLWQ==" }, "Grpc.Core.Api": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "ubqW2nTpiHyDudYGVXM+Vjh6WbgsI1fVQxsDK14/GnyPgiNMuNl8+GQcAYp5QPhAk5H4fjHJPI+KvbpVk8z6iQ==", + "resolved": "2.49.0", + "contentHash": "6OTcSQ8iML+xzmELhH4anUZlNM3dHDKPFBsMLSdiT80LJaaZKxwZml/K9ZdfLIjSR/EzdMZzzU2Avbedz4N7BA==", "dependencies": { "System.Memory": "4.5.3" } }, "Grpc.Net.Client": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "oMDNXAPkBzfXljv/ZzlZSf22TEstBNI6je85/c3iztlFbbixTMLgi0sIu/uHtEKoEWUPr0nmBMvD+jtqKorGTg==", + "resolved": "2.49.0", + "contentHash": "mLXxEJzqnRHseVzRCzSQznA7y8pcSStVbstLTUuQRulN7kREovh82ctNkGpkfwONi/DHoWscX9mJLiAmh0gjOQ==", "dependencies": { - "Grpc.Net.Common": "2.37.0", + "Grpc.Net.Common": "2.49.0", "Microsoft.Extensions.Logging.Abstractions": "3.0.3" } }, "Grpc.Net.ClientFactory": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "zyeFej1A36+s5K6+zDUirmDEGHEFnHapQisT7YsR9nQqKsw1uYqjtG1gSVSg/Zvk0KYeLHs5/URtTU71kS4APg==", + "resolved": "2.49.0", + "contentHash": "4Ac7dsrARbcs1g2vrUSUadtZ0kIGTk6yhA5ccOBjgM+RTzY3L54TgMddmeaV7/Z4f9sZn6T1ls6FmUiG8Dms+Q==", "dependencies": { - "Grpc.Net.Client": "2.37.0", + "Grpc.Net.Client": "2.49.0", "Microsoft.Extensions.Http": "3.0.3" } }, "Grpc.Net.Common": { "type": "Transitive", - "resolved": "2.37.0", - "contentHash": "V7fZb+87qB6Jio6uWXDHkxI9WT+y4EFwicAHkzB2lm/9wJazD0V35HhQjxvoONsldObaUimjqd4b/XZ0G07sDQ==", + "resolved": "2.49.0", + "contentHash": "G0TVTS8fjCk8b7td/E7C8/ssJPm3JnGVBKsveoj/89PIwIee72qkXG+tVn5c1gwTanEFPdyPoydna/bmU/NAaw==", "dependencies": { - "Grpc.Core.Api": "2.37.0" + "Grpc.Core.Api": "2.49.0" } }, "Microsoft.ApplicationInsights": { @@ -420,12 +416,12 @@ }, "Microsoft.Azure.Functions.Worker": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "Gzq2IPcMCym6wPpFayLbuvhrfr72OEInJJlKaIAqU9+HldVaTt54cm3hPe7kIok+QuWnwb/TtYtlmrkR0Nbhsg==", + "resolved": "1.10.0", + "contentHash": "LBase3J7/ZBaCrAgcTu629tCXleoO+4oft+6Q/F0HL5oc6qFqpMZ5oxMiA34kGXhb9D3A/CghJtNEwiBF1qWCA==", "dependencies": { "Azure.Core": "1.10.0", - "Microsoft.Azure.Functions.Worker.Core": "1.4.0", - "Microsoft.Azure.Functions.Worker.Grpc": "1.3.1", + "Microsoft.Azure.Functions.Worker.Core": "1.8.0", + "Microsoft.Azure.Functions.Worker.Grpc": "1.6.0", "Microsoft.Extensions.Hosting": "5.0.0", "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" } @@ -516,24 +512,25 @@ }, "Microsoft.Azure.Functions.Worker.Grpc": { "type": "Transitive", - "resolved": "1.3.1", - "contentHash": "lMlbyfRagSQZVWN73jnaB0tVTMhfKHSy6IvFXC7fCGh+7uA9LJNjcMOQbVkUnmvb/I/SxslMqD7xcebrxFL3TQ==", + "resolved": "1.6.0", + "contentHash": "r0bAEtBNy9ropO+Ii5V82l8X6R9mbYlGrXlTQPZI09JQuPJiQ86xc36+YLledVn8t8R2EiJMw5UUOpSOXY/ADw==", "dependencies": { "Azure.Core": "1.10.0", - "Google.Protobuf": "3.15.8", - "Grpc.Net.Client": "2.37.0", - "Grpc.Net.ClientFactory": "2.37.0", - "Microsoft.Azure.Functions.Worker.Core": "1.3.1", + "Google.Protobuf": "3.21.7", + "Grpc.Net.Client": "2.49.0", + "Grpc.Net.ClientFactory": "2.49.0", + "Microsoft.Azure.Functions.Worker.Core": "1.8.0", "Microsoft.Extensions.Hosting": "5.0.0", "Microsoft.Extensions.Hosting.Abstractions": "5.0.0" } }, "Microsoft.Azure.Functions.Worker.Sdk": { "type": "Transitive", - "resolved": "1.3.0", - "contentHash": "g9oXOl9xr1O3alWItAiYLNu3BnXebLW51BRB06yuO86LPGRZewyJu88EwUdC2NU9wnIeE3/ObMuEAnRALZeuTQ==", + "resolved": "1.7.0", + "contentHash": "kJZEtB4EIB3VeXyUxfilXWE6c49rNnIZvPvPBN6tpTvNHqJQrXm7pgsjwmE3Qw2t2EwhDgVdFDckWNbQQnnS1w==", "dependencies": { - "Microsoft.Azure.Functions.Worker.Sdk.Analyzers": "1.1.0" + "Microsoft.Azure.Functions.Worker.Sdk.Analyzers": "1.1.0", + "Microsoft.Azure.Functions.Worker.Sdk.Generators": "1.0.0-preview1" } }, "Microsoft.Azure.Functions.Worker.Sdk.Analyzers": { @@ -541,6 +538,14 @@ "resolved": "1.1.0", "contentHash": "J7AZ9iv/UCd4Di0c84h1P/Sa1aQr5uqO0EBUKwE0AZeWJ11dDfKAwxMiAxYOKR+giy31DWBnuFc4GKY3BQYUjg==" }, + "Microsoft.Azure.Functions.Worker.Sdk.Generators": { + "type": "Transitive", + "resolved": "1.0.0-preview1", + "contentHash": "XwJtFvfC0NlqpcNsZzcf8td9Pg4NlstU9+eKTrRxKp0kiNK5EowoixhUIeK/wseI9R0goILZdQ190tkwlojbTw==", + "dependencies": { + "Microsoft.CodeAnalysis.CSharp": "3.11.0" + } + }, "Microsoft.Azure.Management.Monitor": { "type": "Transitive", "resolved": "0.28.0-preview", @@ -568,6 +573,33 @@ "resolved": "6.0.0", "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, + "Microsoft.CodeAnalysis.Analyzers": { + "type": "Transitive", + "resolved": "3.3.2", + "contentHash": "7xt6zTlIEizUgEsYAIgm37EbdkiMmr6fP6J9pDoKEpiGM4pi32BCPGr/IczmSJI9Zzp0a6HOzpr9OvpMP+2veA==" + }, + "Microsoft.CodeAnalysis.Common": { + "type": "Transitive", + "resolved": "3.11.0", + "contentHash": "FDKSkRRXnaEWMa2ONkLMo0ZAt/uiV1XIXyodwKIgP1AMIKA7JJKXx/OwFVsvkkUT4BeobLwokoxFw70fICahNg==", + "dependencies": { + "Microsoft.CodeAnalysis.Analyzers": "3.3.2", + "System.Collections.Immutable": "5.0.0", + "System.Memory": "4.5.4", + "System.Reflection.Metadata": "5.0.0", + "System.Runtime.CompilerServices.Unsafe": "5.0.0", + "System.Text.Encoding.CodePages": "4.5.1", + "System.Threading.Tasks.Extensions": "4.5.4" + } + }, + "Microsoft.CodeAnalysis.CSharp": { + "type": "Transitive", + "resolved": "3.11.0", + "contentHash": "aDRRb7y/sXoJyDqFEQ3Il9jZxyUMHkShzZeCRjQf3SS84n2J0cTEi3TbwVZE9XJvAeMJhGfVVxwOdjYBg6ljmw==", + "dependencies": { + "Microsoft.CodeAnalysis.Common": "[3.11.0]" + } + }, "Microsoft.CodeCoverage": { "type": "Transitive", "resolved": "17.1.0", @@ -1931,8 +1963,8 @@ }, "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" + "resolved": "5.0.0", + "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ==" }, "System.Reflection.Primitives": { "type": "Transitive", @@ -2239,10 +2271,11 @@ }, "System.Text.Encoding.CodePages": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "6JX7ZdaceBiLKLkYt8zJcp4xTJd1uYyXXEkPw6mnlUIjh1gZPIVKPtRXPmY5kLf6DwZmf5YLwR3QUrRonl7l0A==", + "resolved": "4.5.1", + "contentHash": "4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==", "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0" + "Microsoft.NETCore.Platforms": "2.1.2", + "System.Runtime.CompilerServices.Unsafe": "4.5.2" } }, "System.Text.Encoding.Extensions": { @@ -2513,14 +2546,14 @@ "Azure.Storage.Blobs": "12.13.0", "Azure.Storage.Queues": "12.11.0", "Faithlife.Utility": "0.12.2", - "Microsoft.Azure.Functions.Worker": "1.6.0", + "Microsoft.Azure.Functions.Worker": "1.10.0", "Microsoft.Azure.Functions.Worker.ApplicationInsights": "1.0.0-preview3", "Microsoft.Azure.Functions.Worker.Extensions.EventGrid": "2.1.0", "Microsoft.Azure.Functions.Worker.Extensions.Http": "3.0.13", "Microsoft.Azure.Functions.Worker.Extensions.SignalRService": "1.7.0", "Microsoft.Azure.Functions.Worker.Extensions.Storage": "5.0.0", "Microsoft.Azure.Functions.Worker.Extensions.Timer": "4.1.0", - "Microsoft.Azure.Functions.Worker.Sdk": "1.3.0", + "Microsoft.Azure.Functions.Worker.Sdk": "1.7.0", "Microsoft.Azure.Management.Monitor": "0.28.0-preview", "Microsoft.Azure.Management.OperationalInsights": "0.24.0-preview", "Microsoft.Graph": "4.37.0",