More cleanup

Author: IDisposable

cloud.go

@@ -14,6 +14,7 @@ import (
 	"github.com/coder/websocket/wsjson"
 	"github.com/google/uuid"
 	"github.com/jetkvm/kvm/internal/logging"
+	"github.com/jetkvm/kvm/internal/utils"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 
@@ -330,7 +331,7 @@ func runWebsocketClient() error {
 	c, resp, err := websocket.Dial(dialCtx, wsURL.String(), &websocket.DialOptions{
 		HTTPHeader: header,
 		OnPingReceived: func(ctx context.Context, payload []byte) bool {
-			logger.Debug().Bytes("payload", payload).Int("length", len(payload)).Msg("ping frame received")
+			logger.Debug().Object("data", utils.ByteSlice(payload)).Int("length", len(payload)).Msg("ping frame received")
 
 			metricConnectionTotalPingReceivedCount.WithLabelValues("cloud", wsURL.Host).Inc()
 			metricConnectionLastPingReceivedTimestamp.WithLabelValues("cloud", wsURL.Host).SetToCurrentTime()
@@ -357,7 +358,7 @@ func runWebsocketClient() error {
 			Msg("no connection id received from the server, generating a new one")
 	}
 
-	logger = logger.With().Str("connectionID", connectionId)
+	logger = logger.Str("connectionID", connectionId)
 
 	cloudLogger := logging.GetSubsystemLogger("cloud")
 

failsafe.go

@@ -56,7 +56,7 @@ func checkFailsafeReason() {
 		}
 
 		// check if the last crash log file exists
-		l := logging.GetSubsystemLogger("failsafe").With().Str("path", lastCrashPath).Logger()
+		l := logging.GetSubsystemLogger("failsafe").Str("path", lastCrashPath).Logger()
 		fi, err := os.Lstat(lastCrashPath)
 		if err != nil {
 			if !errors.Is(err, fs.ErrNotExist) {
@@ -103,7 +103,7 @@ func notifyFailsafeMode(session *Session) {
 
 	logging.GetSubsystemLogger("failsafe").Info().Str("reason", failsafeModeReason).Msg("sending failsafe mode notification")
 
-	writeJSONRPCEvent("failsafeMode", FailsafeModeNotification{
+	go writeJSONRPCEvent("failsafeMode", FailsafeModeNotification{
 		Active: true,
 		Reason: failsafeModeReason,
 	}, session)

hidrpc.go

@@ -69,8 +69,8 @@ func handlePointerReport(message hidrpc.Message) error {
 	return rpcAbsMouseReport(pointerReport.X, pointerReport.Y, pointerReport.Button)
 }
 
-func onHidMessage(msg hidQueueMessage, session *Session, queueContext *logging.Context) {
-	logger := queueContext.With().Str("channel", msg.channel)
+func onHidMessage(msg hidQueueMessage, session *Session, index int) {
+	logger := logging.GetSubsystemLogger("webrtc").Int("queueIndex", index).Str("channel", msg.channel)
 	data := msg.Data
 
 	if logger.IsDebugLevel() {
@@ -170,9 +170,7 @@ func handleHidRPCKeypressKeepAlive(session *Session) error {
 }
 
 func handleHidRPCKeyboardInput(message hidrpc.Message) error {
-	logger := hidrpc.GetHidRpcLoggingContext().
-		With().
-		Interface("message", message)
+	logger := hidrpc.GetHidRpcLogger().Interface("message", message)
 
 	switch message.Type() {
 	case hidrpc.TypeKeypressReport:
@@ -195,10 +193,7 @@ func handleHidRPCKeyboardInput(message hidrpc.Message) error {
 }
 
 func reportHidRPC(params any, session *Session) {
-	logger := hidrpc.GetHidRpcLoggingContext().
-		With().
-		Interface("params", params).
-		Interface("session", session)
+	logger := hidrpc.GetHidRpcLogger().Interface("params", params).Interface("session", session)
 
 	if session == nil {
 		logger.Warn().Msg("session is nil, skipping reportHidRPC")
@@ -229,7 +224,7 @@ func reportHidRPC(params any, session *Session) {
 		err = fmt.Errorf("unknown HID RPC message type: %T", params)
 	}
 
-	logger = logger.Bytes("message", message)
+	logger = logger.Object("data", utils.ByteSlice(message))
 
 	if err != nil || message == nil {
 		logger.Warn().Err(err).Msg("failed to marshal HID RPC message")

internal/hidrpc/log.go

@@ -4,6 +4,6 @@ import (
 	"github.com/jetkvm/kvm/internal/logging"
 )
 
-func GetHidRpcLoggingContext() *logging.Context {
+func GetHidRpcLogger() *logging.Context {
 	return logging.GetSubsystemLogger("hidrpc")
 }

internal/logging/context.go

@@ -224,11 +224,29 @@ func (c *Context) IPAddr(key string, ip net.IP) *Context {
 	nc := c.zc.IPAddr(key, ip)
 	return &Context{zc: &nc}
 }
+func (c *Context) IPAddrs(key string, ips []net.IP) *Context {
+	// coming soon in zerolog this will be natively supported
+	strs := make([]string, len(ips))
+	for i, ip := range ips {
+		strs[i] = ip.String()
+	}
+	nc := c.zc.Strs(key, strs)
+	return &Context{zc: &nc}
+}
 
 func (c *Context) IPPrefix(key string, pfx net.IPNet) *Context {
 	nc := c.zc.IPPrefix(key, pfx)
 	return &Context{zc: &nc}
 }
+func (c *Context) IPPrefixes(key string, pfxs []net.IPNet) *Context {
+	// coming soon in zerolog this will be natively supported
+	strs := make([]string, len(pfxs))
+	for i, pfx := range pfxs {
+		strs[i] = pfx.String()
+	}
+	nc := c.zc.Strs(key, strs)
+	return &Context{zc: &nc}
+}
 
 func (c *Context) MACAddr(key string, ha net.HardwareAddr) *Context {
 	nc := c.zc.MACAddr(key, ha)

internal/logging/pion.go

@@ -50,9 +50,9 @@ type pionLoggerFactory struct {
 	subsystem string
 }
 
-func (c pionLoggerFactory) NewLogger(component string) logging.LeveledLogger {
+func (c pionLoggerFactory) NewLogger(subcomponent string) logging.LeveledLogger {
 	return pionLogger{logger: func() *Context {
-		return GetSubsystemLogger(c.subsystem).Str("component", component)
+		return GetSubsystemLogger("pion").Str("subcomponent", subcomponent)
 	}}
 }
 

internal/native/chan.go

@@ -28,7 +28,6 @@ func (n *Native) handleVideoFrameChan() {
 func (n *Native) handleVideoStateChan() {
 	for {
 		state := <-videoStateChan
-
 		n.onVideoStateChange(state)
 	}
 }
@@ -37,7 +36,6 @@ func (n *Native) handleLogChan() {
 	for {
 		entry := <-logChan
 		l := GetNativeLogger().
-			With().
 			Str("file", entry.File).
 			Str("func", entry.FuncName).
 			Int("line", entry.Line)

internal/native/display.go

@@ -100,7 +100,6 @@ func (n *Native) DisplaySetRotation(rotation uint16) (bool, error) {
 // UpdateLabelIfChanged updates the label if the text has changed
 func (n *Native) UpdateLabelIfChanged(objName string, newText string) {
 	logger := GetDisplayLogger().
-		With().
 		Str("obj", objName).
 		Str("text", newText)
 
@@ -139,7 +138,6 @@ func (n *Native) SwitchToScreenIf(screenName string, shouldSwitch []string) {
 	}
 
 	logger := GetDisplayLogger().
-		With().
 		Str("from", currentScreen).
 		Str("to", screenName).
 		Strs("from_screens", shouldSwitch)

internal/native/grpc_client.go

@@ -48,7 +48,7 @@ type grpcClientOptions struct {
 }
 
 func (client *GRPCClient) getLogger() *logging.Context {
-	return getClientLogger().With().Str("target", client.conn.Target()).Bool("closed", client.closed)
+	return getClientLogger().Str("target", client.conn.Target()).Bool("closed", client.closed)
 }
 
 // NewGRPCClient creates a new gRPC client connected to the native service
@@ -105,7 +105,7 @@ func (c *GRPCClient) handleEventStream(stream pb.NativeService_StreamEventsClien
 	}()
 
 	for {
-		logger := c.getLogger().With().Interface("stream", stream)
+		logger := c.getLogger().Interface("stream", stream)
 		if stream == nil {
 			logger.Error().Msg("event stream is nil")
 			break
@@ -124,10 +124,7 @@ func (c *GRPCClient) handleEventStream(stream pb.NativeService_StreamEventsClien
 
 		// enrich the logger with the event type and data, if debug mode is enabled
 		if logger.IsDebugLevel() {
-			logger = logger.
-				With().
-				Str("type", event.Type).
-				Interface("data", event.Data)
+			logger = logger.Str("type", event.Type).Interface("data", event.Data)
 		}
 		logger.Trace().Msg("received event")
 
@@ -195,7 +192,7 @@ func (c *GRPCClient) WaitReady() error {
 	prevState := connectivity.Idle
 	for {
 		state := c.conn.GetState()
-		logger := c.getLogger().With().Str("state", state.String()).Int("prev_state", int(prevState))
+		logger := c.getLogger().Str("state", state.String()).Int("prev_state", int(prevState))
 
 		prevState = state
 		if state == connectivity.Idle || state == connectivity.Ready {
@@ -221,7 +218,7 @@ func (c *GRPCClient) WaitReady() error {
 }
 
 func (c *GRPCClient) handleEvent(event *pb.Event) {
-	logger := c.getLogger().With().Str("event_type", event.Type)
+	logger := c.getLogger().Str("event_type", event.Type)
 
 	switch event.Type {
 	case "video_state_change":

internal/native/grpc_server.go

@@ -84,7 +84,7 @@ func NewGRPCServer(n *Native, socketPath string) *grpcServer {
 }
 
 func (s *grpcServer) getLogger() *logging.Context {
-	return getServerLogger().With().Str("socketPath", s.socketPath)
+	return getServerLogger().Str("socketPath", s.socketPath)
 }
 
 // broadcastEvent sends an event to all connected clients