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

Commit5366f25

Browse files
authored
fix(provisionerd/runner): do not log entire resources (#14538)
fix(coderd/workspaceagentsrpc): do not log entire agentfix(provisionerd/runner): do not log entire resources
1 parent8f85464 commit5366f25

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
@@ -724,7 +724,7 @@ func (r *Runner) runTemplateImportProvisionWithRichParameters(
724724

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

730730
return&templateImportProvision{
@@ -854,7 +854,7 @@ func (r *Runner) buildWorkspace(ctx context.Context, stage string, req *sdkproto
854854
func (r*Runner)commitQuota(ctx context.Context,resources []*sdkproto.Resource)*proto.FailedJob {
855855
cost:=sumDailyCost(resources)
856856
r.logger.Debug(ctx,"committing quota",
857-
slog.F("resources",resources),
857+
slog.F("resources",resourceNames(resources)),
858858
slog.F("cost",cost),
859859
)
860860
ifcost==0 {
@@ -965,7 +965,7 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
965965

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

10221022
r.logger.Info(context.Background(),"apply successful",
10231023
slog.F("resource_count",len(applyComplete.Resources)),
1024-
slog.F("resources",applyComplete.Resources),
1024+
slog.F("resources",resourceNames(applyComplete.Resources)),
10251025
slog.F("state_len",len(applyComplete.State)),
10261026
)
10271027
r.flushQueuedLogs(ctx)
@@ -1038,6 +1038,19 @@ func (r *Runner) runWorkspaceBuild(ctx context.Context) (*proto.CompletedJob, *p
10381038
},nil
10391039
}
10401040

1041+
funcresourceNames(rs []*sdkproto.Resource) []string {
1042+
varsb strings.Builder
1043+
names:=make([]string,0,len(rs))
1044+
for_,r:=rangers {
1045+
_,_=sb.WriteString(r.Type)
1046+
_,_=sb.WriteString(".")
1047+
_,_=sb.WriteString(r.Name)
1048+
names=append(names,sb.String())
1049+
sb.Reset()
1050+
}
1051+
returnnames
1052+
}
1053+
10411054
func (r*Runner)failedWorkspaceBuildf(formatstring,args...interface{})*proto.FailedJob {
10421055
failedJob:=r.failedJobf(format,args...)
10431056
failedJob.Type=&proto.FailedJob_WorkspaceBuild_{}

0 commit comments

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