Mar 23, 2023 · Feb 23, 2023 · Feb 23, 2023 · Feb 23, 2023 · Feb 23, 2023 · Mar 10, 2023
diff --git a/agent/agent.go b/agent/agent.go
 "cdr.dev/slog"
 "github.com/coder/coder/agent/usershell"
 "github.com/coder/coder/buildinfo"
 "github.com/coder/coder/coderd/database"
 "github.com/coder/coder/coderd/gitauth"
 "github.com/coder/coder/codersdk"
 "github.com/coder/coder/codersdk/agentsdk"
 }()

 startupLogsReader, startupLogsWriter := io.Pipe()
 defer func() {
 _ = startupLogsReader.Close()
 _ = startupLogsWriter.Close()
 }()
 writer := io.MultiWriter(startupLogsWriter, fileWriter)

 queuedLogs := make([]agentsdk.StartupLog, 0)
 var flushLogsTimer *time.Timer
 var logMutex sync.Mutex
 flushQueuedLogs := func() {
 var logsSending bool
 sendLogs := func() {
 logMutex.Lock()
 if flushLogsTimer != nil {
 flushLogsTimer.Stop()
 if logsSending {
 logMutex.Unlock()
 return
 }
 logsSending = true
 toSend := make([]agentsdk.StartupLog, len(queuedLogs))
 copy(toSend, queuedLogs)
 logMutex.Unlock()
 a.logger.Error(ctx, "upload startup logs", slog.Error(err))
 }
 if ctx.Err() != nil {
 logMutex.Lock()
 logsSending = false
 logMutex.Unlock()
 return
 }
 logMutex.Lock()
 logsSending = false
 queuedLogs = queuedLogs[len(toSend):]
 logMutex.Unlock()
 }
 return
 }
 if len(queuedLogs) > 100 {
 goflushQueuedLogs()
 gosendLogs()
 return
 }
 flushLogsTimer = time.AfterFunc(100*time.Millisecond, func() {
 sendLogs()
 })
 }
 gofunc() {
 err = a.trackConnGoroutine(func() {
 scanner := bufio.NewScanner(startupLogsReader)
 for scanner.Scan() {

 queueLog(agentsdk.StartupLog{
 CreatedAt: database.Now(),
 Output:    scanner.Text(),
 })
 }
 }()
 defer func() {

 // err := a.client.AppendStartupLogs(ctx, agentsdk.InsertOrUpdateStartupLogsRequest{
 // Output: string(saver.Bytes()),
 // })
 // if err != nil {
 // a.logger.Error(ctx, "upload startup logs", slog.Error(err))
 // }
 }()
 })
 if err != nil {
 return xerrors.Errorf("track conn goroutine: %w", err)
 }

 cmd, err := a.createCommand(ctx, script, nil)
 if err != nil {
diff --git a/agent/agent_test.go b/agent/agent_test.go
 if runtime.GOOS == "windows" {
 t.Skip("This test doesn't work on Windows for some reason...")
 }
 content := "output\n"
 output := "something"
 command := "sh -c 'echo " + output + "'"
 if runtime.GOOS == "windows" {
 command = "cmd.exe /c echo " + output
 }
 //nolint:dogsled
 _, client, _, _, _ := setupAgent(t, agentsdk.Metadata{
 StartupScript:"echo " + content,
 StartupScript:command,
 }, 0)
 assert.Eventually(t, func() bool {
 got := client.getLifecycleStates()
 return len(got) > 0 && got[len(got)-1] == codersdk.WorkspaceAgentLifecycleReady
 }, testutil.WaitShort, testutil.IntervalMedium)

 require.Len(t, client.getStartupLogs(), 1)
 require.Equal(t, output, client.getStartupLogs()[0].Output)
 }

 func TestAgent_Lifecycle(t *testing.T) {
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
 // @Accept json
 // @Produce json
 // @Tags Agents
 // @Param request body agentsdk.InsertOrUpdateStartupLogsRequest true "Startup logs"
 // @Param request body[]agentsdk.StartupLog true "Startup logs"
 // @Success 200
 // @Router /workspaceagents/me/startup-logs [patch]
 // @x-apidocgen {"skip": true}
diff --git a/coderd/wsconncache/wsconncache_test.go b/coderd/wsconncache/wsconncache_test.go
 func (*client) PostStartup(_ context.Context, _ agentsdk.PostStartupRequest) error {
 return nil
 }

 func (*client) AppendStartupLogs(_ context.Context, _ []agentsdk.StartupLog) error {
 return nil
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,6 +41,7 @@ import (
		"cdr.dev/slog"
		"github.com/coder/coder/agent/usershell"
		"github.com/coder/coder/buildinfo"
		"github.com/coder/coder/coderd/database"
		"github.com/coder/coder/coderd/gitauth"
		"github.com/coder/coder/codersdk"
		"github.com/coder/coder/codersdk/agentsdk"
Expand DownExpand Up		@@ -662,16 +663,23 @@ func (a *agent) runScript(ctx context.Context, lifecycle, script string) error {
		}()

		startupLogsReader, startupLogsWriter := io.Pipe()
		defer func() {
		_ = startupLogsReader.Close()
		_ = startupLogsWriter.Close()
		}()
		writer := io.MultiWriter(startupLogsWriter, fileWriter)

		queuedLogs := make([]agentsdk.StartupLog, 0)
		var flushLogsTimer *time.Timer
		var logMutex sync.Mutex
		flushQueuedLogs := func() {
		var logsSending bool
		sendLogs := func() {
		logMutex.Lock()
		if flushLogsTimer != nil {
		flushLogsTimer.Stop()
		if logsSending {
		logMutex.Unlock()
		return
		}
		logsSending = true
		toSend := make([]agentsdk.StartupLog, len(queuedLogs))
		copy(toSend, queuedLogs)
		logMutex.Unlock()
Expand All		@@ -683,9 +691,13 @@ func (a *agent) runScript(ctx context.Context, lifecycle, script string) error {
		a.logger.Error(ctx, "upload startup logs", slog.Error(err))
		}
		if ctx.Err() != nil {
		logMutex.Lock()
		logsSending = false
		logMutex.Unlock()
		return
		}
		logMutex.Lock()
		logsSending = false
		queuedLogs = queuedLogs[len(toSend):]
		logMutex.Unlock()
		}
Expand All		@@ -698,25 +710,25 @@ func (a *agent) runScript(ctx context.Context, lifecycle, script string) error {
		return
		}
		if len(queuedLogs) > 100 {
		goflushQueuedLogs()
		gosendLogs()
		return
		}
		flushLogsTimer = time.AfterFunc(100*time.Millisecond, func() {
		sendLogs()
		})
		}
		gofunc() {
		err = a.trackConnGoroutine(func() {
		scanner := bufio.NewScanner(startupLogsReader)
kylecarbs marked this conversation as resolved. Show resolvedHide resolved
		for scanner.Scan() {

		queueLog(agentsdk.StartupLog{
		CreatedAt: database.Now(),
		Output: scanner.Text(),
		})
		}
		}()
		defer func() {

		// err := a.client.AppendStartupLogs(ctx, agentsdk.InsertOrUpdateStartupLogsRequest{
		// Output: string(saver.Bytes()),
		// })
		// if err != nil {
		// a.logger.Error(ctx, "upload startup logs", slog.Error(err))
		// }
		}()
		})
		if err != nil {
		return xerrors.Errorf("track conn goroutine: %w", err)
		}

		cmd, err := a.createCommand(ctx, script, nil)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -740,17 +740,22 @@ func TestAgent_StartupScript(t *testing.T) {
		if runtime.GOOS == "windows" {
		t.Skip("This test doesn't work on Windows for some reason...")
		}
		content := "output\n"
		output := "something"
		command := "sh -c 'echo " + output + "'"
		if runtime.GOOS == "windows" {
		command = "cmd.exe /c echo " + output
		}
		//nolint:dogsled
		_, client, _, _, _ := setupAgent(t, agentsdk.Metadata{
		StartupScript:"echo " + content,
		StartupScript:command,
		}, 0)
		assert.Eventually(t, func() bool {
		got := client.getLifecycleStates()
		return len(got) > 0 && got[len(got)-1] == codersdk.WorkspaceAgentLifecycleReady
		}, testutil.WaitShort, testutil.IntervalMedium)

		require.Len(t, client.getStartupLogs(), 1)
		require.Equal(t, output, client.getStartupLogs()[0].Output)
		}

		func TestAgent_Lifecycle(t *testing.T) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -226,7 +226,7 @@ func (api API) postWorkspaceAgentStartup(rw http.ResponseWriter, r http.Reques
		// @Accept json
		// @Produce json
		// @Tags Agents
		// @Param request body agentsdk.InsertOrUpdateStartupLogsRequest true "Startup logs"
		// @Param request body[]agentsdk.StartupLog true "Startup logs"
		// @Success 200
		// @Router /workspaceagents/me/startup-logs [patch]
		// @x-apidocgen {"skip": true}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -249,3 +249,7 @@ func (*client) PostAppHealth(_ context.Context, _ agentsdk.PostAppHealthsRequest
		func (*client) PostStartup(_ context.Context, _ agentsdk.PostStartupRequest) error {
		return nil
		}

		func (*client) AppendStartupLogs(_ context.Context, _ []agentsdk.StartupLog) error {
		return nil
		}