Merge pull request #122 from Resgrid/develop

CU-8687yhbz5 sentry logging changes
Resgrid · May 18, 2024 · 38b4fcc · 38b4fcc
2 parents 21b1267 + 7c9ae66
commit 38b4fcc
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 7 deletions.
diff --git a/Core/Resgrid.Config/ExternalErrorConfig.cs b/Core/Resgrid.Config/ExternalErrorConfig.cs
@@ -22,6 +22,7 @@ public static class ExternalErrorConfig
 		public static string ExternalErrorServiceUrlForInternalApi = "";
 		public static string ExternalErrorServiceUrlForInternalWorker = "";
 		public static double SentryPerfSampleRate = 0.4;
+		public static double SentryProfilingSampleRate = 0;
 		#endregion Sentry Settings
 
 		#region Application Insights Settings

diff --git a/Core/Resgrid.Framework/Logging.cs b/Core/Resgrid.Framework/Logging.cs
@@ -1,5 +1,7 @@
-using Resgrid.Config;
+using Microsoft.Extensions.Options;
+using Resgrid.Config;
 using Sentry;
+using Sentry.Profiling;
 using Serilog;
 using Serilog.Core;
 using Serilog.Events;
@@ -10,6 +12,7 @@
 using System.Net.Mail;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using static NodaTime.TimeZones.ZoneEqualityComparer;
 
 namespace Resgrid.Framework
 {
@@ -39,9 +42,18 @@ public static void Initialize(string key)
 												o.Dsn = dsn;
 												o.AttachStacktrace = true;
 												o.SendDefaultPii = true;
+												o.AutoSessionTracking = true;
 												o.TracesSampleRate = ExternalErrorConfig.SentryPerfSampleRate;
 												o.Environment = ExternalErrorConfig.Environment;
 												o.Release = Assembly.GetEntryAssembly().GetName().Version.ToString();
+												o.ProfilesSampleRate = ExternalErrorConfig.SentryProfilingSampleRate;
+
+												// Requires NuGet package: Sentry.Profiling
+												// Note: By default, the profiler is initialized asynchronously. This can be tuned by passing a desired initialization timeout to the constructor.
+												o.AddIntegration(new ProfilingIntegration(
+													// During startup, wait up to 500ms to profile the app startup code. This could make launching the app a bit slower so comment it out if your prefer profiling to start asynchronously
+													//TimeSpan.FromMilliseconds(500)
+												));
 											}).CreateLogger();
 				}
 				else if (SystemBehaviorConfig.ErrorLoggerType == ErrorLoggerTypes.Elk)

diff --git a/Core/Resgrid.Framework/Resgrid.Framework.csproj b/Core/Resgrid.Framework/Resgrid.Framework.csproj
@@ -15,8 +15,10 @@
     <PackageReference Include="HtmlAgilityPack" Version="1.11.59" />
     <PackageReference Include="NodaTime" Version="3.1.11" />
     <PackageReference Include="protobuf-net" Version="3.2.30" />
-    <PackageReference Include="Sentry" Version="4.2.1" />
-    <PackageReference Include="Sentry.Serilog" Version="4.2.1" />
+    <PackageReference Include="Sentry" Version="4.6.2" />
+    <PackageReference Include="Sentry.AspNetCore" Version="4.6.2" />
+    <PackageReference Include="Sentry.Profiling" Version="4.6.2" />
+    <PackageReference Include="Sentry.Serilog" Version="4.6.2" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
     <PackageReference Include="TimeZoneConverter" Version="6.1.0" />

diff --git a/Providers/Resgrid.Providers.Claims/ClaimsPrincipalFactory.cs b/Providers/Resgrid.Providers.Claims/ClaimsPrincipalFactory.cs
@@ -8,6 +8,8 @@
 using Resgrid.Model.Identity;
 using Resgrid.Model.Repositories;
 using Resgrid.Model.Services;
