Skip to content

fix(orchestrator): remove 100-char truncation from envd error response bodies #3481

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

Open
AdaAibaby wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(orchestrator): remove 100-char truncation from envd error response bodies #3481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions packages/orchestrator/pkg/sandbox/envd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func (s *Sandbox) callEnvdCollapse(ctx context.Context, timeout time.Duration) (
if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(resp.Body)

return envd.CollapseResult{}, fmt.Errorf("collapse returned %d: %s", resp.StatusCode, utils.Truncate(string(body), 100))
return envd.CollapseResult{}, fmt.Errorf("collapse returned %d: %s", resp.StatusCode, string(body))
}

var result envd.CollapseResult
Expand All @@ -205,7 +205,7 @@ func (s *Sandbox) postEnvd(ctx context.Context, timeout time.Duration, path stri
if resp.StatusCode != http.StatusNoContent {
body, _ := io.ReadAll(resp.Body)

return fmt.Errorf("%s returned %d: %s", path, resp.StatusCode, utils.Truncate(string(body), 100))
return fmt.Errorf("%s returned %d: %s", path, resp.StatusCode, string(body))
}

return nil
Expand Down Expand Up @@ -284,7 +284,7 @@ func (s *Sandbox) CallEnvdUpgrade(ctx context.Context, localSrcPath, guestBinPat
if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNoContent {
body, _ := io.ReadAll(resp.Body)

return false, fmt.Errorf("upgrade returned %d: %s", resp.StatusCode, utils.Truncate(string(body), 100))
return false, fmt.Errorf("upgrade returned %d: %s", resp.StatusCode, string(body))
}

// envd answered instead of exec'ing — no swap happened, exec not confirmed.
Expand Down Expand Up @@ -493,7 +493,7 @@ func (s *Sandbox) initEnvd(ctx context.Context, startType StartType, recordMetri
logger.WithSandboxID(s.Runtime.SandboxID),
logger.WithEnvdVersion(s.Config.Envd.Version),
zap.Int("status_code", response.StatusCode),
zap.String("response_body", utils.Truncate(string(body), 100)),
zap.String("response_body", string(body)),
)

return fmt.Errorf("unexpected status code: %d", response.StatusCode)
Expand Down