From 299d07ed11820e95786f899e91ad64bdbd737af2 Mon Sep 17 00:00:00 2001 From: James Gunn Date: Thu, 19 Dec 2024 14:31:18 +0000 Subject: [PATCH] Remove Application Insights usage --- TeachingRecordSystem/Directory.Packages.props | 3 - .../packages.lock.json | 204 +----------------- .../packages.lock.json | 204 +----------------- .../packages.lock.json | 18 +- .../TeachingRecordSystem.Core/Extensions.cs | 2 - .../DqtReporting/DqtReportingService.cs | 66 +++--- .../IgnoreDependencyTelemetryProcessor.cs | 39 ---- .../TeachingRecordSystem.Core.csproj | 1 - .../packages.lock.json | 17 +- .../RedactedUrlTelemetryProcessor.cs | 19 -- .../WebApplicationBuilderExtensions.cs | 4 - ...eachingRecordSystem.ServiceDefaults.csproj | 3 +- .../packages.lock.json | 203 +---------------- .../packages.lock.json | 204 +----------------- .../packages.lock.json | 18 +- .../HostApplicationBuilderExtensions.cs | 3 - .../TeachingRecordSystem.Worker/Program.cs | 6 - .../TeachingRecordSystem.Worker.csproj | 3 +- .../packages.lock.json | 98 +-------- .../packages.lock.json | 181 +--------------- .../packages.lock.json | 199 +---------------- .../packages.lock.json | 199 +---------------- .../DqtReporting/DqtReportingFixture.cs | 4 - .../packages.lock.json | 18 +- .../packages.lock.json | 18 +- .../packages.lock.json | 199 +---------------- .../packages.lock.json | 199 +---------------- .../packages.lock.json | 18 +- .../packages.lock.json | 18 +- .../packages.lock.json | 18 +- 30 files changed, 120 insertions(+), 2066 deletions(-) delete mode 100644 TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs delete mode 100644 TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/ApplicationInsights/RedactedUrlTelemetryProcessor.cs diff --git a/TeachingRecordSystem/Directory.Packages.props b/TeachingRecordSystem/Directory.Packages.props index 636123d49..e98e1ebc7 100644 --- a/TeachingRecordSystem/Directory.Packages.props +++ b/TeachingRecordSystem/Directory.Packages.props @@ -39,9 +39,6 @@ - - - diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Api/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.Api/packages.lock.json index 7d8b83a55..b7f7f85f0 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Api/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Api/packages.lock.json @@ -267,54 +267,14 @@ "resolved": "2.0.1", "contentHash": "FYv95bNT4UwcNA+G/J1oX5OpRiSUxteXaUt2BJbRSdRNiIUNbggJF69wy6mnk2wYToaanpdXZdCwVylt96MpwQ==" }, - "Microsoft.ApplicationInsights.DependencyCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "gseSmuCshdZqcn5r6EW1Zx52e5/p2RpAsHSanlxs8pq+Pbg1RZP678tXtxfVuHC0fA3MVV852pnfFC7ZGB0jew==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.EventCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "/fXUyZIMwaWfETgire4fygaBhY8J+hXvTVhSFXKV0JOFBenzzU4smGW8iRUFhE534a3QrczuFfmfCCkXRKbsNg==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0" - } - }, - "Microsoft.ApplicationInsights.PerfCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "nExsJsbN7694ueUNNBms/UNgza9WH4W/I6i5CnF9ujJ1sp57EL5Uk0NP9MDwlLVtYaaiznKPatVSv3Nu8vAplw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", - "System.Diagnostics.PerformanceCounter": "6.0.0" - } - }, - "Microsoft.ApplicationInsights.WindowsServer": { + "Microsoft.ApplicationInsights": { "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "9k1x1+Kq1fElvcv0o/w9w8tRWAa2Y0f4NPBeHF5b2xCety4GM1yv3K3Ra0lZwO3kW0SHlm9M8nrySuyKQlHyYA==", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0", "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "Blb6S8UJSJ/jo6mxeO38gKgui75D2brp5NpXJoZUhyJzfmYsfhn7a4t5f+CDfAKyvie7sQB2FIzeEDQSiRE5zw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.IO.FileSystem.AccessControl": "4.7.0" - } - }, "Microsoft.AspNetCore.Cryptography.Internal": { "type": "Transitive", "resolved": "3.1.32", @@ -340,94 +300,6 @@ "resolved": "3.1.32", "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" }, - "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.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -656,15 +528,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, - "Microsoft.Extensions.Logging.ApplicationInsights": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "5OmXub+9MyX8FbqgO+hBJRHk1iJ+UZUU20oIU3wo+RbmH6Jtsja79rriHLlzlrkMzWbpCkCzF6f4Yb6iGbsDag==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Logging": "2.1.1" - } - }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "8.0.0", @@ -846,15 +709,6 @@ "System.Memory": "4.5.5" } }, - "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": "1.1.1", @@ -1399,14 +1253,6 @@ "resolved": "8.0.0", "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gbeE5tNp/oB7O8kTTLh3wPPJCxpNOphXPTWVs1BsYuFOYapFijWuh0LYw1qnDo4gwDUYPXOmpTIhvtxisGsYOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1613,15 +1459,6 @@ "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", @@ -1887,11 +1724,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", @@ -2476,7 +2308,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2518,7 +2349,6 @@ "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.ApplicationInsights.AspNetCore": "[2.22.0, )", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", "Sentry.AspNetCore": "[4.9.0, )", "Serilog.AspNetCore": "[8.0.3, )", @@ -2721,34 +2551,6 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "OuiZgRDX0zm3a1DRk/GT54ZsyTg8a88n3cpkVEYFJoRhT5X84l2C68BuKrglE0sIj+C0+o2WTR8S21YBD/ZWgA==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.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.22.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": { "type": "CentralTransitive", "requested": "[8.0.8, )", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/packages.lock.json index 194401b8e..da55bc74b 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/packages.lock.json @@ -228,54 +228,14 @@ "System.Security.Cryptography.Csp": "4.3.0" } }, - "Microsoft.ApplicationInsights.DependencyCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "gseSmuCshdZqcn5r6EW1Zx52e5/p2RpAsHSanlxs8pq+Pbg1RZP678tXtxfVuHC0fA3MVV852pnfFC7ZGB0jew==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.EventCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "/fXUyZIMwaWfETgire4fygaBhY8J+hXvTVhSFXKV0JOFBenzzU4smGW8iRUFhE534a3QrczuFfmfCCkXRKbsNg==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0" - } - }, - "Microsoft.ApplicationInsights.PerfCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "nExsJsbN7694ueUNNBms/UNgza9WH4W/I6i5CnF9ujJ1sp57EL5Uk0NP9MDwlLVtYaaiznKPatVSv3Nu8vAplw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", - "System.Diagnostics.PerformanceCounter": "6.0.0" - } - }, - "Microsoft.ApplicationInsights.WindowsServer": { + "Microsoft.ApplicationInsights": { "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "9k1x1+Kq1fElvcv0o/w9w8tRWAa2Y0f4NPBeHF5b2xCety4GM1yv3K3Ra0lZwO3kW0SHlm9M8nrySuyKQlHyYA==", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0", "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "Blb6S8UJSJ/jo6mxeO38gKgui75D2brp5NpXJoZUhyJzfmYsfhn7a4t5f+CDfAKyvie7sQB2FIzeEDQSiRE5zw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.IO.FileSystem.AccessControl": "4.7.0" - } - }, "Microsoft.AspNetCore.Cryptography.Internal": { "type": "Transitive", "resolved": "3.1.32", @@ -301,94 +261,6 @@ "resolved": "3.1.32", "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" }, - "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.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -630,15 +502,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, - "Microsoft.Extensions.Logging.ApplicationInsights": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "5OmXub+9MyX8FbqgO+hBJRHk1iJ+UZUU20oIU3wo+RbmH6Jtsja79rriHLlzlrkMzWbpCkCzF6f4Yb6iGbsDag==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Logging": "2.1.1" - } - }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "8.0.0", @@ -820,15 +683,6 @@ "System.Memory": "4.5.5" } }, - "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": "1.1.1", @@ -1476,14 +1330,6 @@ "resolved": "8.0.0", "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gbeE5tNp/oB7O8kTTLh3wPPJCxpNOphXPTWVs1BsYuFOYapFijWuh0LYw1qnDo4gwDUYPXOmpTIhvtxisGsYOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1690,15 +1536,6 @@ "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", @@ -1964,11 +1801,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", @@ -2548,7 +2380,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2590,7 +2421,6 @@ "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.ApplicationInsights.AspNetCore": "[2.22.0, )", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", "Sentry.AspNetCore": "[4.9.0, )", "Serilog.AspNetCore": "[8.0.3, )", @@ -2790,34 +2620,6 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "OuiZgRDX0zm3a1DRk/GT54ZsyTg8a88n3cpkVEYFJoRhT5X84l2C68BuKrglE0sIj+C0+o2WTR8S21YBD/ZWgA==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.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.22.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "CentralTransitive", "requested": "[8.0.7, )", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Cli/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.Cli/packages.lock.json index 3ed5f5bc5..6d27166ef 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Cli/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Cli/packages.lock.json @@ -155,6 +155,14 @@ "System.Security.Cryptography.Csp": "4.3.0" } }, + "Microsoft.ApplicationInsights": { + "type": "Transitive", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "5.0.0" + } + }, "Microsoft.Azure.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -2060,7 +2068,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2252,15 +2259,6 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[5.2.2, )", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Extensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Extensions.cs index 43f753956..fe6a3482c 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Extensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Extensions.cs @@ -1,6 +1,5 @@ using Hangfire; using Hangfire.PostgreSql; -using Microsoft.ApplicationInsights.Extensibility; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -89,7 +88,6 @@ public static void ConfigureSerilog( { config .ReadFrom.Configuration(configuration) - .WriteTo.ApplicationInsights(services.GetRequiredService(), TelemetryConverter.Traces) .WriteTo.Sentry(o => o.InitializeSdk = false); if (environment.IsProduction()) diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/DqtReportingService.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/DqtReportingService.cs index 46ed4908c..257477057 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/DqtReportingService.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/DqtReportingService.cs @@ -2,8 +2,6 @@ using System.Diagnostics; using System.Text; using Medallion.Threading; -using Microsoft.ApplicationInsights; -using Microsoft.ApplicationInsights.DataContracts; using Microsoft.Data.SqlClient; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -51,7 +49,6 @@ public partial class DqtReportingService : BackgroundService private readonly ICrmQueryDispatcher _crmQueryDispatcher; private readonly IDistributedLockProvider _distributedLockProvider; private readonly IClock _clock; - private readonly TelemetryClient _telemetryClient; private readonly IConfiguration _configuration; private readonly ILogger _logger; private readonly Dictionary _entityMetadata = new(); @@ -62,7 +59,6 @@ public DqtReportingService( [FromKeyedServices(CrmClientName)] ICrmQueryDispatcher crmQueryDispatcher, IDistributedLockProvider distributedLockProvider, IClock clock, - TelemetryClient telemetryClient, IConfiguration configuration, ILogger logger) { @@ -71,7 +67,6 @@ public DqtReportingService( _crmQueryDispatcher = crmQueryDispatcher; _distributedLockProvider = distributedLockProvider; _clock = clock; - _telemetryClient = telemetryClient; _configuration = configuration; _logger = logger; } @@ -170,8 +165,6 @@ internal async Task LoadEntityMetadataAsync() internal async Task ProcessCrmChangesAsync(CancellationToken cancellationToken) { - using var operation = _telemetryClient.StartOperation(ProcessChangesOperationName); - await Parallel.ForEachAsync( _options.Entities, new ParallelOptions() @@ -214,48 +207,37 @@ internal async Task ProcessCrmChangesForEntityTypeAsync(string entityLogicalName .ToArray()); } - try + // We don't populate modifiedSince here since it's so slow to query in the reporting DB + var changesEnumerable = _crmEntityChangesService.GetEntityChangesAsync(ChangesKey, entityLogicalName, columns, modifiedSince: null, PageSize) + .WithCancellation(cancellationToken); + + await foreach (var changes in changesEnumerable) { - // We don't populate modifiedSince here since it's so slow to query in the reporting DB - var changesEnumerable = _crmEntityChangesService.GetEntityChangesAsync(ChangesKey, entityLogicalName, columns, modifiedSince: null, PageSize) - .WithCancellation(cancellationToken); + var newOrUpdatedItems = new List(); + var removedOrDeletedItems = new List(); - await foreach (var changes in changesEnumerable) + foreach (var change in changes) { - var newOrUpdatedItems = new List(); - var removedOrDeletedItems = new List(); - - foreach (var change in changes) + if (change is NewOrUpdatedItem newOrUpdatedItem) { - if (change is NewOrUpdatedItem newOrUpdatedItem) - { - newOrUpdatedItems.Add(newOrUpdatedItem); - } - else if (change is RemovedOrDeletedItem removedOrDeletedItem) - { - removedOrDeletedItems.Add(removedOrDeletedItem); - } - else - { - throw new Exception($"Received unknown change type: '{change.GetType().Name}'."); - } + newOrUpdatedItems.Add(newOrUpdatedItem); + } + else if (change is RemovedOrDeletedItem removedOrDeletedItem) + { + removedOrDeletedItems.Add(removedOrDeletedItem); } + else + { + throw new Exception($"Received unknown change type: '{change.GetType().Name}'."); + } + } - await HandleNewOrUpdatedItemsAsync(newOrUpdatedItems, cancellationToken); - totalProcessed += newOrUpdatedItems.Count; + await HandleNewOrUpdatedItemsAsync(newOrUpdatedItems, cancellationToken); + totalProcessed += newOrUpdatedItems.Count; - // It's important deleted items are processed *after* upserts, otherwise we may resurrect a deleted record - await HandleRemovedOrDeletedItemsAsync(removedOrDeletedItems, cancellationToken); - totalProcessed += removedOrDeletedItems.Count; - } - } - finally - { - _telemetryClient.TrackMetric(new MetricTelemetry() - { - Name = $"DqtReporting: updates processed", - Sum = totalProcessed - }); + // It's important deleted items are processed *after* upserts, otherwise we may resurrect a deleted record + await HandleRemovedOrDeletedItemsAsync(removedOrDeletedItems, cancellationToken); + totalProcessed += removedOrDeletedItems.Count; } } diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs deleted file mode 100644 index 661e570d4..000000000 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/Services/DqtReporting/IgnoreDependencyTelemetryProcessor.cs +++ /dev/null @@ -1,39 +0,0 @@ -#nullable enable -using System.Diagnostics; -using Microsoft.ApplicationInsights.Channel; -using Microsoft.ApplicationInsights.DataContracts; -using Microsoft.ApplicationInsights.Extensibility; - -namespace TeachingRecordSystem.Core.Services.DqtReporting; - -public class IgnoreDependencyTelemetryProcessor : ITelemetryProcessor -{ - private readonly ITelemetryProcessor _next; - - public IgnoreDependencyTelemetryProcessor(ITelemetryProcessor next) - { - _next = next; - } - - public void Process(ITelemetry item) - { - bool isFromDqtReportingService = false; - - Activity? activity = Activity.Current; - while (activity is not null) - { - if (activity.GetTagItem("OperationName") as string == DqtReportingService.ProcessChangesOperationName) - { - isFromDqtReportingService = true; - break; - } - - activity = activity.Parent; - } - - if (!isFromDqtReportingService || item is not DependencyTelemetry) - { - _next.Process(item); - } - } -} diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/TeachingRecordSystem.Core.csproj b/TeachingRecordSystem/src/TeachingRecordSystem.Core/TeachingRecordSystem.Core.csproj index 11aa31fa4..c10ca7059 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/TeachingRecordSystem.Core.csproj +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/TeachingRecordSystem.Core.csproj @@ -160,7 +160,6 @@ - runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Core/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.Core/packages.lock.json index 17ed67aaa..060906519 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Core/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Core/packages.lock.json @@ -158,15 +158,6 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, - "Microsoft.ApplicationInsights": { - "type": "Direct", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, "Microsoft.Data.SqlClient": { "type": "Direct", "requested": "[5.2.2, )", @@ -703,6 +694,14 @@ "System.Security.Cryptography.Csp": "4.3.0" } }, + "Microsoft.ApplicationInsights": { + "type": "Transitive", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "5.0.0" + } + }, "Microsoft.Azure.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/ApplicationInsights/RedactedUrlTelemetryProcessor.cs b/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/ApplicationInsights/RedactedUrlTelemetryProcessor.cs deleted file mode 100644 index 2b1978034..000000000 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/ApplicationInsights/RedactedUrlTelemetryProcessor.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.ApplicationInsights.Channel; -using Microsoft.ApplicationInsights.DataContracts; -using Microsoft.ApplicationInsights.Extensibility; -using TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; - -namespace TeachingRecordSystem.ServiceDefaults.Infrastructure.ApplicationInsights; - -public class RedactedUrlTelemetryProcessor(ITelemetryProcessor next, UrlRedactor urlRedactor) : ITelemetryProcessor -{ - public void Process(ITelemetry item) - { - if (item is RequestTelemetry requestTelemetry) - { - requestTelemetry.Url = new Uri(urlRedactor.GetScrubbedRequestUrl()); - } - - next.Process(item); - } -} diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/WebApplicationBuilderExtensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/WebApplicationBuilderExtensions.cs index e81e344c5..77f3e6e2a 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/WebApplicationBuilderExtensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/Infrastructure/Logging/WebApplicationBuilderExtensions.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Logging; using Sentry.Extensibility; using Serilog; -using TeachingRecordSystem.ServiceDefaults.Infrastructure.ApplicationInsights; namespace TeachingRecordSystem.ServiceDefaults.Infrastructure.Logging; @@ -20,9 +19,6 @@ public static WebApplicationBuilder ConfigureLogging(this WebApplicationBuilder builder.Services.AddSingleton(); - builder.Services.AddApplicationInsightsTelemetry() - .AddApplicationInsightsTelemetryProcessor(); - builder.Services.AddTransient(); // We want all logging to go through Serilog so that our filters are always applied diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/TeachingRecordSystem.ServiceDefaults.csproj b/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/TeachingRecordSystem.ServiceDefaults.csproj index fddb128b7..2ebd02057 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/TeachingRecordSystem.ServiceDefaults.csproj +++ b/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/TeachingRecordSystem.ServiceDefaults.csproj @@ -13,7 +13,6 @@ - @@ -23,5 +22,5 @@ - + diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/packages.lock.json index cf721786c..4f030c71a 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.ServiceDefaults/packages.lock.json @@ -32,25 +32,6 @@ "Hangfire.NetCore": "[1.8.14]" } }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "Direct", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "OuiZgRDX0zm3a1DRk/GT54ZsyTg8a88n3cpkVEYFJoRhT5X84l2C68BuKrglE0sIj+C0+o2WTR8S21YBD/ZWgA==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.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.22.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": { "type": "Direct", "requested": "[8.0.8, )", @@ -242,54 +223,14 @@ "System.Security.Cryptography.Csp": "4.3.0" } }, - "Microsoft.ApplicationInsights.DependencyCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "gseSmuCshdZqcn5r6EW1Zx52e5/p2RpAsHSanlxs8pq+Pbg1RZP678tXtxfVuHC0fA3MVV852pnfFC7ZGB0jew==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.EventCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "/fXUyZIMwaWfETgire4fygaBhY8J+hXvTVhSFXKV0JOFBenzzU4smGW8iRUFhE534a3QrczuFfmfCCkXRKbsNg==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0" - } - }, - "Microsoft.ApplicationInsights.PerfCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "nExsJsbN7694ueUNNBms/UNgza9WH4W/I6i5CnF9ujJ1sp57EL5Uk0NP9MDwlLVtYaaiznKPatVSv3Nu8vAplw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", - "System.Diagnostics.PerformanceCounter": "6.0.0" - } - }, - "Microsoft.ApplicationInsights.WindowsServer": { + "Microsoft.ApplicationInsights": { "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "9k1x1+Kq1fElvcv0o/w9w8tRWAa2Y0f4NPBeHF5b2xCety4GM1yv3K3Ra0lZwO3kW0SHlm9M8nrySuyKQlHyYA==", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0", "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "Blb6S8UJSJ/jo6mxeO38gKgui75D2brp5NpXJoZUhyJzfmYsfhn7a4t5f+CDfAKyvie7sQB2FIzeEDQSiRE5zw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.IO.FileSystem.AccessControl": "4.7.0" - } - }, "Microsoft.AspNetCore.Cryptography.Internal": { "type": "Transitive", "resolved": "3.1.32", @@ -315,94 +256,6 @@ "resolved": "3.1.32", "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" }, - "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.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -626,15 +479,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, - "Microsoft.Extensions.Logging.ApplicationInsights": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "5OmXub+9MyX8FbqgO+hBJRHk1iJ+UZUU20oIU3wo+RbmH6Jtsja79rriHLlzlrkMzWbpCkCzF6f4Yb6iGbsDag==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Logging": "2.1.1" - } - }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "8.0.0", @@ -819,15 +663,6 @@ "System.Memory": "4.5.5" } }, - "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": "1.1.1", @@ -1320,14 +1155,6 @@ "resolved": "8.0.0", "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gbeE5tNp/oB7O8kTTLh3wPPJCxpNOphXPTWVs1BsYuFOYapFijWuh0LYw1qnDo4gwDUYPXOmpTIhvtxisGsYOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1534,15 +1361,6 @@ "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", @@ -1808,11 +1626,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", @@ -2392,7 +2205,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2584,15 +2396,6 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[5.2.2, )", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/packages.lock.json index 1231132f1..be547d0e6 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/packages.lock.json @@ -255,54 +255,14 @@ "System.Security.Cryptography.Csp": "4.3.0" } }, - "Microsoft.ApplicationInsights.DependencyCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "gseSmuCshdZqcn5r6EW1Zx52e5/p2RpAsHSanlxs8pq+Pbg1RZP678tXtxfVuHC0fA3MVV852pnfFC7ZGB0jew==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.EventCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "/fXUyZIMwaWfETgire4fygaBhY8J+hXvTVhSFXKV0JOFBenzzU4smGW8iRUFhE534a3QrczuFfmfCCkXRKbsNg==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0" - } - }, - "Microsoft.ApplicationInsights.PerfCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "nExsJsbN7694ueUNNBms/UNgza9WH4W/I6i5CnF9ujJ1sp57EL5Uk0NP9MDwlLVtYaaiznKPatVSv3Nu8vAplw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", - "System.Diagnostics.PerformanceCounter": "6.0.0" - } - }, - "Microsoft.ApplicationInsights.WindowsServer": { + "Microsoft.ApplicationInsights": { "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "9k1x1+Kq1fElvcv0o/w9w8tRWAa2Y0f4NPBeHF5b2xCety4GM1yv3K3Ra0lZwO3kW0SHlm9M8nrySuyKQlHyYA==", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0", "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "Blb6S8UJSJ/jo6mxeO38gKgui75D2brp5NpXJoZUhyJzfmYsfhn7a4t5f+CDfAKyvie7sQB2FIzeEDQSiRE5zw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.IO.FileSystem.AccessControl": "4.7.0" - } - }, "Microsoft.AspNetCore.Cryptography.Internal": { "type": "Transitive", "resolved": "8.0.0", @@ -327,94 +287,6 @@ "resolved": "8.0.0", "contentHash": "ObNtj57DXbIIVAhNSKA6/c1/EaW35Dct480dzZ9NPXZ2fw3Z5FS/xiKKC7+1R2PBwt2Vw7a2Amu1tNvBKwyFNQ==" }, - "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.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -646,15 +518,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, - "Microsoft.Extensions.Logging.ApplicationInsights": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "5OmXub+9MyX8FbqgO+hBJRHk1iJ+UZUU20oIU3wo+RbmH6Jtsja79rriHLlzlrkMzWbpCkCzF6f4Yb6iGbsDag==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Logging": "2.1.1" - } - }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "8.0.0", @@ -1028,15 +891,6 @@ "System.Memory": "4.5.5" } }, - "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": "1.1.1", @@ -1485,14 +1339,6 @@ "resolved": "8.0.0", "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gbeE5tNp/oB7O8kTTLh3wPPJCxpNOphXPTWVs1BsYuFOYapFijWuh0LYw1qnDo4gwDUYPXOmpTIhvtxisGsYOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1661,15 +1507,6 @@ "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", @@ -1922,11 +1759,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", @@ -2503,7 +2335,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2545,7 +2376,6 @@ "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.ApplicationInsights.AspNetCore": "[2.22.0, )", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", "Sentry.AspNetCore": "[4.9.0, )", "Serilog.AspNetCore": "[8.0.3, )", @@ -2745,34 +2575,6 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "OuiZgRDX0zm3a1DRk/GT54ZsyTg8a88n3cpkVEYFJoRhT5X84l2C68BuKrglE0sIj+C0+o2WTR8S21YBD/ZWgA==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.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.22.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "type": "CentralTransitive", "requested": "[8.0.7, )", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/packages.lock.json index c85de741e..49d3690e6 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.UiCommon/packages.lock.json @@ -149,6 +149,14 @@ "System.Security.Cryptography.Csp": "4.3.0" } }, + "Microsoft.ApplicationInsights": { + "type": "Transitive", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "5.0.0" + } + }, "Microsoft.Azure.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -2054,7 +2062,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2246,15 +2253,6 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[5.2.2, )", diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Infrastructure/Logging/HostApplicationBuilderExtensions.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Infrastructure/Logging/HostApplicationBuilderExtensions.cs index 0030bc997..e805d6eb6 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Infrastructure/Logging/HostApplicationBuilderExtensions.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Infrastructure/Logging/HostApplicationBuilderExtensions.cs @@ -1,4 +1,3 @@ -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Serilog; @@ -18,8 +17,6 @@ public static HostApplicationBuilder ConfigureLogging(this HostApplicationBuilde }); } - builder.Services.AddApplicationInsightsTelemetryWorkerService(); - // We want all logging to go through Serilog so that our filters are always applied builder.Logging.ClearProviders(); diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs index c1b4e774f..e8b646d30 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/Program.cs @@ -65,12 +65,6 @@ .AddWorkforceData() .AddMemoryCache(); -// Filter telemetry emitted by DqtReportingService; -// annoyingly we can't put this into the AddDqtReporting extension method since the method for adding Telemetry Processors -// is different depending on whether you're in a Worker app or Web app :-/ -builder.Services.AddApplicationInsightsTelemetryWorkerService() - .AddApplicationInsightsTelemetryProcessor(); - var host = builder.Build(); await host.RunAsync(); diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/TeachingRecordSystem.Worker.csproj b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/TeachingRecordSystem.Worker.csproj index 5cae444a9..1df535033 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/TeachingRecordSystem.Worker.csproj +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/TeachingRecordSystem.Worker.csproj @@ -30,7 +30,6 @@ - @@ -39,5 +38,5 @@ - + diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/packages.lock.json b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/packages.lock.json index c4fe49f75..29bac96e3 100644 --- a/TeachingRecordSystem/src/TeachingRecordSystem.Worker/packages.lock.json +++ b/TeachingRecordSystem/src/TeachingRecordSystem.Worker/packages.lock.json @@ -2,22 +2,6 @@ "version": 2, "dependencies": { "net8.0": { - "Microsoft.ApplicationInsights.WorkerService": { - "type": "Direct", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "CXwd2s8gOXF9bs0Rn1iAggyNxW9HDbiUIikjtiUOPJW7MMgpEzFk27pJyakMijMHrqCptElTK+C6TWwUmoRLqw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0", - "Microsoft.Extensions.DependencyInjection": "2.1.1", - "Microsoft.Extensions.Logging.ApplicationInsights": "2.22.0" - } - }, "Microsoft.VisualStudio.Threading.Analyzers": { "type": "Direct", "requested": "[17.12.19, )", @@ -201,54 +185,14 @@ "System.Security.Cryptography.Csp": "4.3.0" } }, - "Microsoft.ApplicationInsights.DependencyCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "gseSmuCshdZqcn5r6EW1Zx52e5/p2RpAsHSanlxs8pq+Pbg1RZP678tXtxfVuHC0fA3MVV852pnfFC7ZGB0jew==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.EventCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "/fXUyZIMwaWfETgire4fygaBhY8J+hXvTVhSFXKV0JOFBenzzU4smGW8iRUFhE534a3QrczuFfmfCCkXRKbsNg==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0" - } - }, - "Microsoft.ApplicationInsights.PerfCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "nExsJsbN7694ueUNNBms/UNgza9WH4W/I6i5CnF9ujJ1sp57EL5Uk0NP9MDwlLVtYaaiznKPatVSv3Nu8vAplw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", - "System.Diagnostics.PerformanceCounter": "6.0.0" - } - }, - "Microsoft.ApplicationInsights.WindowsServer": { + "Microsoft.ApplicationInsights": { "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "9k1x1+Kq1fElvcv0o/w9w8tRWAa2Y0f4NPBeHF5b2xCety4GM1yv3K3Ra0lZwO3kW0SHlm9M8nrySuyKQlHyYA==", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0", "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "Blb6S8UJSJ/jo6mxeO38gKgui75D2brp5NpXJoZUhyJzfmYsfhn7a4t5f+CDfAKyvie7sQB2FIzeEDQSiRE5zw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.IO.FileSystem.AccessControl": "4.7.0" - } - }, "Microsoft.Azure.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -456,15 +400,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, - "Microsoft.Extensions.Logging.ApplicationInsights": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "5OmXub+9MyX8FbqgO+hBJRHk1iJ+UZUU20oIU3wo+RbmH6Jtsja79rriHLlzlrkMzWbpCkCzF6f4Yb6iGbsDag==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Logging": "2.1.1" - } - }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "8.0.0", @@ -1122,14 +1057,6 @@ "resolved": "8.0.0", "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gbeE5tNp/oB7O8kTTLh3wPPJCxpNOphXPTWVs1BsYuFOYapFijWuh0LYw1qnDo4gwDUYPXOmpTIhvtxisGsYOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1336,15 +1263,6 @@ "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", @@ -2189,7 +2107,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2381,15 +2298,6 @@ "resolved": "6.2.0", "contentHash": "4AXZ6Tp+DNwrSSeBziiX/231i8ZpD77A9nEMyc68gLSCWG0kgWsIBeFquYcBebiIPkfB7GEXzCYuuLeR1QZJIQ==" }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, "Microsoft.Data.SqlClient": { "type": "CentralTransitive", "requested": "[5.2.2, )", diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Api.Tests/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.Api.Tests/packages.lock.json index 08f8b39e7..3a9a16790 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Api.Tests/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Api.Tests/packages.lock.json @@ -304,54 +304,14 @@ "resolved": "2.0.1", "contentHash": "FYv95bNT4UwcNA+G/J1oX5OpRiSUxteXaUt2BJbRSdRNiIUNbggJF69wy6mnk2wYToaanpdXZdCwVylt96MpwQ==" }, - "Microsoft.ApplicationInsights.DependencyCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "gseSmuCshdZqcn5r6EW1Zx52e5/p2RpAsHSanlxs8pq+Pbg1RZP678tXtxfVuHC0fA3MVV852pnfFC7ZGB0jew==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.EventCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "/fXUyZIMwaWfETgire4fygaBhY8J+hXvTVhSFXKV0JOFBenzzU4smGW8iRUFhE534a3QrczuFfmfCCkXRKbsNg==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0" - } - }, - "Microsoft.ApplicationInsights.PerfCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "nExsJsbN7694ueUNNBms/UNgza9WH4W/I6i5CnF9ujJ1sp57EL5Uk0NP9MDwlLVtYaaiznKPatVSv3Nu8vAplw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", - "System.Diagnostics.PerformanceCounter": "6.0.0" - } - }, - "Microsoft.ApplicationInsights.WindowsServer": { + "Microsoft.ApplicationInsights": { "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "9k1x1+Kq1fElvcv0o/w9w8tRWAa2Y0f4NPBeHF5b2xCety4GM1yv3K3Ra0lZwO3kW0SHlm9M8nrySuyKQlHyYA==", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0", "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "Blb6S8UJSJ/jo6mxeO38gKgui75D2brp5NpXJoZUhyJzfmYsfhn7a4t5f+CDfAKyvie7sQB2FIzeEDQSiRE5zw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.IO.FileSystem.AccessControl": "4.7.0" - } - }, "Microsoft.AspNetCore.Cryptography.Internal": { "type": "Transitive", "resolved": "3.1.32", @@ -377,85 +337,6 @@ "resolved": "3.1.32", "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" }, - "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.TestHost": { "type": "Transitive", "resolved": "8.0.7", @@ -706,15 +587,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, - "Microsoft.Extensions.Logging.ApplicationInsights": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "5OmXub+9MyX8FbqgO+hBJRHk1iJ+UZUU20oIU3wo+RbmH6Jtsja79rriHLlzlrkMzWbpCkCzF6f4Yb6iGbsDag==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Logging": "2.1.1" - } - }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "8.0.0", @@ -1394,14 +1266,6 @@ "resolved": "8.0.0", "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gbeE5tNp/oB7O8kTTLh3wPPJCxpNOphXPTWVs1BsYuFOYapFijWuh0LYw1qnDo4gwDUYPXOmpTIhvtxisGsYOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1570,15 +1434,6 @@ "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", @@ -2450,7 +2305,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2492,7 +2346,6 @@ "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.ApplicationInsights.AspNetCore": "[2.22.0, )", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", "Sentry.AspNetCore": "[4.9.0, )", "Serilog.AspNetCore": "[8.0.3, )", @@ -2760,34 +2613,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" } }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "OuiZgRDX0zm3a1DRk/GT54ZsyTg8a88n3cpkVEYFJoRhT5X84l2C68BuKrglE0sIj+C0+o2WTR8S21YBD/ZWgA==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.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.22.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "type": "CentralTransitive", "requested": "[8.0.7, )", diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/packages.lock.json index 9aee82824..e125c779b 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.EndToEndTests/packages.lock.json @@ -282,54 +282,14 @@ "System.Security.Cryptography.Csp": "4.3.0" } }, - "Microsoft.ApplicationInsights.DependencyCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "gseSmuCshdZqcn5r6EW1Zx52e5/p2RpAsHSanlxs8pq+Pbg1RZP678tXtxfVuHC0fA3MVV852pnfFC7ZGB0jew==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.EventCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "/fXUyZIMwaWfETgire4fygaBhY8J+hXvTVhSFXKV0JOFBenzzU4smGW8iRUFhE534a3QrczuFfmfCCkXRKbsNg==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0" - } - }, - "Microsoft.ApplicationInsights.PerfCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "nExsJsbN7694ueUNNBms/UNgza9WH4W/I6i5CnF9ujJ1sp57EL5Uk0NP9MDwlLVtYaaiznKPatVSv3Nu8vAplw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", - "System.Diagnostics.PerformanceCounter": "6.0.0" - } - }, - "Microsoft.ApplicationInsights.WindowsServer": { + "Microsoft.ApplicationInsights": { "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "9k1x1+Kq1fElvcv0o/w9w8tRWAa2Y0f4NPBeHF5b2xCety4GM1yv3K3Ra0lZwO3kW0SHlm9M8nrySuyKQlHyYA==", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0", "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "Blb6S8UJSJ/jo6mxeO38gKgui75D2brp5NpXJoZUhyJzfmYsfhn7a4t5f+CDfAKyvie7sQB2FIzeEDQSiRE5zw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.IO.FileSystem.AccessControl": "4.7.0" - } - }, "Microsoft.AspNetCore.Cryptography.Internal": { "type": "Transitive", "resolved": "3.1.32", @@ -355,85 +315,6 @@ "resolved": "3.1.32", "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" }, - "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.TestHost": { "type": "Transitive", "resolved": "8.0.7", @@ -442,15 +323,6 @@ "System.IO.Pipelines": "8.0.0" } }, - "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.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -697,15 +569,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, - "Microsoft.Extensions.Logging.ApplicationInsights": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "5OmXub+9MyX8FbqgO+hBJRHk1iJ+UZUU20oIU3wo+RbmH6Jtsja79rriHLlzlrkMzWbpCkCzF6f4Yb6iGbsDag==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Logging": "2.1.1" - } - }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "8.0.0", @@ -887,15 +750,6 @@ "System.Memory": "4.5.5" } }, - "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": "1.1.1", @@ -1493,14 +1347,6 @@ "resolved": "8.0.0", "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gbeE5tNp/oB7O8kTTLh3wPPJCxpNOphXPTWVs1BsYuFOYapFijWuh0LYw1qnDo4gwDUYPXOmpTIhvtxisGsYOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1669,15 +1515,6 @@ "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", @@ -2541,7 +2378,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2583,7 +2419,6 @@ "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.ApplicationInsights.AspNetCore": "[2.22.0, )", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", "Sentry.AspNetCore": "[4.9.0, )", "Serilog.AspNetCore": "[8.0.3, )", @@ -2881,34 +2716,6 @@ "Microsoft.Extensions.Options": "7.0.1" } }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "OuiZgRDX0zm3a1DRk/GT54ZsyTg8a88n3cpkVEYFJoRhT5X84l2C68BuKrglE0sIj+C0+o2WTR8S21YBD/ZWgA==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.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.22.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "CentralTransitive", "requested": "[8.0.7, )", diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/packages.lock.json b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/packages.lock.json index 085d607b8..36c55620f 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/packages.lock.json +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.AuthorizeAccess.Tests/packages.lock.json @@ -271,54 +271,14 @@ "System.Security.Cryptography.Csp": "4.3.0" } }, - "Microsoft.ApplicationInsights.DependencyCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "gseSmuCshdZqcn5r6EW1Zx52e5/p2RpAsHSanlxs8pq+Pbg1RZP678tXtxfVuHC0fA3MVV852pnfFC7ZGB0jew==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.EventCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "/fXUyZIMwaWfETgire4fygaBhY8J+hXvTVhSFXKV0JOFBenzzU4smGW8iRUFhE534a3QrczuFfmfCCkXRKbsNg==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0" - } - }, - "Microsoft.ApplicationInsights.PerfCounterCollector": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "nExsJsbN7694ueUNNBms/UNgza9WH4W/I6i5CnF9ujJ1sp57EL5Uk0NP9MDwlLVtYaaiznKPatVSv3Nu8vAplw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Caching.Memory": "1.0.0", - "System.Diagnostics.PerformanceCounter": "6.0.0" - } - }, - "Microsoft.ApplicationInsights.WindowsServer": { + "Microsoft.ApplicationInsights": { "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "9k1x1+Kq1fElvcv0o/w9w8tRWAa2Y0f4NPBeHF5b2xCety4GM1yv3K3Ra0lZwO3kW0SHlm9M8nrySuyKQlHyYA==", + "resolved": "2.20.0", + "contentHash": "mb+EC5j06Msn5HhKrhrsMAst6JxvYUnphQMGY2cixCabgGAO3q79Y8o/p1Zce1Azgd1IVkRKAMzAV4vDCbXOqA==", "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.0", "System.Diagnostics.DiagnosticSource": "5.0.0" } }, - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "Blb6S8UJSJ/jo6mxeO38gKgui75D2brp5NpXJoZUhyJzfmYsfhn7a4t5f+CDfAKyvie7sQB2FIzeEDQSiRE5zw==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "System.IO.FileSystem.AccessControl": "4.7.0" - } - }, "Microsoft.AspNetCore.Cryptography.Internal": { "type": "Transitive", "resolved": "3.1.32", @@ -344,85 +304,6 @@ "resolved": "3.1.32", "contentHash": "MPL4iVyiaRxnOUY5VATHjvhDWaAEFb77KFiUxVRklv3Z3v+STofUr1UG/aCt1O9cgN7FVTDaC5A7U+zsLub8Xg==" }, - "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.TestHost": { "type": "Transitive", "resolved": "8.0.7", @@ -431,15 +312,6 @@ "System.IO.Pipelines": "8.0.0" } }, - "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.Services.AppAuthentication": { "type": "Transitive", "resolved": "1.6.2", @@ -686,15 +558,6 @@ "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, - "Microsoft.Extensions.Logging.ApplicationInsights": { - "type": "Transitive", - "resolved": "2.22.0", - "contentHash": "5OmXub+9MyX8FbqgO+hBJRHk1iJ+UZUU20oIU3wo+RbmH6Jtsja79rriHLlzlrkMzWbpCkCzF6f4Yb6iGbsDag==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.Extensions.Logging": "2.1.1" - } - }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", "resolved": "8.0.0", @@ -876,15 +739,6 @@ "System.Memory": "4.5.5" } }, - "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": "1.1.1", @@ -1477,14 +1331,6 @@ "resolved": "8.0.0", "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, - "System.Diagnostics.PerformanceCounter": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "gbeE5tNp/oB7O8kTTLh3wPPJCxpNOphXPTWVs1BsYuFOYapFijWuh0LYw1qnDo4gwDUYPXOmpTIhvtxisGsYOQ==", - "dependencies": { - "System.Configuration.ConfigurationManager": "6.0.0" - } - }, "System.Diagnostics.Process": { "type": "Transitive", "resolved": "4.3.0", @@ -1653,15 +1499,6 @@ "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", @@ -2525,7 +2362,6 @@ "Hangfire.NetCore": "[1.8.14, )", "Hangfire.PostgreSql": "[1.20.10, )", "IdentityModel": "[6.2.0, )", - "Microsoft.ApplicationInsights": "[2.22.0, )", "Microsoft.Data.SqlClient": "[5.2.2, )", "Microsoft.EntityFrameworkCore.Relational": "[8.0.10, )", "Microsoft.Extensions.Azure": "[1.7.5, )", @@ -2567,7 +2403,6 @@ "AspNetCore.HealthChecks.NpgSql": "[8.0.0, )", "Azure.Extensions.AspNetCore.DataProtection.Blobs": "[1.3.4, )", "Hangfire.AspNetCore": "[1.8.14, )", - "Microsoft.ApplicationInsights.AspNetCore": "[2.22.0, )", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.8, )", "Sentry.AspNetCore": "[4.9.0, )", "Serilog.AspNetCore": "[8.0.3, )", @@ -2865,34 +2700,6 @@ "Microsoft.Extensions.Options": "7.0.1" } }, - "Microsoft.ApplicationInsights": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "3AOM9bZtku7RQwHyMEY3tQMrHIgjcfRDa6YQpd/QG2LDGvMydSlL9Di+8LLMt7J2RDdfJ7/2jdYv6yHcMJAnNw==", - "dependencies": { - "System.Diagnostics.DiagnosticSource": "5.0.0" - } - }, - "Microsoft.ApplicationInsights.AspNetCore": { - "type": "CentralTransitive", - "requested": "[2.22.0, )", - "resolved": "2.22.0", - "contentHash": "OuiZgRDX0zm3a1DRk/GT54ZsyTg8a88n3cpkVEYFJoRhT5X84l2C68BuKrglE0sIj+C0+o2WTR8S21YBD/ZWgA==", - "dependencies": { - "Microsoft.ApplicationInsights": "2.22.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.22.0", - "Microsoft.ApplicationInsights.EventCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer": "2.22.0", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.22.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.22.0", - "System.Text.Encodings.Web": "4.7.2" - } - }, "Microsoft.AspNetCore.Authentication.OpenIdConnect": { "type": "CentralTransitive", "requested": "[8.0.7, )", diff --git a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingFixture.cs b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingFixture.cs index ecc15d0bd..1723deaf3 100644 --- a/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingFixture.cs +++ b/TeachingRecordSystem/tests/TeachingRecordSystem.Core.Dqt.CrmIntegrationTests/Services/DqtReporting/DqtReportingFixture.cs @@ -1,5 +1,4 @@ using Medallion.Threading.FileSystem; -using Microsoft.ApplicationInsights; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Microsoft.Xrm.Sdk; @@ -62,8 +61,6 @@ public async Task WithService(Func(); var service = new DqtReportingService( @@ -72,7 +69,6 @@ public async Task WithService(Func