+using IdentityRole = Resgrid.Model.Identity.IdentityRole;
+using IdentityUser = Resgrid.Model.Identity.IdentityUser;
 
 namespace Resgrid.Providers.Claims
 {

diff --git a/Repositories/Resgrid.Repositories.DataRepository/IdentityUserRepository.cs b/Repositories/Resgrid.Repositories.DataRepository/IdentityUserRepository.cs
@@ -15,6 +15,8 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using IdentityRole = Resgrid.Model.Identity.IdentityRole;
+using IdentityUser = Resgrid.Model.Identity.IdentityUser;
 
 namespace Resgrid.Repositories.DataRepository
 {

diff --git a/Repositories/Resgrid.Repositories.DataRepository/Stores/IdentityRoleStore.cs b/Repositories/Resgrid.Repositories.DataRepository/Stores/IdentityRoleStore.cs
@@ -13,6 +13,8 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using IdentityRole = Resgrid.Model.Identity.IdentityRole;
+using IdentityUser = Resgrid.Model.Identity.IdentityUser;
 
 namespace Resgrid.Repositories.DataRepository.Stores
 {

diff --git a/Repositories/Resgrid.Repositories.DataRepository/Stores/IdentityUserStore.cs b/Repositories/Resgrid.Repositories.DataRepository/Stores/IdentityUserStore.cs
@@ -12,6 +12,8 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using IdentityRole = Resgrid.Model.Identity.IdentityRole;
+using IdentityUser = Resgrid.Model.Identity.IdentityUser;
 
 namespace Resgrid.Repositories.DataRepository.Stores
 {

diff --git a/Web/Resgrid.Web.Eventing/Resgrid.Web.Eventing.csproj b/Web/Resgrid.Web.Eventing/Resgrid.Web.Eventing.csproj
@@ -44,6 +44,7 @@
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
+    <PackageReference Include="Sentry.AspNetCore" Version="4.6.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Core\Resgrid.Config\Resgrid.Config.csproj" />

diff --git a/Web/Resgrid.Web.ServicesCore/Program.cs b/Web/Resgrid.Web.ServicesCore/Program.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Resgrid.Config;
+using Sentry.Profiling;
 
 namespace Resgrid.Web.ServicesCore
 {
@@ -40,9 +41,18 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
 							options.Dsn = Config.ExternalErrorConfig.ExternalErrorServiceUrlForApi;
 							options.AttachStacktrace = true;
 							options.SendDefaultPii = true;
+							options.AutoSessionTracking = true;
 							options.TracesSampleRate = ExternalErrorConfig.SentryPerfSampleRate;
 							options.Environment = ExternalErrorConfig.Environment;
 							options.Release = Assembly.GetEntryAssembly().GetName().Version.ToString();
+							options.ProfilesSampleRate = ExternalErrorConfig.SentryProfilingSampleRate;
+
+							// Requires NuGet package: Sentry.Profiling
+							// Note: By default, the profiler is initialized asynchronously. This can be tuned by passing a desired initialization timeout to the constructor.
+							options.AddIntegration(new ProfilingIntegration(
+							// During startup, wait up to 500ms to profile the app startup code. This could make launching the app a bit slower so comment it out if your prefer profiling to start asynchronously
+							//TimeSpan.FromMilliseconds(500)
+							));
 
 							options.TracesSampler = samplingContext =>
 							{

diff --git a/Web/Resgrid.Web.ServicesCore/Resgrid.Web.ServicesCore.csproj b/Web/Resgrid.Web.ServicesCore/Resgrid.Web.ServicesCore.csproj
@@ -64,8 +64,8 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
     <PackageReference Include="protobuf-net" Version="3.2.30" />
-    <PackageReference Include="Sentry" Version="4.2.1" />
-    <PackageReference Include="Sentry.AspNetCore" Version="4.2.1" />
+    <PackageReference Include="Sentry" Version="4.6.2" />
+    <PackageReference Include="Sentry.AspNetCore" Version="4.6.2" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />

diff --git a/Web/Resgrid.WebCore/Program.cs b/Web/Resgrid.WebCore/Program.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Resgrid.Config;
+using Sentry.Profiling;
 
 namespace Resgrid.Web
 {
@@ -41,7 +42,16 @@ public static IHostBuilder CreateHostBuilder(string[] args) =>
 							options.SendDefaultPii = true;
 							options.TracesSampleRate = ExternalErrorConfig.SentryPerfSampleRate;
 							options.Environment = ExternalErrorConfig.Environment;
+							options.AutoSessionTracking = true;
 							options.Release = Assembly.GetEntryAssembly().GetName().Version.ToString();
+							options.ProfilesSampleRate = ExternalErrorConfig.SentryProfilingSampleRate;
+
+							// Requires NuGet package: Sentry.Profiling
+							// Note: By default, the profiler is initialized asynchronously. This can be tuned by passing a desired initialization timeout to the constructor.
+							options.AddIntegration(new ProfilingIntegration(
+							// During startup, wait up to 500ms to profile the app startup code. This could make launching the app a bit slower so comment it out if your prefer profiling to start asynchronously
+							//TimeSpan.FromMilliseconds(500)
+							));
 
 							options.TracesSampler = samplingContext =>
 							{

diff --git a/Web/Resgrid.WebCore/Resgrid.WebCore.csproj b/Web/Resgrid.WebCore/Resgrid.WebCore.csproj
@@ -58,8 +58,8 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
     <PackageReference Include="protobuf-net" Version="3.2.30" />
-    <PackageReference Include="Sentry" Version="4.2.1" />
-    <PackageReference Include="Sentry.AspNetCore" Version="4.2.1" />
+    <PackageReference Include="Sentry" Version="4.6.2" />
+    <PackageReference Include="Sentry.AspNetCore" Version="4.6.2" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />