Update internal/usage/tracking.go

Co-authored-by: Copilot <[email protected]>

Author: n3rdc4ptn

internal/usage/tracking.go

@@ -180,7 +180,24 @@ func (u *UsageTracker) DeletionEvent(ctx context.Context, project string, worksp
 	mcpUsage.Spec.MCPDeletedAt = metav1.NewTime(time.Now().UTC())
 	err = u.client.Update(ctx, &mcpUsage)
 	if err != nil {
-		return fmt.Errorf("error when setting deletion timestamp on MCPUsage element: %w", err)
+	err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		// Re-fetch the latest version to avoid update conflicts
+		err := u.client.Get(ctx, objectKey, &mcpUsage)
+		if err != nil {
+			return fmt.Errorf("error getting MCPUsage resource during retry: %w", err)
+		}
+		mcpUsage.Spec.MCPDeletedAt = metav1.NewTime(time.Now().UTC())
+		err = u.client.Update(ctx, &mcpUsage)
+		if err != nil {
+			if k8serrors.IsConflict(err) {
+				return err // trigger retry
+			}
+			return fmt.Errorf("error when setting deletion timestamp on MCPUsage element: %w", err)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
 	}
 
 	return nil