chore: add logger to WatchContainers

DanielleMaywood · DanielleMaywood · commit 3e50965a2174 · 2025-07-10T12:24:05.000Z
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -853,7 +853,8 @@ func (api *API) watchWorkspaceAgentContainers(rw http.ResponseWriter, r *http.Re
 	}
 	defer release()
 
-	containersCh, closer, err := agentConn.WatchContainers(ctx)
+	watcherLogger := api.Logger.Named("agent_container_watcher").With(slog.F("agent_id", workspaceAgent.ID))
+	containersCh, closer, err := agentConn.WatchContainers(ctx, watcherLogger)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Internal error watching agent's containers.",
diff --git a/codersdk/workspacesdk/agentconn.go b/codersdk/workspacesdk/agentconn.go
@@ -391,7 +391,7 @@ func (c *AgentConn) ListContainers(ctx context.Context) (codersdk.WorkspaceAgent
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
-func (c *AgentConn) WatchContainers(ctx context.Context) (<-chan codersdk.WorkspaceAgentListContainersResponse, io.Closer, error) {
+func (c *AgentConn) WatchContainers(ctx context.Context, logger slog.Logger) (<-chan codersdk.WorkspaceAgentListContainersResponse, io.Closer, error) {
 	ctx, span := tracing.StartSpan(ctx)
 	defer span.End()
 
@@ -411,7 +411,7 @@ func (c *AgentConn) WatchContainers(ctx context.Context) (<-chan codersdk.Worksp
 		defer res.Body.Close()
 	}
 
-	d := wsjson.NewDecoder[codersdk.WorkspaceAgentListContainersResponse](conn, websocket.MessageText, slog.Logger{})
+	d := wsjson.NewDecoder[codersdk.WorkspaceAgentListContainersResponse](conn, websocket.MessageText, logger)
 	return d.Chan(), d, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,8 @@ func (api API) watchWorkspaceAgentContainers(rw http.ResponseWriter, r http.Re`
`853`	`853`	`}`
`854`	`854`	`defer release()`
`855`	`855`
`856`		`- containersCh, closer, err := agentConn.WatchContainers(ctx)`
	`856`	`+ watcherLogger := api.Logger.Named("agent_container_watcher").With(slog.F("agent_id", workspaceAgent.ID))`
	`857`	`+ containersCh, closer, err := agentConn.WatchContainers(ctx, watcherLogger)`
`857`	`858`	`if err != nil {`
`858`	`859`	`httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{`
`859`	`860`	`Message: "Internal error watching agent's containers.",`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ func (c *AgentConn) ListContainers(ctx context.Context) (codersdk.WorkspaceAgent`
`391`	`391`	`return resp, json.NewDecoder(res.Body).Decode(&resp)`
`392`	`392`	`}`
`393`	`393`
`394`		`-func (c *AgentConn) WatchContainers(ctx context.Context) (<-chan codersdk.WorkspaceAgentListContainersResponse, io.Closer, error) {`
	`394`	`+func (c *AgentConn) WatchContainers(ctx context.Context, logger slog.Logger) (<-chan codersdk.WorkspaceAgentListContainersResponse, io.Closer, error) {`
`395`	`395`	`ctx, span := tracing.StartSpan(ctx)`
`396`	`396`	`defer span.End()`
`397`	`397`
`@@ -411,7 +411,7 @@ func (c *AgentConn) WatchContainers(ctx context.Context) (<-chan codersdk.Worksp`
`411`	`411`	`defer res.Body.Close()`
`412`	`412`	`}`
`413`	`413`
`414`		`- d := wsjson.NewDecoder[codersdk.WorkspaceAgentListContainersResponse](conn, websocket.MessageText, slog.Logger{})`
	`414`	`+ d := wsjson.NewDecoder[codersdk.WorkspaceAgentListContainersResponse](conn, websocket.MessageText, logger)`
`415`	`415`	`return d.Chan(), d, nil`
`416`	`416`	`}`
`417`	`417`