Be more consistent with how we log custom dimensions (#424)

Author: Ceredron

src/Altinn.Broker.Application/Altinn.Broker.Application.csproj

@@ -13,6 +13,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageReference Include="OneOf" Version="3.0.263" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
   </ItemGroup>
 
   <ItemGroup>

src/Altinn.Broker.Application/InitializeFileTransferCommand/InitializeFileTransferCommandHandler.cs

@@ -1,4 +1,6 @@
-using Altinn.Broker.Application.ExpireFileTransferCommand;
+using System;
+
+using Altinn.Broker.Application.ExpireFileTransferCommand;
 using Altinn.Broker.Core.Application;
 using Altinn.Broker.Core.Domain.Enums;
 using Altinn.Broker.Core.Repositories;
@@ -11,6 +13,8 @@
 
 using OneOf;
 
+using Serilog.Context;
+
 namespace Altinn.Broker.Application.InitializeFileTransferCommand;
 public class InitializeFileTransferCommandHandler : IHandler<InitializeFileTransferCommandRequest, Guid>
 {
@@ -65,6 +69,7 @@ public async Task<OneOf<Guid, Error>> Process(InitializeFileTransferCommandReque
         }
         var fileExpirationTime = DateTime.UtcNow.Add(resource.FileTransferTimeToLive ?? TimeSpan.FromDays(30));
         var fileTransferId = await _fileTransferRepository.AddFileTransfer(serviceOwner, resource, request.FileName, request.SendersFileTransferReference, request.SenderExternalId, request.RecipientExternalIds, fileExpirationTime, request.PropertyList, request.Checksum, null, null, cancellationToken);
+        LogContext.PushProperty("fileTransferId", fileTransferId);
         await _fileTransferStatusRepository.InsertFileTransferStatus(fileTransferId, FileTransferStatus.Initialized, cancellationToken: cancellationToken);
         var addRecipientEventTasks = request.RecipientExternalIds.Select(recipientId => _actorFileTransferStatusRepository.InsertActorFileTransferStatus(fileTransferId, ActorFileTransferStatus.Initialized, recipientId, cancellationToken));
         try

src/Altinn.Broker.Persistence/Altinn.Broker.Persistence.csproj

@@ -20,6 +20,7 @@
     <PackageReference Include="Hangfire.PostgreSql" Version="1.20.8" />
     <PackageReference Include="Microsoft.Azure.Management.Storage" Version="25.0.0" />
     <PackageReference Include="Npgsql" Version="8.0.2" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
   </ItemGroup>
 

src/Altinn.Broker.Persistence/Repositories/FileTransferRepository.cs

@@ -8,6 +8,8 @@
 
 using NpgsqlTypes;
 
+using Serilog.Context;
+
 namespace Altinn.Broker.Persistence.Repositories;
 
 public class FileTransferRepository : IFileTransferRepository
@@ -110,9 +112,19 @@ GROUP BY
         }
         fileTransfer.RecipientCurrentStatuses = await GetLatestRecipientFileTransferStatuses(fileTransferId, cancellationToken);
         fileTransfer.PropertyList = await GetMetadata(fileTransferId, cancellationToken);
+        EnrichLogs(fileTransfer);
         return fileTransfer;
     }
 
+    private static void EnrichLogs(FileTransferEntity fileTransferEntity)
+    {
+        LogContext.PushProperty("fileTransferId", fileTransferEntity.FileTransferId);
+        LogContext.PushProperty("resourceId", fileTransferEntity.ResourceId);
+        LogContext.PushProperty("sender", fileTransferEntity.Sender);
+        LogContext.PushProperty("recipients", string.Join(',', fileTransferEntity.RecipientCurrentStatuses.Select(status => status.Actor.ActorExternalId)));
+        LogContext.PushProperty("fileName", fileTransferEntity.FileName);
+        LogContext.PushProperty("status", fileTransferEntity.FileTransferStatusEntity.Status.ToString());
+    }
 
     /*
      * Get the current status of a file tranfer's recipients along wiith the last time their status changed.