refactor(plugins): enhance logging by including process context for error tracking

Author: osmontero

agent-manager/agent/agent_imp.go

@@ -83,7 +83,7 @@ func (s *AgentService) RegisterAgent(ctx context.Context, req *AgentRequest) (*A
 				Key: oldAgent.AgentKey,
 			}, nil
 		} else {
-			catcher.Error("agent already exists", err, map[string]any{"hostname": agent.Hostname})
+			catcher.Error("agent already exists", err, map[string]any{"hostname": agent.Hostname, "process": "agent-manager"})
 			return nil, status.Errorf(codes.AlreadyExists, "hostname has already been registered")
 		}
 	}
@@ -92,7 +92,7 @@ func (s *AgentService) RegisterAgent(ctx context.Context, req *AgentRequest) (*A
 	agent.AgentKey = key
 	err = s.DBConnection.Create(agent)
 	if err != nil {
-		catcher.Error("failed to create agent", err, nil)
+		catcher.Error("failed to create agent", err, map[string]any{"process": "agent-manager"})
 		return nil, status.Error(codes.Internal, fmt.Sprintf("failed to create agent: %v", err))
 	}
 
@@ -106,7 +106,7 @@ func (s *AgentService) RegisterAgent(ctx context.Context, req *AgentRequest) (*A
 		LastPing:      time.Now(),
 	}
 
-	catcher.Info("Agent registered correctly", map[string]any{"hostname": agent.Hostname, "id": agent.ID})
+	catcher.Info("Agent registered correctly", map[string]any{"hostname": agent.Hostname, "id": agent.ID, "process": "agent-manager"})
 	return &AuthResponse{
 		Id:  uint32(agent.ID),
 		Key: key,
@@ -126,7 +126,7 @@ func (s *AgentService) UpdateAgent(ctx context.Context, req *AgentRequest) (*Aut
 	agent := &models.Agent{}
 	err = s.DBConnection.GetFirst(agent, "id = ?", idInt)
 	if err != nil {
-		catcher.Error("failed to fetch agent", err, nil)
+		catcher.Error("failed to fetch agent", err, map[string]any{"process": "agent-manager"})
 		return nil, status.Errorf(codes.NotFound, "agent not found")
 	}
 
@@ -157,7 +157,7 @@ func (s *AgentService) UpdateAgent(ctx context.Context, req *AgentRequest) (*Aut
 
 	err = s.DBConnection.Upsert(&agent, "id = ?", nil, idInt)
 	if err != nil {
-		catcher.Error("failed to update agent", err, nil)
+		catcher.Error("failed to update agent", err, map[string]any{"process": "agent-manager"})
 		return nil, status.Errorf(codes.Internal, "failed to update agent: %v", err)
 	}
 
@@ -181,18 +181,18 @@ func (s *AgentService) DeleteAgent(ctx context.Context, req *DeleteRequest) (*Au
 
 	err = s.DBConnection.Upsert(&models.Agent{}, "id = ?", map[string]interface{}{"deleted_by": req.DeletedBy}, id)
 	if err != nil {
-		catcher.Error("unable to update delete_by field in agent", err, nil)
+		catcher.Error("unable to update delete_by field in agent", err, map[string]any{"process": "agent-manager"})
 	}
 
 	err = s.DBConnection.Delete(&models.AgentCommand{}, "agent_id = ?", false, uint(idInt))
 	if err != nil {
-		catcher.Error("unable to delete agent commands", err, nil)
+		catcher.Error("unable to delete agent commands", err, map[string]any{"process": "agent-manager"})
 		return &AuthResponse{}, status.Error(codes.Internal, fmt.Sprintf("unable to delete agent commands: %v", err.Error()))
 	}
 
 	err = s.DBConnection.Delete(&models.Agent{}, "id = ?", false, id)
 	if err != nil {
-		catcher.Error("unable to delete agent", err, nil)
+		catcher.Error("unable to delete agent", err, map[string]any{"process": "agent-manager"})
 		return &AuthResponse{}, status.Error(codes.Internal, fmt.Sprintf("unable to delete agent: %v", err.Error()))
 	}
 
@@ -204,7 +204,7 @@ func (s *AgentService) DeleteAgent(ctx context.Context, req *DeleteRequest) (*Au
 	delete(s.AgentStreamMap, uint(idInt))
 	s.AgentStreamMutex.Unlock()
 
-	catcher.Info("Agent deleted", map[string]any{"key": key, "deleted_by": req.DeletedBy})
+	catcher.Info("Agent deleted", map[string]any{"key": key, "deleted_by": req.DeletedBy, "process": "agent-manager"})
 
 	return &AuthResponse{
 		Id:  uint32(idInt),
@@ -219,7 +219,7 @@ func (s *AgentService) ListAgents(ctx context.Context, req *ListRequest) (*ListA
 	agents := []models.Agent{}
 	total, err := s.DBConnection.GetByPagination(&agents, page, filter, "", false)
 	if err != nil {
-		catcher.Error("failed to fetch agents", err, nil)
+		catcher.Error("failed to fetch agents", err, map[string]any{"process": "agent-manager"})
 		return nil, status.Errorf(codes.Internal, "failed to fetch agents: %v", err)
 	}
 
@@ -267,7 +267,7 @@ func (s *AgentService) AgentStream(stream AgentService_AgentStreamServer) error
 
 		switch msg := in.StreamMessage.(type) {
 		case *BidirectionalStream_Result:
-			catcher.Info("Received command result from agent", map[string]any{"agent_id": msg.Result.AgentId, "result": msg.Result.Result})
+			catcher.Info("Received command result from agent", map[string]any{"agent_id": msg.Result.AgentId, "result": msg.Result.Result, "process": "agent-manager"})
 			cmdID := msg.Result.GetCmdId()
 
 			s.CommandResultChannelM.Lock()
@@ -279,7 +279,7 @@ func (s *AgentService) AgentStream(stream AgentService_AgentStreamServer) error
 					ExecutedAt: msg.Result.ExecutedAt,
 				}
 			} else {
-				catcher.Error("failed to find result channel for CmdID", nil, map[string]any{"cmdID": cmdID})
+				catcher.Error("failed to find result channel for CmdID", nil, map[string]any{"cmdID": cmdID, "process": "agent-manager"})
 			}
 			s.CommandResultChannelM.Unlock()
 		}
@@ -325,7 +325,7 @@ func (s *AgentService) ProcessCommand(stream PanelService_ProcessCommandServer)
 		histCommand := createHistoryCommand(cmd, cmdID, uint(streamId))
 		err = s.DBConnection.Create(&histCommand)
 		if err != nil {
-			catcher.Error("unable to create a new command history", err, nil)
+			catcher.Error("unable to create a new command history", err, map[string]any{"process": "agent-manager"})
 		}
 
 		err = agentStream.Send(&BidirectionalStream{
@@ -349,7 +349,7 @@ func (s *AgentService) ProcessCommand(stream PanelService_ProcessCommandServer)
 			cmd.AgentId, cmdID,
 		)
 		if err != nil {
-			catcher.Error("failed to update command status", err, nil)
+			catcher.Error("failed to update command status", err, map[string]any{"process": "agent-manager"})
 		}
 
 		err = stream.Send(result)
@@ -370,7 +370,7 @@ func (s *AgentService) ListAgentCommands(ctx context.Context, req *ListRequest)
 	commands := []models.AgentCommand{}
 	total, err := s.DBConnection.GetByPagination(&commands, page, filter, "", false)
 	if err != nil {
-		catcher.Error("failed to fetch agent commands", err, nil)
+		catcher.Error("failed to fetch agent commands", err, map[string]any{"process": "agent-manager"})
 		return nil, status.Errorf(codes.Internal, "failed to fetch agent commands: %v", err)
 	}
 

agent-manager/agent/collector_imp.go

@@ -63,7 +63,7 @@ func InitCollectorService() {
 		collectors := []models.Collector{}
 		_, err := CollectorServ.DBConnection.GetAll(&collectors, "")
 		if err != nil {
-			catcher.Error("failed to fetch collectors", err, nil)
+			catcher.Error("failed to fetch collectors", err, map[string]any{"process": "agent-manager"})
 			os.Exit(1)
 		}
 		for _, c := range collectors {
@@ -79,7 +79,7 @@ func InitCollectorService() {
 				moduleConfig := &types.ConfigurationSection{}
 				moduleConfig, err = client.GetUTMConfig(moduleType)
 				if err != nil {
-					catcher.Error("failed to get module config", err, nil)
+					catcher.Error("failed to get module config", err, map[string]any{"process": "agent-manager"})
 					time.Sleep(5 * time.Second)
 					continue external
 				}
@@ -89,7 +89,7 @@ func InitCollectorService() {
 					var idInt int
 					idInt, err = strconv.Atoi(group.CollectorID)
 					if err != nil {
-						catcher.Error("invalid collector ID", err, nil)
+						catcher.Error("invalid collector ID", err, map[string]any{"process": "agent-manager"})
 						continue
 					}
 
@@ -131,7 +131,7 @@ func (s *CollectorService) RegisterCollector(ctx context.Context, req *RegisterR
 				Key: oldCollector.CollectorKey,
 			}, nil
 		} else {
-			catcher.Error("collector already registered with different IP", nil, map[string]any{"hostname": oldCollector.Hostname, "module": oldCollector.Module, "id": oldCollector.ID})
+			catcher.Error("collector already registered with different IP", nil, map[string]any{"hostname": oldCollector.Hostname, "module": oldCollector.Module, "id": oldCollector.ID, "process": "agent-manager"})
 			return nil, status.Errorf(codes.AlreadyExists, "hostname has already been registered")
 		}
 	}
@@ -140,7 +140,7 @@ func (s *CollectorService) RegisterCollector(ctx context.Context, req *RegisterR
 	collector.CollectorKey = key
 	err = s.DBConnection.Create(collector)
 	if err != nil {
-		catcher.Error("failed to create collector", err, nil)
+		catcher.Error("failed to create collector", err, map[string]any{"process": "agent-manager"})
 		return nil, status.Error(codes.Internal, fmt.Sprintf("failed to create collector: %v", err))
 	}
 
@@ -154,7 +154,7 @@ func (s *CollectorService) RegisterCollector(ctx context.Context, req *RegisterR
 		LastPing:      time.Now(),
 	}
 
-	catcher.Info("Collector registered correctly", map[string]any{"hostname": collector.Hostname, "module": collector.Module, "id": collector.ID})
+	catcher.Info("Collector registered correctly", map[string]any{"hostname": collector.Hostname, "module": collector.Module, "id": collector.ID, "process": "agent-manager"})
 	return &AuthResponse{
 		Id:  uint32(collector.ID),
 		Key: key,
@@ -173,12 +173,12 @@ func (s *CollectorService) DeleteCollector(ctx context.Context, req *DeleteReque
 
 	err = s.DBConnection.Upsert(&models.Collector{}, "id = ?", map[string]interface{}{"deleted_by": req.DeletedBy}, id)
 	if err != nil {
-		catcher.Error("unable to delete collector", err, nil)
+		catcher.Error("unable to delete collector", err, map[string]any{"process": "agent-manager"})
 	}
 
 	err = s.DBConnection.Delete(&models.Collector{}, "id = ?", false, id)
 	if err != nil {
-		catcher.Error("unable to delete collector", err, nil)
+		catcher.Error("unable to delete collector", err, map[string]any{"process": "agent-manager"})
 		return nil, status.Error(codes.Internal, fmt.Sprintf("unable to delete collector: %v", err.Error()))
 	}
 
@@ -190,7 +190,7 @@ func (s *CollectorService) DeleteCollector(ctx context.Context, req *DeleteReque
 	delete(s.CollectorStreamMap, uint(idInt))
 	s.CollectorStreamMutex.Unlock()
 
-	catcher.Info("Collector deleted", map[string]any{"key": key, "deleted_by": req.DeletedBy})
+	catcher.Info("Collector deleted", map[string]any{"key": key, "deleted_by": req.DeletedBy, "process": "agent-manager"})
 	return &AuthResponse{
 		Id:  uint32(idInt),
 		Key: key,
@@ -204,7 +204,7 @@ func (s *CollectorService) ListCollector(ctx context.Context, req *ListRequest)
 	collectors := []models.Collector{}
 	total, err := s.DBConnection.GetByPagination(&collectors, page, filter, "", false)
 	if err != nil {
-		catcher.Error("failed to fetch collectors", err, nil)
+		catcher.Error("failed to fetch collectors", err, map[string]any{"process": "agent-manager"})
 		return nil, status.Errorf(codes.Internal, "failed to fetch collectors: %v", err)
 	}
 	return convertModelToCollectorResponse(collectors, total), nil
@@ -214,7 +214,7 @@ func (s *CollectorService) ProcessPendingConfigs() {
 	for configs := range s.CollectorPendigConfigChan {
 		collectorID, err := strconv.Atoi(configs.CollectorId)
 		if err != nil {
-			catcher.Error("invalid collector ID", err, nil)
+			catcher.Error("invalid collector ID", err, map[string]any{"process": "agent-manager"})
 			continue
 		}
 
@@ -231,7 +231,7 @@ func (s *CollectorService) ProcessPendingConfigs() {
 				},
 			})
 			if err != nil {
-				catcher.Error("failed to send config to collector", err, nil)
+				catcher.Error("failed to send config to collector", err, map[string]any{"process": "agent-manager"})
 			}
 		}
 	}
@@ -276,7 +276,7 @@ func (s *CollectorService) CollectorStream(stream CollectorService_CollectorStre
 
 		switch msg := in.StreamMessage.(type) {
 		case *CollectorMessages_Result:
-			catcher.Info("Received Knowledge", map[string]any{"request_id": msg.Result.RequestId})
+			catcher.Info("Received Knowledge", map[string]any{"request_id": msg.Result.RequestId, "process": "agent-manager"})
 
 		case *CollectorMessages_Config:
 			// Not implemented

agent-manager/agent/lastseen_imp.go

@@ -51,7 +51,7 @@ func (s *LastSeenService) InitPingSync() {
 	for {
 		_, err := s.DBConnection.GetAll(&pings, "")
 		if err != nil {
-			catcher.Error("failed to get LastSeen items", err, nil)
+			catcher.Error("failed to get LastSeen items", err, map[string]any{"process": "agent-manager"})
 			time.Sleep(5 * time.Second)
 			continue
 		}
@@ -78,7 +78,7 @@ func (s *LastSeenService) processPings() {
 		}
 	}
 
-	catcher.Info("processPings goroutine ended", nil)
+	catcher.Info("processPings goroutine ended", map[string]any{"process": "agent-manager"})
 }
 
 func (s *LastSeenService) flushLastSeenToDB() {
@@ -131,7 +131,7 @@ func (s *LastSeenService) flushLastSeenToDB() {
 				for ping := range pingChan {
 					err := s.DBConnection.Upsert(&ping, "connector_id = ?", nil, ping.ConnectorID)
 					if err != nil {
-						catcher.Error("failed to save LastSeen item for connector", err, map[string]any{"connector_id": ping.ConnectorID})
+						catcher.Error("failed to save LastSeen item for connector", err, map[string]any{"connector_id": ping.ConnectorID, "process": "agent-manager"})
 						select {
 						case errorChan <- err:
 						default:

agent-manager/agent/parser.go

@@ -40,7 +40,7 @@ func createHistoryCommand(cmd *UtmCommand, cmdID string, agentId uint) *models.A
 func parseAgentToProto(agent models.Agent) *Agent {
 	agentStatus, lastSeen, err := LastSeenServ.GetLastSeenStatus(agent.ID, "agent")
 	if err != nil {
-		catcher.Error("failed to get last seen status for agent", err, map[string]any{"agent": agent.ID})
+		catcher.Error("failed to get last seen status for agent", err, map[string]any{"agent": agent.ID, "process": "agent-manager"})
 	}
 	agentResult := &Agent{
 		Id:             uint32(agent.ID),
@@ -108,7 +108,7 @@ func replaceSecretValues(input string) string {
 func modelToProtoCollector(model models.Collector) *Collector {
 	collectorStatus, lastSeen, err := LastSeenServ.GetLastSeenStatus(model.ID, "collector")
 	if err != nil {
-		catcher.Error("failed to get last seen status for collector", err, map[string]any{"model": model.ID})
+		catcher.Error("failed to get last seen status for collector", err, map[string]any{"model": model.ID, "process": "agent-manager"})
 	}
 	return &Collector{
 		Id:           int32(model.ID),

agent-manager/agent/utmgrpc.go

@@ -16,7 +16,7 @@ import (
 func InitGrpcServer() {
 	err := InitAgentService()
 	if err != nil {
-		catcher.Error("failed to init agent service", err, nil)
+		catcher.Error("failed to init agent service", err, map[string]any{"process": "agent-manager"})
 		os.Exit(1)
 	}
 
@@ -29,13 +29,13 @@ func InitGrpcServer() {
 func StartGrpcServer() {
 	listener, err := net.Listen("tcp", "0.0.0.0:50051")
 	if err != nil {
-		catcher.Error("failed to listen", err, nil)
+		catcher.Error("failed to listen", err, map[string]any{"process": "agent-manager"})
 		os.Exit(1)
 	}
 
 	loadedCert, err := tls.LoadX509KeyPair(config.CertPath, config.CertKeyPath)
 	if err != nil {
-		catcher.Error("failed to load TLS credentials: %v", err, nil)
+		catcher.Error("failed to load TLS credentials: %v", err, map[string]any{"process": "agent-manager"})
 		os.Exit(1)
 	}
 
@@ -59,9 +59,9 @@ func StartGrpcServer() {
 	grpc_health_v1.RegisterHealthServer(grpcServer, healthServer)
 	healthServer.SetServingStatus("", grpc_health_v1.HealthCheckResponse_SERVING)
 
-	catcher.Info("Starting gRPC server on 0.0.0.0:50051", nil)
+	catcher.Info("Starting gRPC server on 0.0.0.0:50051", map[string]any{"process": "agent-manager"})
 	if err := grpcServer.Serve(listener); err != nil {
-		catcher.Error("failed to serve", err, nil)
+		catcher.Error("failed to serve", err, map[string]any{"process": "agent-manager"})
 		os.Exit(1)
 	}
 }

agent-manager/updates/updates.go

@@ -17,7 +17,7 @@ func InitUpdatesManager() {
 }
 
 func ServeDependencies() {
-	catcher.Info("Serving dependencies", map[string]any{"path": config.UpdatesDependenciesFolder})
+	catcher.Info("Serving dependencies", map[string]any{"path": config.UpdatesDependenciesFolder, "process": "agent-manager"})
 
 	gin.SetMode(gin.ReleaseMode)
 	r := gin.New()
@@ -33,7 +33,7 @@ func ServeDependencies() {
 
 	loadedCert, err := tls.LoadX509KeyPair(config.CertPath, config.CertKeyPath)
 	if err != nil {
-		catcher.Error("failed to load TLS credentials", err, nil)
+		catcher.Error("failed to load TLS credentials", err, map[string]any{"process": "agent-manager"})
 		os.Exit(1)
 	}
 
@@ -55,9 +55,9 @@ func ServeDependencies() {
 		TLSConfig: tlsConfig,
 	}
 
-	catcher.Info("Starting HTTP server on port 8080", nil)
+	catcher.Info("Starting HTTP server on port 8080", map[string]any{"process": "agent-manager"})
 	if err := server.ListenAndServeTLS("", ""); err != nil {
-		catcher.Error("error starting HTTP server", err, nil)
+		catcher.Error("error starting HTTP server", err, map[string]any{"process": "agent-manager"})
 		return
 	}
 }