Log JSON as strings not an array of bytes

Author: aledbf

components/image-builder-mk3/pkg/orchestrator/orchestrator.go

@@ -151,7 +151,7 @@ func (o *Orchestrator) ResolveBaseImage(ctx context.Context, req *protocol.Resol
 
 	reqs, _ := protojson.Marshal(req)
 	safeReqs, _ := log.RedactJSON(reqs)
-	log.WithField("req", safeReqs).Debug("ResolveBaseImage")
+	log.WithField("req", string(safeReqs)).Debug("ResolveBaseImage")
 
 	reqauth := o.AuthResolver.ResolveRequestAuth(req.Auth)
 
@@ -173,7 +173,7 @@ func (o *Orchestrator) ResolveWorkspaceImage(ctx context.Context, req *protocol.
 
 	reqs, _ := protojson.Marshal(req)
 	safeReqs, _ := log.RedactJSON(reqs)
-	log.WithField("req", safeReqs).Debug("ResolveWorkspaceImage")
+	log.WithField("req", string(safeReqs)).Debug("ResolveWorkspaceImage")
 
 	reqauth := o.AuthResolver.ResolveRequestAuth(req.Auth)
 	baseref, err := o.getBaseImageRef(ctx, req.Source, reqauth)

components/ws-manager/pkg/manager/manager.go

@@ -1369,12 +1369,12 @@ 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", safeStatus).Error("workspace failed")
+		clog.WithField("status", string(safeStatus)).Error("workspace failed")
 	}
 	if status.Phase == 0 {
 		status, _ := protojson.Marshal(status)
 		safeStatus, _ := log.RedactJSON(status)
-		clog.WithField("status", safeStatus).Error("workspace in UNKNOWN phase")
+		clog.WithField("status", string(safeStatus)).Error("workspace in UNKNOWN phase")
 	}
 }