still broken

sillsdev · Sep 11, 2024 · ef26abe · ef26abe
1 parent 93d230a
commit ef26abe
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,6 +21,7 @@ services:
       - ASPNETCORE_Translation__Engines__1__Address=http://machine-engine
       - ASPNETCORE_Translation__Engines__2__Type=Nmt
       - ASPNETCORE_Translation__Engines__2__Address=http://machine-engine
+      - "Bugsnag__ApiKey=${Bugsnag__ApiKey:?access key needed}"
     expose:
       - 80
       - 81
@@ -52,6 +53,7 @@ services:
       - ASPNETCORE_Kestrel__Endpoints__Http__Url=http://*:80
       - ASPNETCORE_Kestrel__EndpointDefaults__Protocols=Http2
       - ASPNETCORE_ConnectionStrings__TranslationPlatformApi=http://serval-api:81
+      - "Bugsnag__ApiKey=${Bugsnag__ApiKey:?access key needed}"
     expose:
       - 80
     ports:
@@ -96,6 +98,7 @@ services:
       - SharedFile__Uri=s3://silnlp/docker-compose/
       - "SharedFile__S3AccessKeyId=${AWS_ACCESS_KEY_ID:?access key needed}"
       - "SharedFile__S3SecretAccessKey=${AWS_SECRET_ACCESS_KEY:?secret key needed}"
+      - "Bugsnag__ApiKey=${Bugsnag__ApiKey:?access key needed}"
     expose:
       - 80
     ports:
@@ -141,6 +144,7 @@ services:
       - SharedFile__Uri=s3://silnlp/docker-compose/
       - "SharedFile__S3AccessKeyId=${AWS_ACCESS_KEY_ID:?access key needed}"
       - "SharedFile__S3SecretAccessKey=${AWS_SECRET_ACCESS_KEY:?secret key needed}"
+      - "Bugsnag__ApiKey=${Bugsnag__ApiKey:?access key needed}"
     expose:
       - 80
     ports:

diff --git a/src/Serval/src/Serval.Shared/Controllers/BugsnagExceptionFilter.cs b/src/Serval/src/Serval.Shared/Controllers/BugsnagExceptionFilter.cs
@@ -0,0 +1,11 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Serval.Shared.Controllers;
+
+public class BugsnagExceptionFilter : ExceptionFilterAttribute
+{
+    public override void OnException(ExceptionContext context)
+    {
+        context.HttpContext.RequestServices.GetService<IClient>()?.Notify(context.Exception);
+    }
+}
diff --git a/src/Serval/src/Serval.Shared/Controllers/ServalControllerBase.cs b/src/Serval/src/Serval.Shared/Controllers/ServalControllerBase.cs
@@ -10,9 +10,10 @@
 [TypeFilter(typeof(NotFoundExceptionFilter))]
 [TypeFilter(typeof(ForbiddenExceptionFilter))]
 [TypeFilter(typeof(BadRequestExceptionFilter))]
-public abstract class ServalControllerBase(IAuthorizationService authService) : Controller
+public abstract class ServalControllerBase(IAuthorizationService authService, IClient bugsnagClient) : Controller
 {
     private readonly IAuthorizationService _authService = authService;
+    protected readonly IClient BugsnagClient = bugsnagClient;
 
     protected string Owner => User.Identity!.Name!;
 

diff --git a/src/Serval/src/Serval.Shared/Serval.Shared.csproj b/src/Serval/src/Serval.Shared/Serval.Shared.csproj
@@ -25,6 +25,7 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\DataAccess\src\SIL.DataAccess\SIL.DataAccess.csproj" />
+		<ProjectReference Include="..\..\..\ServiceToolkit\src\SIL.ServiceToolkit\SIL.ServiceToolkit.csproj" />
 		<ProjectReference Include="..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj" Condition="Exists('..\..\..\..\..\machine\src\SIL.Machine\SIL.Machine.csproj')" />
 		<ProjectReference Include="..\Serval.Grpc\Serval.Grpc.csproj" />
 	</ItemGroup>

diff --git a/src/Serval/src/Serval.Shared/Usings.cs b/src/Serval/src/Serval.Shared/Usings.cs
@@ -1,6 +1,7 @@
 global using System.Diagnostics;
 global using System.Text.Json;
 global using System.Text.Json.Serialization;
+global using Bugsnag;
 global using Grpc.Core;
 global using Grpc.Net.ClientFactory;
 global using Microsoft.AspNetCore.Authorization;

diff --git a/src/ServiceToolkit/src/SIL.ServiceToolkit/Configuration/BugsnagOptions.cs b/src/ServiceToolkit/src/SIL.ServiceToolkit/Configuration/BugsnagOptions.cs
@@ -1,8 +1,8 @@
 namespace SIL.ServiceToolkit.Services;
 
-public class BugSnagOptions
+public class BugsnagOptions
 {
-    public const string Key = "BugSnag";
+    public const string Key = "Bugsnag";
 
     public string ApiKey { get; set; } = "";
 }
diff --git a/src/ServiceToolkit/src/SIL.ServiceToolkit/Configuration/IServiceCollectionExtensions.cs b/src/ServiceToolkit/src/SIL.ServiceToolkit/Configuration/IServiceCollectionExtensions.cs
@@ -8,7 +8,7 @@ public static class IServiceCollectionExtensions
 {
     public static IServiceCollection AddBugSnag(this IServiceCollection services, IConfiguration? configuration = null)
     {
-        var apiKey = configuration?.GetSection(BugSnagOptions.Key)?.GetValue<string>("ApiKey");
+        var apiKey = configuration?.GetSection(BugsnagOptions.Key)?.GetValue<string>("ApiKey");
         if (apiKey is null)
         {
             Console.WriteLine("BugSnag ApiKey not available - not adding BugSnag.");