Improve agent coordinator logging

kylecarbs · kylecarbs · commit bcb97ac7087b · 2022-10-17T01:30:29.000Z
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -378,6 +378,7 @@ func (api *API) dialWorkspaceAgentTailnet(r *http.Request, agentID uuid.UUID) (*
 	go func() {
 		err := (*api.TailnetCoordinator.Load()).ServeClient(serverConn, uuid.New(), agentID)
 		if err != nil {
+			api.Logger.Warn(r.Context(), "tailnet coordinator client error", slog.Error(err))
 			_ = conn.Close()
 		}
 	}()
@@ -516,6 +517,7 @@ func (api *API) workspaceAgentCoordinate(rw http.ResponseWriter, r *http.Request
 		defer close(closeChan)
 		err := (*api.TailnetCoordinator.Load()).ServeAgent(wsNetConn, workspaceAgent.ID)
 		if err != nil {
+			api.Logger.Warn(ctx, "tailnet coordinator agent error", slog.Error(err))
 			_ = conn.Close(websocket.StatusInternalError, err.Error())
 			return
 		}
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -328,6 +328,8 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 		delete(c.peerMap, peer.ID)
 	}
 	for _, node := range nodes {
+		c.logger.Debug(context.Background(), "adding node", slog.F("node", node))
+
 		peerStatus, ok := status.Peer[node.Key]
 		peerNode := &tailcfg.Node{
 			ID:         node.ID,
@@ -351,7 +353,6 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 		if c.blockEndpoints {
 			peerNode.Endpoints = nil
 		}
-		c.logger.Debug(context.Background(), "adding node", slog.F("node", peerNode))
 		c.peerMap[node.ID] = peerNode
 	}
 	c.netMap.Peers = make([]*tailcfg.Node, 0, len(c.peerMap))

Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,8 @@ func (c Conn) UpdateNodes(nodes []Node) error {`
`328`	`328`	`delete(c.peerMap, peer.ID)`
`329`	`329`	`}`
`330`	`330`	`for _, node := range nodes {`
	`331`	`+ c.logger.Debug(context.Background(), "adding node", slog.F("node", node))`
	`332`	`+`
`331`	`333`	`peerStatus, ok := status.Peer[node.Key]`
`332`	`334`	`peerNode := &tailcfg.Node{`
`333`	`335`	`ID: node.ID,`
`@@ -351,7 +353,6 @@ func (c Conn) UpdateNodes(nodes []Node) error {`
`351`	`353`	`if c.blockEndpoints {`
`352`	`354`	`peerNode.Endpoints = nil`
`353`	`355`	`}`
`354`		`- c.logger.Debug(context.Background(), "adding node", slog.F("node", peerNode))`
`355`	`356`	`c.peerMap[node.ID] = peerNode`
`356`	`357`	`}`
`357`	`358`	`c.netMap.Peers = make([]*tailcfg.Node, 0, len(c.peerMap))`