From f543992345f98488db94c8bbed7e7aa703c3d34d Mon Sep 17 00:00:00 2001 From: Donal Hurley Date: Mon, 25 Aug 2025 09:50:05 +0100 Subject: [PATCH 1/2] Fix correlation id format in logs --- api/grpc/mpi/v1/command.pb.go | 2 +- api/grpc/mpi/v1/common.pb.go | 2 +- api/grpc/mpi/v1/files.pb.go | 2 +- internal/watcher/file/file_watcher_service.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/grpc/mpi/v1/command.pb.go b/api/grpc/mpi/v1/command.pb.go index 1c4fa9b0c..39ef93489 100644 --- a/api/grpc/mpi/v1/command.pb.go +++ b/api/grpc/mpi/v1/command.pb.go @@ -8,7 +8,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.7 +// protoc-gen-go v1.36.8 // protoc (unknown) // source: mpi/v1/command.proto diff --git a/api/grpc/mpi/v1/common.pb.go b/api/grpc/mpi/v1/common.pb.go index 26b95bf14..890c2b073 100644 --- a/api/grpc/mpi/v1/common.pb.go +++ b/api/grpc/mpi/v1/common.pb.go @@ -5,7 +5,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.7 +// protoc-gen-go v1.36.8 // protoc (unknown) // source: mpi/v1/common.proto diff --git a/api/grpc/mpi/v1/files.pb.go b/api/grpc/mpi/v1/files.pb.go index c68585426..be249670c 100644 --- a/api/grpc/mpi/v1/files.pb.go +++ b/api/grpc/mpi/v1/files.pb.go @@ -5,7 +5,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.7 +// protoc-gen-go v1.36.8 // protoc (unknown) // source: mpi/v1/files.proto diff --git a/internal/watcher/file/file_watcher_service.go b/internal/watcher/file/file_watcher_service.go index 10e1a2470..51b0e8c28 100644 --- a/internal/watcher/file/file_watcher_service.go +++ b/internal/watcher/file/file_watcher_service.go @@ -203,7 +203,7 @@ func (fws *FileWatcherService) checkForUpdates(ctx context.Context, ch chan<- Fi newCtx := context.WithValue( ctx, logger.CorrelationIDContextKey, - slog.Any(logger.CorrelationIDKey, logger.GenerateCorrelationID()), + logger.GenerateCorrelationID(), ) slog.DebugContext(newCtx, "File watcher detected a file change") From c69e42ffafd881c506a1cd9dc4f60ac33a1883d4 Mon Sep 17 00:00:00 2001 From: Donal Hurley Date: Mon, 25 Aug 2025 10:00:53 +0100 Subject: [PATCH 2/2] Fix correlation id format in logs --- internal/watcher/credentials/credential_watcher_service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/watcher/credentials/credential_watcher_service.go b/internal/watcher/credentials/credential_watcher_service.go index 868acd3ae..09434e46e 100644 --- a/internal/watcher/credentials/credential_watcher_service.go +++ b/internal/watcher/credentials/credential_watcher_service.go @@ -166,7 +166,7 @@ func (cws *CredentialWatcherService) checkForUpdates(ctx context.Context, ch cha newCtx := context.WithValue( ctx, logger.CorrelationIDContextKey, - slog.Any(logger.CorrelationIDKey, logger.GenerateCorrelationID()), + logger.GenerateCorrelationID(), ) cws.watcherMutex.Lock()