the rest

Altinn · Nov 13, 2024 · d4f1711 · d4f1711
1 parent 97273bf
commit d4f1711
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
         <AnalysisMode>Recommended</AnalysisMode>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>

diff --git a/...Domain.Dialogporten.ChangeDataCapture/Digdir.Domain.Dialogporten.ChangeDataCapture.csproj b/...Domain.Dialogporten.ChangeDataCapture/Digdir.Domain.Dialogporten.ChangeDataCapture.csproj
@@ -4,6 +4,8 @@
         <PackageReference Include="Azure.Identity" Version="1.13.1" />
         <PackageReference Include="MassTransit" Version="8.3.1" />
         <PackageReference Include="Npgsql" Version="8.0.5" />
+        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
         <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
         <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0"/>

diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/Digdir.Domain.Dialogporten.GraphQL.csproj b/src/Digdir.Domain.Dialogporten.GraphQL/Digdir.Domain.Dialogporten.GraphQL.csproj
@@ -10,6 +10,9 @@
         <PackageReference Include="HotChocolate.AspNetCore.Authorization" Version="13.9.14" />
         <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
+        <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" />
+        <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.0" />
         <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
         <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0"/>
     </ItemGroup>

diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/OpenTelemetryEventListener.cs b/src/Digdir.Domain.Dialogporten.GraphQL/OpenTelemetryEventListener.cs
@@ -44,7 +44,7 @@ public override void RequestError(IRequestContext context, Exception exception)
         var currentActivity = Activity.Current;
         if (currentActivity != null)
         {
-            currentActivity.RecordException(exception);
+            currentActivity.AddException(exception);
             currentActivity.SetStatus(ActivityStatusCode.Error, exception.Message);
         }
         base.RequestError(context, exception);
@@ -72,7 +72,7 @@ private static void OnEndRequest(IRequestContext context, Activity activity)
         var httpContext = GetHttpContextFrom(context);
         if (context.Exception != null)
         {
-            activity.RecordException(context.Exception);
+            activity.AddException(context.Exception);
             activity.SetStatus(ActivityStatusCode.Error, context.Exception.Message);
         }
 
@@ -85,7 +85,7 @@ private static void OnEndRequest(IRequestContext context, Activity activity)
                     continue;
                 }
 
-                activity.RecordException(error.Exception);
+                activity.AddException(error.Exception);
                 activity.SetStatus(ActivityStatusCode.Error, error.Exception.Message);
             }
         }

diff --git a/...igdir.Domain.Dialogporten.Infrastructure/Digdir.Domain.Dialogporten.Infrastructure.csproj b/...igdir.Domain.Dialogporten.Infrastructure/Digdir.Domain.Dialogporten.Infrastructure.csproj
@@ -6,6 +6,9 @@
         <PackageReference Include="MassTransit.Azure.ServiceBus.Core" Version="8.3.1" />
         <PackageReference Include="MassTransit.EntityFrameworkCore" Version="8.3.1" />
         <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
+        <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.0" />
         <PackageReference Include="Altinn.Authorization.ABAC" Version="0.0.8"/>
         <PackageReference Include="Bogus" Version="35.6.1"/>
         <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />

diff --git a/src/Digdir.Domain.Dialogporten.WebApi/Digdir.Domain.Dialogporten.WebApi.csproj b/src/Digdir.Domain.Dialogporten.WebApi/Digdir.Domain.Dialogporten.WebApi.csproj
@@ -12,6 +12,8 @@
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
+        <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.0" />
         <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
         <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />

diff --git a/src/Digdir.Library.Utils.AspNet/Digdir.Library.Utils.AspNet.csproj b/src/Digdir.Library.Utils.AspNet/Digdir.Library.Utils.AspNet.csproj
@@ -11,6 +11,8 @@
         <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" />
         <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
         <PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
+        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
         <PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" />
         <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.5" />
         <PackageReference Include="OpenTelemetry" Version="1.10.0" />

diff --git a/src/Digdir.Tool.Dialogporten.SlackNotifier/Digdir.Tool.Dialogporten.SlackNotifier.csproj b/src/Digdir.Tool.Dialogporten.SlackNotifier/Digdir.Tool.Dialogporten.SlackNotifier.csproj
@@ -7,6 +7,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Azure.Identity" Version="1.13.1" />
+        <PackageReference Include="System.Text.Json" Version="9.0.0" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
         <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0"/>
         <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />

diff --git a/...ication.Integration.Tests/Digdir.Domain.Dialogporten.Application.Integration.Tests.csproj b/...ication.Integration.Tests/Digdir.Domain.Dialogporten.Application.Integration.Tests.csproj
@@ -7,6 +7,10 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+        <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.2.0" />
+        <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
+        <PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
         <PackageReference Include="FluentAssertions" Version="6.12.2" />
         <PackageReference Include="NSubstitute" Version="5.3.0"/>
         <PackageReference Include="Respawn" Version="6.2.1"/>