Skip to content

fix(metrics): exclude active create guards #80

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
rldyourmnd merged 1 commit into from
Aug 22, 2026
Merged

fix(metrics): exclude active create guards #80

Show file tree
Hide file tree
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: 6 additions & 2 deletions internal/providerretry/recovery_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,16 @@ func Inspect(path string, now time.Time) (Snapshot, error) {
class = "unknown"
}
result.ByErrorClass[class]++
deferred := retry.NextAllowedAt.After(now) || retry.TerminalUntil.After(now)
// A concrete create writes a short-lived duplicate-suppression guard
// before provider execution. It has no error class and may remain while
// the successful create is being consolidated; it is not a retry failure.
deferred := strings.TrimSpace(retry.LastErrorClass) != "" &&
(retry.NextAllowedAt.After(now) || retry.TerminalUntil.After(now))
if deferred {
result.DeferredRecords++
result.DeferredByErrorClass[class]++
}
if retry.NextAllowedAt.After(now) {
if deferred && retry.NextAllowedAt.After(now) {
delay := int64(retry.NextAllowedAt.Sub(now) / time.Second)
if result.NextRetryDelaySeconds == 0 || delay < result.NextRetryDelaySeconds {
result.NextRetryDelaySeconds = delay
Expand Down
8 changes: 6 additions & 2 deletions internal/providerretry/recovery_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ func TestInspectCountsOnlyTerminalFailureDomains(t *testing.T) {
JobID: "scale-set:entity-one:4", Attempts: 2, LastErrorClass: "capacity",
UpdatedAt: now.Add(-time.Minute), NextAllowedAt: now.Add(30 * time.Second),
},
"scale-set:entity-one:4:instance:create-in-progress": {
JobID: "scale-set:entity-one:4:instance:create-in-progress", Attempts: 1,
UpdatedAt: now, NextAllowedAt: now.Add(2 * time.Minute),
},
}}
content, _ := json.Marshal(state)
if err := os.WriteFile(journalPath, content, 0o600); err != nil {
Expand All @@ -122,10 +126,10 @@ func TestInspectCountsOnlyTerminalFailureDomains(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if snapshot.Generation != 42 || snapshot.Records != 3 || snapshot.TerminalCircuits != 1 ||
if snapshot.Generation != 42 || snapshot.Records != 4 || snapshot.TerminalCircuits != 1 ||
snapshot.DeferredRecords != 2 || snapshot.DeferredByErrorClass["provider"] != 1 || snapshot.DeferredByErrorClass["capacity"] != 1 ||
snapshot.OldestTerminalAgeSeconds != 600 || snapshot.NextRetryDelaySeconds != 30 ||
snapshot.ByErrorClass["provider"] != 2 || snapshot.ByErrorClass["capacity"] != 1 {
snapshot.ByErrorClass["provider"] != 2 || snapshot.ByErrorClass["capacity"] != 1 || snapshot.ByErrorClass["unknown"] != 1 {
t.Fatalf("unexpected retry snapshot: %#v", snapshot)
}
}