Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfc1210a

Browse files
johnstcnstirby
authored andcommitted
fix(provisionerd/runner): do not log entire resources (#14538)
fix(coderd/workspaceagentsrpc): do not log entire agentfix(provisionerd/runner): do not log entire resources(cherry picked from commit5366f25)
1 parentc00fa21 commitfc1210a

File tree

2 files changed

+30
-5
lines changed

2 files changed

+30
-5
lines changed

‎coderd/workspaceagentsrpc.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,19 @@ func (api *API) workspaceAgentRPC(rw http.ResponseWriter, r *http.Request) {
116116
}
117117
defermux.Close()
118118

119-
logger.Debug(ctx,"accepting agent RPC connection",slog.F("agent",workspaceAgent))
119+
logger.Debug(ctx,"accepting agent RPC connection",
120+
slog.F("agent_id",workspaceAgent.ID),
121+
slog.F("agent_created_at",workspaceAgent.CreatedAt),
122+
slog.F("agent_updated_at",workspaceAgent.UpdatedAt),
123+
slog.F("agent_name",workspaceAgent.Name),
124+
slog.F("agent_first_connected_at",workspaceAgent.FirstConnectedAt.Time),
125+
slog.F("agent_last_connected_at",workspaceAgent.LastConnectedAt.Time),
126+
slog.F("agent_disconnected_at",workspaceAgent.DisconnectedAt.Time),
127+
slog.F("agent_version",workspaceAgent.Version),
128+
slog.F("agent_last_connected_replica_id",workspaceAgent.LastConnectedReplicaID),
129+
slog.F("agent_connection_timeout_seconds",workspaceAgent.ConnectionTimeoutSeconds),
130+
slog.F("agent_api_version",workspaceAgent.APIVersion),
131+
slog.F("agent_resource_id",workspaceAgent.ResourceID))
120132

121133
closeCtx,closeCtxCancel:=context.WithCancel(ctx)
122134
defercloseCtxCancel()

‎provisionerd/runner/runner.go

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ func (r *Runner) runTemplateImportProvisionWithRichParameters(
723723

724724
r.logger.Info(context.Background(),"parse dry-run provision successful",
725725
slog.F("resource_count",len(c.Resources)),
726-
slog.F("resources",c.Resources),
726+
slog.F("resources",resourceNames(c.Resources)),
727727
)
728728

729729
return&templateImportProvision{
@@ -853,7 +853,7 @@ func (r *Runner) buildWorkspace(ctx context.Context, stage string, req *sdkproto
853853
func (r*Runner)commitQuota(ctx context.Context,resources []*sdkproto.Resource)*proto.FailedJob {
854854
cost:=sumDailyCost(resources)
855855
r.logger.Debug(ctx,"committing quota",
856-
slog.F("resources",resources),
856+
slog.F("resources",resourceNames(resources)),
857857
slog.F("cost",cost),
858858
)
859859
ifcost==0 {
@@ -964,7 +964,7 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
964964

965965
r.logger.Info(context.Background(),"plan request successful",
966966
slog.F("resource_count",len(planComplete.Resources)),
967-
slog.F("resources",planComplete.Resources),
967+
slog.F("resources",resourceNames(planComplete.Resources)),
968968
)
969969
r.flushQueuedLogs(ctx)
970970
ifcommitQuota {
@@ -1015,7 +1015,7 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
10151015

10161016
r.logger.Info(context.Background(),"apply successful",
10171017
slog.F("resource_count",len(applyComplete.Resources)),
1018-
slog.F("resources",applyComplete.Resources),
1018+
slog.F("resources",resourceNames(applyComplete.Resources)),
10191019
slog.F("state_len",len(applyComplete.State)),
10201020
)
10211021
r.flushQueuedLogs(ctx)
@@ -1031,6 +1031,19 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
10311031
},nil
10321032
}
10331033

1034+
funcresourceNames(rs []*sdkproto.Resource) []string {
1035+
varsb strings.Builder
1036+
names:=make([]string,0,len(rs))
1037+
for_,r:=rangers {
1038+
_,_=sb.WriteString(r.Type)
1039+
_,_=sb.WriteString(".")
1040+
_,_=sb.WriteString(r.Name)
1041+
names=append(names,sb.String())
1042+
sb.Reset()
1043+
}
1044+
returnnames
1045+
}
1046+
10341047
func (r*Runner)failedWorkspaceBuildf(formatstring,args...interface{})*proto.FailedJob {
10351048
failedJob:=r.failedJobf(format,args...)
10361049
failedJob.Type=&proto.FailedJob_WorkspaceBuild_{}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp