NOISSUE - Format log messages from agent (ultravioletrs#244)

* downgrade mod Signed-off-by: Sammy Oina <[email protected]> * add fields to logging Signed-off-by: Sammy Oina <[email protected]> --------- Signed-off-by: Sammy Oina <[email protected]>
WashingtonKK · Sep 19, 2024 · 4c09b4b · 4c09b4b
1 parent 1546fbc
commit 4c09b4b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ultravioletrs/cocos
 
-go 1.23.0
+go 1.22.5
 
 require (
 	github.com/absmach/magistrala v0.14.1-0.20240709113739-04c359462746

diff --git a/manager/agentEventsLogs.go b/manager/agentEventsLogs.go
@@ -4,6 +4,7 @@ package manager
 
 import (
 	"fmt"
+	"log/slog"
 	"net"
 	"regexp"
 	"strconv"
@@ -65,7 +66,26 @@ func (ms *managerService) handleConnections(conn net.Conn) {
 		}
 		ms.eventsChan <- &message
 
-		ms.logger.WithGroup("agent-events-logs").Info(message.String())
+		args := []any{}
+
+		switch message.Message.(type) {
+		case *manager.ClientStreamMessage_AgentEvent:
+			args = append(args, slog.Group("agent-event",
+				slog.String("event-type", message.GetAgentEvent().GetEventType()),
+				slog.String("computation-id", message.GetAgentEvent().GetComputationId()),
+				slog.String("status", message.GetAgentEvent().GetStatus()),
+				slog.String("originator", message.GetAgentEvent().GetOriginator()),
+				slog.String("timestamp", message.GetAgentEvent().GetTimestamp().String()),
+				slog.String("details", string(message.GetAgentEvent().GetDetails()))))
+		case *manager.ClientStreamMessage_AgentLog:
+			args = append(args, slog.Group("agent-log",
+				slog.String("computation-id", message.GetAgentLog().GetComputationId()),
+				slog.String("level", message.GetAgentLog().GetLevel()),
+				slog.String("timestamp", message.GetAgentLog().GetTimestamp().String()),
+				slog.String("message", message.GetAgentLog().GetMessage())))
+		}
+
+		ms.logger.Info("", args...)
 	}
 }