Skip to content

feat(agent/agentcontainers): retry with longer name on failure #18513

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
merged 15 commits into from
Jun 24, 2025
Merged

feat(agent/agentcontainers): retry with longer name on failure #18513

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
82ed807
feat(agent/agentcontainers): retry with longer name on failure
DanielleMaywood Jun 23, 2025
7cf8181
chore: listen to feedback
DanielleMaywood Jun 23, 2025
5873a47
fix: remove `arch: "amd64"`
DanielleMaywood Jun 23, 2025
fb5079c
chore: maybe use runtime.GOARCH?
DanielleMaywood Jun 23, 2025
b6b9cea
chore: skip test on windows
DanielleMaywood Jun 23, 2025
057360a
chore: fix logic and reduce flakiness of test
DanielleMaywood Jun 24, 2025
df43868
chore: `map[string]struct{}` to `map[string]bool`
DanielleMaywood Jun 24, 2025
c25f651
chore: delete from another place
DanielleMaywood Jun 24, 2025
4c79563
chore: mark as using folder name when not falling back to friendly name
DanielleMaywood Jun 24, 2025
15dafc7
chore: fallback if we're using a name already defined in terraform
DanielleMaywood Jun 24, 2025
08969ce
chore: use map of known names to help create an agent name
DanielleMaywood Jun 24, 2025
14bbb1d
chore: testing
DanielleMaywood Jun 24, 2025
b8fe8c5
Merge branch 'main' into dm-devcontainer-retry
DanielleMaywood Jun 24, 2025
257c62d
chore: appease linter
DanielleMaywood Jun 24, 2025
627fe9f
fix: maybe fix race condition?
DanielleMaywood Jun 24, 2025
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
Prev Previous commit
Next Next commit
chore: map[string]struct{} to map[string]bool
  • Loading branch information
@DanielleMaywood
DanielleMaywood committed Jun 24, 2025
commit df43868fa97945af6c2097a42e22e59253b9eac2
10 changes: 5 additions & 5 deletions agent/agentcontainers/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ type API struct {
recreateSuccessTimes map[string]time.Time // By workspace folder.
recreateErrorTimes map[string]time.Time // By workspace folder.
injectedSubAgentProcs map[string]subAgentProcess // By workspace folder.
usingWorkspaceFolderName map[string]struct{} // By workspace folder.
usingWorkspaceFolderName map[string]bool // By workspace folder.
asyncWg sync.WaitGroup

devcontainerLogSourceIDs map[string]uuid.UUID // By workspace folder.
Expand Down Expand Up @@ -254,7 +254,7 @@ func NewAPI(logger slog.Logger, options ...Option) *API {
recreateErrorTimes: make(map[string]time.Time),
scriptLogger: func(uuid.UUID) ScriptLogger { return noopScriptLogger{} },
injectedSubAgentProcs: make(map[string]subAgentProcess),
usingWorkspaceFolderName: make(map[string]struct{}),
usingWorkspaceFolderName: make(map[string]bool),
}
// The ctx and logger must be set before applying options to avoid
// nil pointer dereference.
Expand Down Expand Up @@ -593,7 +593,7 @@ func (api *API) processUpdatedContainersLocked(ctx context.Context, updated code
// agent name based off of the folder name (i.e. no valid characters),
// we will instead fall back to using the container's friendly name.
dc.Name = safeAgentName(path.Base(filepath.ToSlash(dc.WorkspaceFolder)), dc.Container.FriendlyName)
api.usingWorkspaceFolderName[dc.WorkspaceFolder] = struct{}{}
api.usingWorkspaceFolderName[dc.WorkspaceFolder] = true
}
}

Expand Down Expand Up @@ -1216,7 +1216,7 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c
if provisioner.AgentNameRegex.Match([]byte(name)) {
subAgentConfig.Name = name
configOutdated = true
delete(api.usingWorkspaceFolderName, dc.WorkspaceFolder)
api.usingWorkspaceFolderName[dc.WorkspaceFolder] = false
} else {
logger.Warn(ctx, "invalid name in devcontainer customization, ignoring",
slog.F("name", name),
Expand Down Expand Up @@ -1329,7 +1329,7 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c
// If there has been a unique constraint violation but the user is *not*
// using an auto-generated name, then we should error. This is because
// we do not want to surprise the user with a name they did not ask for.
if _, usingFolderName := api.usingWorkspaceFolderName[dc.WorkspaceFolder]; !usingFolderName {
if usingFolderName, _ := api.usingWorkspaceFolderName[dc.WorkspaceFolder]; !usingFolderName {
return xerrors.Errorf("create subagent failed: %w", err)
}

Expand Down