8000 chore: tailnet debug logging by spikecurtis · Pull Request #7260 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

chore: tailnet debug logging #7260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 27, 2023
Merged

chore: tailnet debug logging #7260

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
09dc241
Enable discovery (disco) debug
spikecurtis Apr 24, 2023
504c0cf
Better debug on reconnectingPTY
spikecurtis Apr 24, 2023
b279f1a
Agent logging in appstest
spikecurtis Apr 25, 2023
62f3155
More reconnectingPTY logging
spikecurtis Apr 25, 2023
1b9f328
Add logging to coordinator
spikecurtis Apr 25, 2023
ce1bf3e
Update agent/agent.go
spikecurtis Apr 27, 2023
c85417c
Update agent/agent.go
spikecurtis Apr 27, 2023
8d40b79
Update agent/agent.go
spikecurtis Apr 27, 2023
1e2ba57
Update agent/agent.go
spikecurtis Apr 27, 2023
96d43cb
Clarify logs; remove unrelated changes
spikecurtis Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Agent logging in appstest 
Signed-off-by: Spike Curtis <spike@coder.com>
  • Loading branch information
@spikecurtis
spikecurtis committed Apr 26, 2023
commit b279f1a8aef8934d99ab4de743823bad1a3f8c76
3 changes: 3 additions & 0 deletions agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
}

Expand Down
3 changes: 2 additions & 1 deletion coderd/workspaceapps/apptest/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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()
Expand Down
0