Skip to content

Log JSON as an object instead of a string #14905

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
roboquat merged 2 commits into from
Nov 24, 2022
Merged

Log JSON as an object instead of a string #14905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86edf51
ws-manager: log JSON as an object instead of a string
jenting Nov 24, 2022
8485ccb
image-builder-mk3: log JSON as an object instead of a string
jenting Nov 24, 2022
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
8 changes: 6 additions & 2 deletions components/image-builder-mk3/pkg/orchestrator/orchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,9 @@ func (o *Orchestrator) ResolveBaseImage(ctx context.Context, req *protocol.Resol

reqs, _ := protojson.Marshal(req)
safeReqs, _ := log.RedactJSON(reqs)
log.WithField("req", string(safeReqs)).Debug("ResolveBaseImage")
safeReqsLog := make(map[string]interface{})
_ = json.Unmarshal(safeReqs, &safeReqsLog)
log.WithFields(safeReqsLog).Debug("ResolveBaseImage")

reqauth := o.AuthResolver.ResolveRequestAuth(req.Auth)

Expand All @@ -173,7 +175,9 @@ func (o *Orchestrator) ResolveWorkspaceImage(ctx context.Context, req *protocol.

reqs, _ := protojson.Marshal(req)
safeReqs, _ := log.RedactJSON(reqs)
log.WithField("req", string(safeReqs)).Debug("ResolveWorkspaceImage")
safeReqsLog := make(map[string]interface{})
_ = json.Unmarshal(safeReqs, &safeReqsLog)
log.WithFields(safeReqsLog).Debug("ResolveWorkspaceImage")

reqauth := o.AuthResolver.ResolveRequestAuth(req.Auth)
baseref, err := o.getBaseImageRef(ctx, req.Source, reqauth)
Expand Down
12 changes: 9 additions & 3 deletions components/ws-manager/pkg/manager/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,9 @@ func (m *Manager) StartWorkspace(ctx context.Context, req *api.StartWorkspaceReq
clog.Info("StartWorkspace")
reqs, _ := protojson.Marshal(req)
safeReqs, _ := log.RedactJSON(reqs)
clog.WithField("req", string(safeReqs)).Debug("StartWorkspace request received")
safeReqsLog := make(map[string]interface{})
_ = json.Unmarshal(safeReqs, &safeReqsLog)
clog.WithFields(safeReqsLog).Debug("StartWorkspace request received")

// Make sure the objects we're about to create do not exist already
switch req.Type {
Expand Down Expand Up @@ -1386,12 +1388,16 @@ func (m *Manager) onChange(ctx context.Context, status *api.WorkspaceStatus) {
if status.Conditions.Failed != "" {
status, _ := protojson.Marshal(status)
safeStatus, _ := log.RedactJSON(status)
clog.WithField("status", string(safeStatus)).Error("workspace failed")
safeStatusLog := make(map[string]interface{})
_ = json.Unmarshal(safeStatus, &safeStatusLog)
clog.WithFields(safeStatusLog).Error("workspace failed")
}
if status.Phase == 0 {
status, _ := protojson.Marshal(status)
safeStatus, _ := log.RedactJSON(status)
clog.WithField("status", string(safeStatus)).Error("workspace in UNKNOWN phase")
safeStatusLog := make(map[string]interface{})
_ = json.Unmarshal(safeStatus, &safeStatusLog)
clog.WithFields(safeStatusLog).Error("workspace in UNKNOWN phase")
}
}

Expand Down