Agent logging in appstest

spikecurtis · spikecurtis · commit b279f1a8aef8 · 2023-04-26T11:19:33.000Z
Signed-off-by: Spike Curtis &lt;spike@coder.com&gt;
diff --git a/agent/agent.go b/agent/agent.go
@@ -648,6 +648,7 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_
 				}
 				break
 			}
+			logger.Debug(ctx, "accepted pty conn", slog.F("remote", conn.RemoteAddr().String()))
 			wg.Add(1)
 			closed := make(chan struct{})
 			go func() {
@@ -676,6 +677,7 @@ func (a *agent) createTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) (_
 				var msg codersdk.WorkspaceAgentReconnectingPTYInit
 				err = json.Unmarshal(data, &msg)
 				if err != nil {
+					logger.Warn(ctx, "failed to unmarshal init", slog.F("raw", data))
 					return
 				}
 				_ = a.handleReconnectingPTY(ctx, logger, msg, conn)
@@ -787,6 +789,7 @@ func (a *agent) runCoordinator(ctx context.Context, network *tailnet.Conn) error
 }
 
 func (a *agent) runStartupScript(ctx context.Context, script string) error {
+	a.logger.Debug(ctx, "running agent startup script")
 	return a.runScript(ctx, "startup", script)
 }
 
diff --git a/coderd/workspaceapps/apptest/setup.go b/coderd/workspaceapps/apptest/setup.go
@@ -16,6 +16,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/agent"
 	"github.com/coder/coder/coderd/coderdtest"
@@ -364,7 +365,7 @@ func createWorkspaceWithApps(t *testing.T, client *codersdk.Client, orgID uuid.U
 	}
 	agentCloser := agent.New(agent.Options{
 		Client: agentClient,
-		Logger: slogtest.Make(t, nil).Named("agent"),
+		Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelDebug),
 	})
 	t.Cleanup(func() {
 		_ = agentCloser.Close()

Original file line number	Diff line number	Diff line change
`@@ -648,6 +648,7 @@ func (a agent) createTailnet(ctx context.Context, derpMap tailcfg.DERPMap) (_`
`648`	`648`	`}`
`649`	`649`	`break`
`650`	`650`	`}`
	`651`	`+ logger.Debug(ctx, "accepted pty conn", slog.F("remote", conn.RemoteAddr().String()))`
`651`	`652`	`wg.Add(1)`
`652`	`653`	`closed := make(chan struct{})`
`653`	`654`	`go func() {`
`@@ -676,6 +677,7 @@ func (a agent) createTailnet(ctx context.Context, derpMap tailcfg.DERPMap) (_`
`676`	`677`	`var msg codersdk.WorkspaceAgentReconnectingPTYInit`
`677`	`678`	`err = json.Unmarshal(data, &msg)`
`678`	`679`	`if err != nil {`
	`680`	`+ logger.Warn(ctx, "failed to unmarshal init", slog.F("raw", data))`
`679`	`681`	`return`
`680`	`682`	`}`
`681`	`683`	`_ = a.handleReconnectingPTY(ctx, logger, msg, conn)`
`@@ -787,6 +789,7 @@ func (a agent) runCoordinator(ctx context.Context, network tailnet.Conn) error`
`787`	`789`	`}`
`788`	`790`
`789`	`791`	`func (a *agent) runStartupScript(ctx context.Context, script string) error {`
	`792`	`+ a.logger.Debug(ctx, "running agent startup script")`
`790`	`793`	`return a.runScript(ctx, "startup", script)`
`791`	`794`	`}`
`792`	`795`