review

ethanndickson · ethanndickson · commit fa41a8a47819 · 2024-10-29T03:14:13.000Z
diff --git a/coderd/agentapi/logs.go b/coderd/agentapi/logs.go
@@ -144,7 +144,7 @@ func (a *LogsAPI) BatchCreateLogs(ctx context.Context, req *agentproto.BatchCrea
 	if workspaceAgent.LogsLength == 0 && a.PublishWorkspaceUpdateFn != nil {
 		// If these are the first logs being appended, we publish a UI update
 		// to notify the UI that logs are now available.
-		err = a.PublishWorkspaceUpdateFn(ctx, &workspaceAgent, wspubsub.WorkspaceEventKindAgentLogsUpdate)
+		err = a.PublishWorkspaceUpdateFn(ctx, &workspaceAgent, wspubsub.WorkspaceEventKindAgentFirstLogs)
 		if err != nil {
 			return nil, xerrors.Errorf("publish workspace update: %w", err)
 		}
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -253,7 +253,7 @@ func (api *API) patchWorkspaceAgentLogs(rw http.ResponseWriter, r *http.Request)
 		}
 
 		api.publishWorkspaceUpdate(ctx, workspace.Workspace.OwnerID, wspubsub.WorkspaceEvent{
-			Kind:        wspubsub.WorkspaceEventKindAgentLogsUpdate,
+			Kind:        wspubsub.WorkspaceEventKindAgentLogsOverflow,
 			WorkspaceID: workspace.Workspace.ID,
 			AgentID:     &workspaceAgent.ID,
 		})
@@ -285,7 +285,7 @@ func (api *API) patchWorkspaceAgentLogs(rw http.ResponseWriter, r *http.Request)
 		}
 
 		api.publishWorkspaceUpdate(ctx, workspace.Workspace.OwnerID, wspubsub.WorkspaceEvent{
-			Kind:        wspubsub.WorkspaceEventKindAgentLogsUpdate,
+			Kind:        wspubsub.WorkspaceEventKindAgentFirstLogs,
 			WorkspaceID: workspace.Workspace.ID,
 			AgentID:     &workspaceAgent.ID,
 		})
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -1698,9 +1698,7 @@ func (api *API) watchWorkspace(rw http.ResponseWriter, r *http.Request) {
 	defer cancelWorkspaceSubscribe()
 
 	// This is required to show whether the workspace is up-to-date.
-	cancelTemplateSubscribe, err := api.Pubsub.Subscribe(watchTemplateChannel(workspace.TemplateID), func(ctx context.Context, msg []byte) {
-		sendUpdate(ctx, nil)
-	})
+	cancelTemplateSubscribe, err := api.Pubsub.Subscribe(watchTemplateChannel(workspace.TemplateID), sendUpdate)
 	if err != nil {
 		_ = sendEvent(ctx, codersdk.ServerSentEvent{
 			Type: codersdk.ServerSentEventTypeError,
diff --git a/coderd/wspubsub/wspubsub.go b/coderd/wspubsub/wspubsub.go
@@ -49,8 +49,8 @@ const (
 	WorkspaceEventKindAppHealthUpdate WorkspaceEventKind = "app_health"
 
 	WorkspaceEventKindAgentLifecycleUpdate  WorkspaceEventKind = "agt_lifecycle_update"
-	WorkspaceEventKindAgentLogsUpdate       WorkspaceEventKind = "agt_logs_update"
 	WorkspaceEventKindAgentConnectionUpdate WorkspaceEventKind = "agt_connection_update"
+	WorkspaceEventKindAgentFirstLogs        WorkspaceEventKind = "agt_first_logs"
 	WorkspaceEventKindAgentLogsOverflow     WorkspaceEventKind = "agt_logs_overflow"
 	WorkspaceEventKindAgentTimeout          WorkspaceEventKind = "agt_timeout"
 )

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ func (a LogsAPI) BatchCreateLogs(ctx context.Context, req agentproto.BatchCrea`
`144`	`144`	`if workspaceAgent.LogsLength == 0 && a.PublishWorkspaceUpdateFn != nil {`
`145`	`145`	`// If these are the first logs being appended, we publish a UI update`
`146`	`146`	`// to notify the UI that logs are now available.`
`147`		`- err = a.PublishWorkspaceUpdateFn(ctx, &workspaceAgent, wspubsub.WorkspaceEventKindAgentLogsUpdate)`
	`147`	`+ err = a.PublishWorkspaceUpdateFn(ctx, &workspaceAgent, wspubsub.WorkspaceEventKindAgentFirstLogs)`
`148`	`148`	`if err != nil {`
`149`	`149`	`return nil, xerrors.Errorf("publish workspace update: %w", err)`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ const (`
`49`	`49`	`WorkspaceEventKindAppHealthUpdate WorkspaceEventKind = "app_health"`
`50`	`50`
`51`	`51`	`WorkspaceEventKindAgentLifecycleUpdate WorkspaceEventKind = "agt_lifecycle_update"`
`52`		`- WorkspaceEventKindAgentLogsUpdate WorkspaceEventKind = "agt_logs_update"`
`53`	`52`	`WorkspaceEventKindAgentConnectionUpdate WorkspaceEventKind = "agt_connection_update"`
	`53`	`+ WorkspaceEventKindAgentFirstLogs WorkspaceEventKind = "agt_first_logs"`
`54`	`54`	`WorkspaceEventKindAgentLogsOverflow WorkspaceEventKind = "agt_logs_overflow"`
`55`	`55`	`WorkspaceEventKindAgentTimeout WorkspaceEventKind = "agt_timeout"`
`56`	`56`	`)`