PostgreSQL backup tool with Point-In-Time-Recovery and restore verification
TypeScript backupbackupsdatabasedatabase-backupdevopsdockergolangkubernetesmariadbmongodbmysqlpgpostgrespostgresqls3self-hostedsystem-administrationtoolsweb-ui
REFACTOR (go): Refactor go to follow modern syntax guidelines
Rostislav Dugin4bee78646afb
diff --git a/AGENTS.md b/AGENTS.mdindex 9d068e02..42599f69 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -20,6 +20,7 @@ This is NOT a strict set of rules, but a set of recommendations to help you writ- [Time handling](#time-handling)- [Logging](#logging)- [CRUD examples](#crud-examples)+ - [Modern Go](#modern-go)- [Frontend guidelines](#frontend-guidelines)- [React component structure](#react-component-structure)@@ -598,7 +599,7 @@ func GetOrderRepository() *repositories.OrderRepository {#### SetupDependencies() pattern-**All `SetupDependencies()` functions must use sync.Once to ensure idempotent execution.**+**All `SetupDependencies()` functions must use `sync.OnceFunc` to ensure idempotent execution.**This pattern allows `SetupDependencies()` to be safely called multiple times (especially in tests) while ensuring the actual setup logic executes only once.@@ -609,45 +610,28 @@ package featureimport ("sync"- "sync/atomic"- "databasus-backend/internal/util/logger"-)--var (- setupOnce sync.Once- isSetup atomic.Bool)-func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- // Initialize dependencies here- someService.SetDependency(otherService)- anotherService.AddListener(listener)-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ // Initialize dependencies here+ someService.SetDependency(otherService)+ anotherService.AddListener(listener)+})```**Why this pattern:**- **Tests can call multiple times**: Test setup often calls `SetupDependencies()` multiple times without issues- **Thread-safe**: Works correctly with concurrent calls (nanoseconds or seconds apart)-- **Idempotent**: Subsequent calls are safe, only log warning+- **Idempotent**: Subsequent calls are no-ops- **No panics**: Does not break tests or production code on multiple calls+- **Concise**: `sync.OnceFunc` (Go 1.21+) replaces the manual `sync.Once` + `atomic.Bool` + `Do()` boilerplate**Key Points:**-1. Check `isSetup.Load()` **before** calling `Do()` to detect previous executions-2. Set `isSetup.Store(true)` **inside** the `Do()` closure after setup completes-3. Log warning if already setup (helps identify unnecessary duplicate calls)-4. All setup logic must be inside the `Do()` closure+1. Use `sync.OnceFunc` instead of manual `sync.Once` + `atomic.Bool` pattern+2. All setup logic must be inside the `OnceFunc` closure+3. The returned function is safe to call concurrently and multiple times---@@ -671,33 +655,26 @@ import (type BackgroundService struct {// ... existing fields ...- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (s *BackgroundService) Run(ctx context.Context) {- wasAlreadyRun := s.hasRun.Load()-- s.runOnce.Do(func() {- s.hasRun.Store(true)-- // Existing infinite loop logic- ticker := time.NewTicker(1 * time.Minute)- defer ticker.Stop()-- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- s.doWork()- }- }- })-- if wasAlreadyRun {+ if s.hasRun.Swap(true) {panic(fmt.Sprintf("%T.Run() called multiple times", s))}++ // Existing infinite loop logic+ ticker := time.NewTicker(1 * time.Minute)+ defer ticker.Stop()++ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ s.doWork()+ }+ }}```@@ -718,11 +695,9 @@ func (s *BackgroundService) Run(ctx context.Context) {**Key Points:**-1. Check `hasRun.Load()` **before** calling `Do()` to detect previous executions-2. Set `hasRun.Store(true)` **inside** the `Do()` closure before starting work-3. **Always panic** if already run (never just log warning)-4. All run logic must be inside the `Do()` closure-5. This pattern is **thread-safe** for any timing (concurrent or sequential calls)+1. Use `atomic.Bool.Swap(true)` to atomically check-and-set in one call — no need for `sync.Once`+2. **Always panic** if already run (never just log warning)+3. This pattern is **thread-safe** for any timing (concurrent or sequential calls)---@@ -1409,6 +1384,141 @@ func extractMessages(logs []*AuditLog) []string {---+### Modern Go++Prefer modern Go stdlib idioms over manual equivalents. Use these patterns consistently.++#### `slices` package — avoid manual loops++```go+slices.Contains(items, x) // instead of manual loop+slices.Index(items, x) // returns index or -1+slices.IndexFunc(items, func(item T) bool { return item.ID == id })+slices.SortFunc(items, func(a, b T) int { return cmp.Compare(a.X, b.X) })+slices.Sort(items) // for ordered types+slices.Max(items) / slices.Min(items) // instead of manual loop+slices.Reverse(items) // in-place+slices.Compact(items) // remove consecutive duplicates+slices.Clone(s) // shallow copy+slices.Clip(s) // trim unused capacity+```++#### `any` instead of `interface{}`++```go+// good+func process(value any) {}++// bad+func process(value interface{}) {}+```++#### `sync.OnceFunc` / `sync.OnceValue`++```go+// instead of sync.Once + wrapper+f := sync.OnceFunc(func() { initialize() })++// compute-once getter+getValue := sync.OnceValue(func() int { return expensiveComputation() })+```++#### `context` helpers++```go+stop := context.AfterFunc(ctx, cleanup) // run cleanup on cancellation+ctx, cancel := context.WithTimeoutCause(parent, d, ErrTimeout) // timeout with cause+ctx, cancel := context.WithDeadlineCause(parent, deadline, ErrDeadline) // deadline with cause+```++#### Range over integer++```go+// good+for i := range len(items) { ... }++// bad+for i := 0; i < len(items); i++ { ... }+```++#### `t.Context()` in tests++Always use `t.Context()` — it cancels automatically when the test ends.++```go+// good+func TestFoo(t *testing.T) {+ ctx := t.Context()+ result := doSomething(ctx)+}++// bad+func TestFoo(t *testing.T) {+ ctx, cancel := context.WithCancel(context.Background())+ defer cancel()+ result := doSomething(ctx)+}+```++#### `omitzero` instead of `omitempty`++Use `omitzero` for `time.Duration`, `time.Time`, structs, slices, and maps — `omitempty` does not work correctly for these types.++```go+// good+type Config struct {+ Timeout time.Duration `json:"timeout,omitzero"`+ CreatedAt time.Time `json:"createdAt,omitzero"`+}++// bad+type Config struct {+ Timeout time.Duration `json:"timeout,omitempty"` // broken for Duration!+ CreatedAt time.Time `json:"createdAt,omitempty"`+}+```++#### `wg.Go()` instead of `wg.Add(1)` + goroutine++```go+// good+var wg sync.WaitGroup+for _, item := range items {+ wg.Go(func() { process(item) })+}+wg.Wait()++// bad+var wg sync.WaitGroup+for _, item := range items {+ wg.Add(1)+ go func() {+ defer wg.Done()+ process(item)+ }()+}+wg.Wait()+```++#### `new(val)` for pointer literals++`new()` accepts expressions since Go 1.26 — avoids the temporary-variable pattern.++```go+// good+cfg := Config{+ Timeout: new(30), // *int+ Debug: new(true), // *bool+}++// bad+timeout := 30+debug := true+cfg := Config{Timeout: &timeout, Debug: &debug}+```++---+## Frontend guidelines### React component structurediff --git a/agent/internal/config/config.go b/agent/internal/config/config.goindex a70e5a25..2fbc8566 100644--- a/agent/internal/config/config.go+++ b/agent/internal/config/config.go@@ -110,8 +110,7 @@ func (c *Config) applyDefaults() {}if c.IsDeleteWalAfterUpload == nil {- v := true- c.IsDeleteWalAfterUpload = &v+ c.IsDeleteWalAfterUpload = new(true)}}diff --git a/agent/internal/features/full_backup/backuper_test.go b/agent/internal/features/full_backup/backuper_test.goindex 0f4a8f17..7d423a4d 100644--- a/agent/internal/features/full_backup/backuper_test.go+++ b/agent/internal/features/full_backup/backuper_test.go@@ -71,7 +71,7 @@ func Test_RunFullBackup_WhenChainBroken_BasebackupTriggered(t *testing.T) {fb := newTestFullBackuper(server.URL)fb.cmdBuilder = mockCmdBuilder(t, "test-backup-data", validStderr())- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)defer cancel()go fb.Run(ctx)@@ -124,7 +124,7 @@ func Test_RunFullBackup_WhenScheduledBackupDue_BasebackupTriggered(t *testing.T)fb := newTestFullBackuper(server.URL)fb.cmdBuilder = mockCmdBuilder(t, "scheduled-backup-data", validStderr())- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)defer cancel()go fb.Run(ctx)@@ -169,7 +169,7 @@ func Test_RunFullBackup_WhenNoFullBackupExists_ImmediateBasebackupTriggered(t *tfb := newTestFullBackuper(server.URL)fb.cmdBuilder = mockCmdBuilder(t, "first-backup-data", validStderr())- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)defer cancel()go fb.Run(ctx)@@ -233,7 +233,7 @@ func Test_RunFullBackup_WhenUploadFails_RetriesAfterDelay(t *testing.T) {setRetryDelay(100 * time.Millisecond)defer setRetryDelay(origRetryDelay)- ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)defer cancel()go fb.Run(ctx)@@ -282,7 +282,7 @@ func Test_RunFullBackup_WhenAlreadyRunning_SkipsExecution(t *testing.T) {fb.isRunning.Store(true)- fb.checkAndRunIfNeeded(context.Background())+ fb.checkAndRunIfNeeded(t.Context())mu.Lock()count := uploadCount@@ -318,7 +318,7 @@ func Test_RunFullBackup_WhenContextCancelled_StopsCleanly(t *testing.T) {setRetryDelay(5 * time.Second)defer setRetryDelay(origRetryDelay)- ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)+ ctx, cancel := context.WithTimeout(t.Context(), 500*time.Millisecond)defer cancel()done := make(chan struct{})@@ -360,7 +360,7 @@ func Test_RunFullBackup_WhenChainValidAndNotScheduled_NoBasebackupTriggered(t *tfb := newTestFullBackuper(server.URL)fb.cmdBuilder = mockCmdBuilder(t, "data", validStderr())- ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 2*time.Second)defer cancel()go fb.Run(ctx)@@ -411,7 +411,7 @@ func Test_RunFullBackup_WhenStderrParsingFails_FinalizesWithErrorAndRetries(t *tsetRetryDelay(100 * time.Millisecond)defer setRetryDelay(origRetryDelay)- ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 2*time.Second)defer cancel()go fb.Run(ctx)@@ -458,7 +458,7 @@ func Test_RunFullBackup_WhenNextBackupTimeNull_BasebackupTriggered(t *testing.T)fb := newTestFullBackuper(server.URL)fb.cmdBuilder = mockCmdBuilder(t, "first-run-data", validStderr())- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)defer cancel()go fb.Run(ctx)@@ -498,7 +498,7 @@ func Test_RunFullBackup_WhenChainValidityReturns401_NoBasebackupTriggered(t *tesfb := newTestFullBackuper(server.URL)fb.cmdBuilder = mockCmdBuilder(t, "data", validStderr())- ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 2*time.Second)defer cancel()go fb.Run(ctx)@@ -538,7 +538,7 @@ func Test_RunFullBackup_WhenUploadSucceeds_BodyIsZstdCompressed(t *testing.T) {fb := newTestFullBackuper(server.URL)fb.cmdBuilder = mockCmdBuilder(t, originalContent, validStderr())- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 5*time.Second)defer cancel()go fb.Run(ctx)diff --git a/agent/internal/features/restore/restorer_test.go b/agent/internal/features/restore/restorer_test.goindex 8883edd1..385448bb 100644--- a/agent/internal/features/restore/restorer_test.go+++ b/agent/internal/features/restore/restorer_test.go@@ -3,7 +3,6 @@ package restoreimport ("archive/tar""bytes"- "context""encoding/json""fmt""net/http"@@ -86,7 +85,7 @@ func Test_RunRestore_WhenBasebackupAndWalSegmentsAvailable_FilesExtractedAndRecotargetDir := createTestTargetDir(t)restorer := newTestRestorer(server.URL, targetDir, "", "", "")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.NoError(t, err)pgVersionContent, err := os.ReadFile(filepath.Join(targetDir, "PG_VERSION"))@@ -152,7 +151,7 @@ func Test_RunRestore_WhenTargetTimeProvided_RecoveryTargetTimeWrittenToConfig(ttargetDir := createTestTargetDir(t)restorer := newTestRestorer(server.URL, targetDir, "", "2026-02-28T14:30:00Z", "")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.NoError(t, err)autoConfContent, err := os.ReadFile(filepath.Join(targetDir, "postgresql.auto.conf"))@@ -169,7 +168,7 @@ func Test_RunRestore_WhenPgDataDirNotEmpty_ReturnsError(t *testing.T) {restorer := newTestRestorer("http://localhost:0", targetDir, "", "", "")- err = restorer.Run(context.Background())+ err = restorer.Run(t.Context())require.Error(t, err)assert.Contains(t, err.Error(), "not empty")}@@ -179,7 +178,7 @@ func Test_RunRestore_WhenPgDataDirDoesNotExist_ReturnsError(t *testing.T) {restorer := newTestRestorer("http://localhost:0", nonExistentDir, "", "", "")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.Error(t, err)assert.Contains(t, err.Error(), "does not exist")}@@ -197,7 +196,7 @@ func Test_RunRestore_WhenNoBackupsAvailable_ReturnsError(t *testing.T) {targetDir := createTestTargetDir(t)restorer := newTestRestorer(server.URL, targetDir, "", "", "")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.Error(t, err)assert.Contains(t, err.Error(), "No full backups available")}@@ -216,7 +215,7 @@ func Test_RunRestore_WhenWalChainBroken_ReturnsError(t *testing.T) {targetDir := createTestTargetDir(t)restorer := newTestRestorer(server.URL, targetDir, "", "", "")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.Error(t, err)assert.Contains(t, err.Error(), "WAL chain broken")assert.Contains(t, err.Error(), testWalSegment1)@@ -282,7 +281,7 @@ func Test_DownloadWalSegment_WhenFirstAttemptFails_RetriesAndSucceeds(t *testingretryDelayOverride = &testDelaydefer func() { retryDelayOverride = origDelay }()- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.NoError(t, err)mu.Lock()@@ -341,7 +340,7 @@ func Test_DownloadWalSegment_WhenAllAttemptsFail_ReturnsErrorWithSegmentName(t *retryDelayOverride = &testDelaydefer func() { retryDelayOverride = origDelay }()- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.Error(t, err)assert.Contains(t, err.Error(), testWalSegment1)assert.Contains(t, err.Error(), "3 attempts")@@ -351,7 +350,7 @@ func Test_RunRestore_WhenInvalidTargetTimeFormat_ReturnsError(t *testing.T) {targetDir := createTestTargetDir(t)restorer := newTestRestorer("http://localhost:0", targetDir, "", "not-a-valid-time", "")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.Error(t, err)assert.Contains(t, err.Error(), "invalid --target-time format")}@@ -384,7 +383,7 @@ func Test_RunRestore_WhenBasebackupDownloadFails_ReturnsError(t *testing.T) {targetDir := createTestTargetDir(t)restorer := newTestRestorer(server.URL, targetDir, "", "", "")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.Error(t, err)assert.Contains(t, err.Error(), "basebackup download failed")}@@ -423,7 +422,7 @@ func Test_RunRestore_WhenNoWalSegmentsInPlan_BasebackupRestoredSuccessfully(t *ttargetDir := createTestTargetDir(t)restorer := newTestRestorer(server.URL, targetDir, "", "", "")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.NoError(t, err)pgVersionContent, err := os.ReadFile(filepath.Join(targetDir, "PG_VERSION"))@@ -486,7 +485,7 @@ func Test_RunRestore_WhenMakingApiCalls_AuthTokenIncludedInRequests(t *testing.TtargetDir := createTestTargetDir(t)restorer := newTestRestorer(server.URL, targetDir, "", "", "")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.NoError(t, err)assert.GreaterOrEqual(t, int(receivedAuthHeaders.Load()), 2)@@ -530,7 +529,7 @@ func Test_ConfigurePostgresRecovery_WhenPgTypeHost_UsesHostAbsolutePath(t *testitargetDir := createTestTargetDir(t)restorer := newTestRestorer(server.URL, targetDir, "", "", "host")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.NoError(t, err)autoConfContent, err := os.ReadFile(filepath.Join(targetDir, "postgresql.auto.conf"))@@ -577,7 +576,7 @@ func Test_ConfigurePostgresRecovery_WhenPgTypeDocker_UsesContainerPath(t *testintargetDir := createTestTargetDir(t)restorer := newTestRestorer(server.URL, targetDir, "", "", "docker")- err := restorer.Run(context.Background())+ err := restorer.Run(t.Context())require.NoError(t, err)autoConfContent, err := os.ReadFile(filepath.Join(targetDir, "postgresql.auto.conf"))diff --git a/agent/internal/features/start/lock_watcher_test.go b/agent/internal/features/start/lock_watcher_test.goindex d1e3ab27..55352de1 100644--- a/agent/internal/features/start/lock_watcher_test.go+++ b/agent/internal/features/start/lock_watcher_test.go@@ -21,7 +21,7 @@ func Test_NewLockWatcher_CapturesInode(t *testing.T) {require.NoError(t, err)defer ReleaseLock(lockFile)- _, cancel := context.WithCancel(context.Background())+ _, cancel := context.WithCancel(t.Context())defer cancel()watcher, err := NewLockWatcher(lockFile, cancel, log)@@ -37,7 +37,7 @@ func Test_LockWatcher_FileUnchanged_ContextNotCancelled(t *testing.T) {require.NoError(t, err)defer ReleaseLock(lockFile)- ctx, cancel := context.WithCancel(context.Background())+ ctx, cancel := context.WithCancel(t.Context())defer cancel()watcher, err := NewLockWatcher(lockFile, cancel, log)@@ -62,7 +62,7 @@ func Test_LockWatcher_FileDeleted_CancelsContext(t *testing.T) {require.NoError(t, err)defer ReleaseLock(lockFile)- ctx, cancel := context.WithCancel(context.Background())+ ctx, cancel := context.WithCancel(t.Context())defer cancel()watcher, err := NewLockWatcher(lockFile, cancel, log)@@ -88,7 +88,7 @@ func Test_LockWatcher_FileReplacedWithDifferentInode_CancelsContext(t *testing.Trequire.NoError(t, err)defer ReleaseLock(lockFile)- ctx, cancel := context.WithCancel(context.Background())+ ctx, cancel := context.WithCancel(t.Context())defer cancel()watcher, err := NewLockWatcher(lockFile, cancel, log)diff --git a/agent/internal/features/wal/streamer.go b/agent/internal/features/wal/streamer.goindex 955a0272..7ae53376 100644--- a/agent/internal/features/wal/streamer.go+++ b/agent/internal/features/wal/streamer.go@@ -8,7 +8,7 @@ import ("os""path/filepath""regexp"- "sort"+ "slices""strings""time"@@ -113,7 +113,7 @@ func (s *Streamer) listSegments() ([]string, error) {segments = append(segments, name)}- sort.Strings(segments)+ slices.Sort(segments)return segments, nil}diff --git a/agent/internal/features/wal/streamer_test.go b/agent/internal/features/wal/streamer_test.goindex b9decebb..fc161a84 100644--- a/agent/internal/features/wal/streamer_test.go+++ b/agent/internal/features/wal/streamer_test.go@@ -42,7 +42,7 @@ func Test_UploadSegment_SingleSegment_ServerReceivesCorrectHeadersAndBody(t *tesstreamer := newTestStreamer(walDir, server.URL)- ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second)defer cancel()go streamer.Run(ctx)@@ -79,7 +79,7 @@ func Test_UploadSegments_MultipleSegmentsOutOfOrder_UploadedInAscendingOrder(t *streamer := newTestStreamer(walDir, server.URL)- ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second)defer cancel()go streamer.Run(ctx)@@ -115,7 +115,7 @@ func Test_UploadSegments_DirectoryHasTmpFiles_TmpFilesIgnored(t *testing.T) {streamer := newTestStreamer(walDir, server.URL)- ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second)defer cancel()go streamer.Run(ctx)@@ -146,7 +146,7 @@ func Test_UploadSegment_DeleteEnabled_FileRemovedAfterUpload(t *testing.T) {apiClient := api.NewClient(server.URL, cfg.Token, logger.GetLogger())streamer := NewStreamer(cfg, apiClient, logger.GetLogger())- ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second)defer cancel()go streamer.Run(ctx)@@ -174,7 +174,7 @@ func Test_UploadSegment_DeleteDisabled_FileKeptAfterUpload(t *testing.T) {apiClient := api.NewClient(server.URL, cfg.Token, logger.GetLogger())streamer := NewStreamer(cfg, apiClient, logger.GetLogger())- ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second)defer cancel()go streamer.Run(ctx)@@ -199,7 +199,7 @@ func Test_UploadSegment_ServerReturns500_FileKeptInQueue(t *testing.T) {streamer := newTestStreamer(walDir, server.URL)- ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second)defer cancel()go streamer.Run(ctx)@@ -223,7 +223,7 @@ func Test_ProcessQueue_EmptyDirectory_NoUploads(t *testing.T) {streamer := newTestStreamer(walDir, server.URL)- ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second)defer cancel()go streamer.Run(ctx)@@ -238,7 +238,7 @@ func Test_Run_ContextCancelled_StopsImmediately(t *testing.T) {streamer := newTestStreamer(walDir, "http://localhost:0")- ctx, cancel := context.WithCancel(context.Background())+ ctx, cancel := context.WithCancel(t.Context())cancel()done := make(chan struct{})@@ -276,7 +276,7 @@ func Test_UploadSegment_ServerReturns409_FileNotDeleted(t *testing.T) {streamer := newTestStreamer(walDir, server.URL)- ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 3*time.Second)defer cancel()go streamer.Run(ctx)diff --git a/agent/internal/logger/logger.go b/agent/internal/logger/logger.goindex f57c3dc4..588d4843 100644--- a/agent/internal/logger/logger.go+++ b/agent/internal/logger/logger.go@@ -64,16 +64,12 @@ func (w *rotatingWriter) rotate() error {return nil}-var (- loggerInstance *slog.Logger- once sync.Once-)+var loggerInstance *slog.Logger-func GetLogger() *slog.Logger {- once.Do(func() {- initialize()- })+var initLogger = sync.OnceFunc(initialize)+func GetLogger() *slog.Logger {+ initLogger()return loggerInstance}diff --git a/agent/internal/logger/logger_test.go b/agent/internal/logger/logger_test.goindex 022733e3..c87b9e8d 100644--- a/agent/internal/logger/logger_test.go+++ b/agent/internal/logger/logger_test.go@@ -67,7 +67,7 @@ func Test_Write_MultipleSmallWrites_CurrentSizeAccumulated(t *testing.T) {rw, _, _ := setupRotatingWriter(t, 1024)var totalWritten int64- for i := 0; i < 10; i++ {+ for range 10 {data := []byte("line\n")n, err := rw.Write(data)require.NoError(t, err)diff --git a/backend/cmd/main.go b/backend/cmd/main.goindex 99321082..6dec3421 100644--- a/backend/cmd/main.go+++ b/backend/cmd/main.go@@ -193,7 +193,7 @@ func startServerWithGracefulShutdown(log *slog.Logger, app *gin.Engine) {log.Info("Shutdown signal received")// Gracefully shutdown VictoriaLogs writer- logger.ShutdownVictoriaLogs(5 * time.Second)+ logger.ShutdownVictoriaLogs()// The context is used to inform the server it has 10 seconds to finish// the request it is currently handlingdiff --git a/backend/internal/config/config.go b/backend/internal/config/config.goindex 7e8e7fa0..bca600eb 100644--- a/backend/internal/config/config.go+++ b/backend/internal/config/config.go@@ -142,13 +142,12 @@ type EnvVariables struct {DatabasusURL string `env:"DATABASUS_URL"`}-var (- env EnvVariables- once sync.Once-)+var env EnvVariables++var initEnv = sync.OnceFunc(loadEnvVariables)func GetEnv() *EnvVariables {- once.Do(loadEnvVariables)+ initEnv()return &env}diff --git a/backend/internal/features/audit_logs/background_service.go b/backend/internal/features/audit_logs/background_service.goindex 5fc4812b..ababa025 100644--- a/backend/internal/features/audit_logs/background_service.go+++ b/backend/internal/features/audit_logs/background_service.go@@ -4,7 +4,6 @@ import ("context""fmt""log/slog"- "sync""sync/atomic""time")@@ -13,39 +12,32 @@ type AuditLogBackgroundService struct {auditLogService *AuditLogServicelogger *slog.Logger- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (s *AuditLogBackgroundService) Run(ctx context.Context) {- wasAlreadyRun := s.hasRun.Load()+ if s.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", s))+ }- s.runOnce.Do(func() {- s.hasRun.Store(true)+ s.logger.Info("Starting audit log cleanup background service")- s.logger.Info("Starting audit log cleanup background service")+ if ctx.Err() != nil {+ return+ }- if ctx.Err() != nil {- return- }+ ticker := time.NewTicker(1 * time.Hour)+ defer ticker.Stop()- ticker := time.NewTicker(1 * time.Hour)- defer ticker.Stop()-- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- if err := s.cleanOldAuditLogs(); err != nil {- s.logger.Error("Failed to clean old audit logs", "error", err)- }+ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ if err := s.cleanOldAuditLogs(); err != nil {+ s.logger.Error("Failed to clean old audit logs", "error", err)}}- })-- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", s))}}diff --git a/backend/internal/features/audit_logs/background_service_test.go b/backend/internal/features/audit_logs/background_service_test.goindex 9087010f..9e6a0461 100644--- a/backend/internal/features/audit_logs/background_service_test.go+++ b/backend/internal/features/audit_logs/background_service_test.go@@ -102,7 +102,7 @@ func Test_CleanOldAuditLogs_DeletesMultipleOldLogs(t *testing.T) {// Create many old logs with specific UUIDs to track themtestLogIDs := make([]uuid.UUID, 5)- for i := 0; i < 5; i++ {+ for i := range 5 {testLogIDs[i] = uuid.New()daysAgo := 400 + (i * 10)log := &AuditLog{diff --git a/backend/internal/features/audit_logs/di.go b/backend/internal/features/audit_logs/di.goindex 9264780a..a0640db6 100644--- a/backend/internal/features/audit_logs/di.go+++ b/backend/internal/features/audit_logs/di.go@@ -2,7 +2,6 @@ package audit_logsimport ("sync"- "sync/atomic"users_services "databasus-backend/internal/features/users/services""databasus-backend/internal/util/logger"@@ -23,8 +22,6 @@ var auditLogController = &AuditLogController{var auditLogBackgroundService = &AuditLogBackgroundService{auditLogService: auditLogService,logger: logger.GetLogger(),- runOnce: sync.Once{},- hasRun: atomic.Bool{},}func GetAuditLogService() *AuditLogService {@@ -39,23 +36,8 @@ func GetAuditLogBackgroundService() *AuditLogBackgroundService {return auditLogBackgroundService}-var (- setupOnce sync.Once- isSetup atomic.Bool-)--func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- users_services.GetUserService().SetAuditLogWriter(auditLogService)- users_services.GetSettingsService().SetAuditLogWriter(auditLogService)- users_services.GetManagementService().SetAuditLogWriter(auditLogService)-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ users_services.GetUserService().SetAuditLogWriter(auditLogService)+ users_services.GetSettingsService().SetAuditLogWriter(auditLogService)+ users_services.GetManagementService().SetAuditLogWriter(auditLogService)+})diff --git a/backend/internal/features/backups/backups/backuping/backuper.go b/backend/internal/features/backups/backups/backuping/backuper.goindex f9c4552e..5a98ed11 100644--- a/backend/internal/features/backups/backups/backuping/backuper.go+++ b/backend/internal/features/backups/backups/backuping/backuper.go@@ -9,7 +9,6 @@ import ("log/slog""slices""strings"- "sync""sync/atomic""time"@@ -46,80 +45,73 @@ type BackuperNode struct {lastHeartbeat time.Time- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (n *BackuperNode) Run(ctx context.Context) {- wasAlreadyRun := n.hasRun.Load()-- n.runOnce.Do(func() {- n.hasRun.Store(true)-- n.lastHeartbeat = time.Now().UTC()+ if n.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", n))+ }- throughputMBs := config.GetEnv().NodeNetworkThroughputMBs+ n.lastHeartbeat = time.Now().UTC()- backupNode := BackupNode{- ID: n.nodeID,- ThroughputMBs: throughputMBs,- LastHeartbeat: time.Now().UTC(),- }+ throughputMBs := config.GetEnv().NodeNetworkThroughputMBs- if err := n.backupNodesRegistry.HearthbeatNodeInRegistry(time.Now().UTC(), backupNode); err != nil {- n.logger.Error("Failed to register node in registry", "error", err)- panic(err)- }+ backupNode := BackupNode{+ ID: n.nodeID,+ ThroughputMBs: throughputMBs,+ LastHeartbeat: time.Now().UTC(),+ }- backupHandler := func(backupID uuid.UUID, isCallNotifier bool) {- go func() {- n.MakeBackup(backupID, isCallNotifier)- if err := n.backupNodesRegistry.PublishBackupCompletion(n.nodeID, backupID); err != nil {- n.logger.Error(- "Failed to publish backup completion",- "error",- err,- "backupID",- backupID,- )- }- }()- }+ if err := n.backupNodesRegistry.HearthbeatNodeInRegistry(time.Now().UTC(), backupNode); err != nil {+ n.logger.Error("Failed to register node in registry", "error", err)+ panic(err)+ }- err := n.backupNodesRegistry.SubscribeNodeForBackupsAssignment(n.nodeID, backupHandler)- if err != nil {- n.logger.Error("Failed to subscribe to backup assignments", "error", err)- panic(err)- }- defer func() {- if err := n.backupNodesRegistry.UnsubscribeNodeForBackupsAssignments(); err != nil {- n.logger.Error("Failed to unsubscribe from backup assignments", "error", err)+ backupHandler := func(backupID uuid.UUID, isCallNotifier bool) {+ go func() {+ n.MakeBackup(backupID, isCallNotifier)+ if err := n.backupNodesRegistry.PublishBackupCompletion(n.nodeID, backupID); err != nil {+ n.logger.Error(+ "Failed to publish backup completion",+ "error",+ err,+ "backupID",+ backupID,+ )}}()+ }- ticker := time.NewTicker(heartbeatTickerInterval)- defer ticker.Stop()+ err := n.backupNodesRegistry.SubscribeNodeForBackupsAssignment(n.nodeID, backupHandler)+ if err != nil {+ n.logger.Error("Failed to subscribe to backup assignments", "error", err)+ panic(err)+ }+ defer func() {+ if err := n.backupNodesRegistry.UnsubscribeNodeForBackupsAssignments(); err != nil {+ n.logger.Error("Failed to unsubscribe from backup assignments", "error", err)+ }+ }()- n.logger.Info("Backup node started", "nodeID", n.nodeID, "throughput", throughputMBs)+ ticker := time.NewTicker(heartbeatTickerInterval)+ defer ticker.Stop()- for {- select {- case <-ctx.Done():- n.logger.Info("Shutdown signal received, unregistering node", "nodeID", n.nodeID)+ n.logger.Info("Backup node started", "nodeID", n.nodeID, "throughput", throughputMBs)- if err := n.backupNodesRegistry.UnregisterNodeFromRegistry(backupNode); err != nil {- n.logger.Error("Failed to unregister node from registry", "error", err)- }+ for {+ select {+ case <-ctx.Done():+ n.logger.Info("Shutdown signal received, unregistering node", "nodeID", n.nodeID)- return- case <-ticker.C:- n.sendHeartbeat(&backupNode)+ if err := n.backupNodesRegistry.UnregisterNodeFromRegistry(backupNode); err != nil {+ n.logger.Error("Failed to unregister node from registry", "error", err)}- }- })- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", n))+ return+ case <-ticker.C:+ n.sendHeartbeat(&backupNode)+ }}}diff --git a/backend/internal/features/backups/backups/backuping/cleaner.go b/backend/internal/features/backups/backups/backuping/cleaner.goindex 0016581c..97449ea6 100644--- a/backend/internal/features/backups/backups/backuping/cleaner.go+++ b/backend/internal/features/backups/backups/backuping/cleaner.go@@ -4,7 +4,6 @@ import ("context""fmt""log/slog"- "sync""sync/atomic""time"@@ -32,49 +31,42 @@ type BackupCleaner struct {logger *slog.LoggerbackupRemoveListeners []backups_core.BackupRemoveListener- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (c *BackupCleaner) Run(ctx context.Context) {- wasAlreadyRun := c.hasRun.Load()+ if c.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", c))+ }++ if ctx.Err() != nil {+ return+ }++ retentionLog := c.logger.With("task_name", "clean_by_retention_policy")+ exceededLog := c.logger.With("task_name", "clean_exceeded_storage_backups")+ staleLog := c.logger.With("task_name", "clean_stale_basebackups")- c.runOnce.Do(func() {- c.hasRun.Store(true)+ ticker := time.NewTicker(cleanerTickerInterval)+ defer ticker.Stop()- if ctx.Err() != nil {+ for {+ select {+ case <-ctx.Done():return- }+ case <-ticker.C:+ if err := c.cleanByRetentionPolicy(retentionLog); err != nil {+ retentionLog.Error("failed to clean backups by retention policy", "error", err)+ }- retentionLog := c.logger.With("task_name", "clean_by_retention_policy")- exceededLog := c.logger.With("task_name", "clean_exceeded_storage_backups")- staleLog := c.logger.With("task_name", "clean_stale_basebackups")-- ticker := time.NewTicker(cleanerTickerInterval)- defer ticker.Stop()-- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- if err := c.cleanByRetentionPolicy(retentionLog); err != nil {- retentionLog.Error("failed to clean backups by retention policy", "error", err)- }-- if err := c.cleanExceededStorageBackups(exceededLog); err != nil {- exceededLog.Error("failed to clean exceeded backups", "error", err)- }-- if err := c.cleanStaleUploadedBasebackups(staleLog); err != nil {- staleLog.Error("failed to clean stale uploaded basebackups", "error", err)- }+ if err := c.cleanExceededStorageBackups(exceededLog); err != nil {+ exceededLog.Error("failed to clean exceeded backups", "error", err)}- }- })- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", c))+ if err := c.cleanStaleUploadedBasebackups(staleLog); err != nil {+ staleLog.Error("failed to clean stale uploaded basebackups", "error", err)+ }+ }}}diff --git a/backend/internal/features/backups/backups/backuping/cleaner_gfs_test.go b/backend/internal/features/backups/backups/backuping/cleaner_gfs_test.goindex a1de2069..87b2d0c5 100644--- a/backend/internal/features/backups/backups/backuping/cleaner_gfs_test.go+++ b/backend/internal/features/backups/backups/backuping/cleaner_gfs_test.go@@ -33,7 +33,7 @@ func Test_BuildGFSKeepSet(t *testing.T) {// backupsEveryDay returns n backups, newest-first, each 1 day apart.backupsEveryDay := func(n int) []*backups_core.Backup {bs := make([]*backups_core.Backup, n)- for i := 0; i < n; i++ {+ for i := range n {bs[i] = newBackup(ref.Add(-time.Duration(i) * day))}return bs@@ -42,7 +42,7 @@ func Test_BuildGFSKeepSet(t *testing.T) {// backupsEveryWeek returns n backups, newest-first, each 7 days apart.backupsEveryWeek := func(n int) []*backups_core.Backup {bs := make([]*backups_core.Backup, n)- for i := 0; i < n; i++ {+ for i := range n {bs[i] = newBackup(ref.Add(-time.Duration(i) * week))}return bs@@ -53,7 +53,7 @@ func Test_BuildGFSKeepSet(t *testing.T) {// backupsEveryHour returns n backups, newest-first, each 1 hour apart.backupsEveryHour := func(n int) []*backups_core.Backup {bs := make([]*backups_core.Backup, n)- for i := 0; i < n; i++ {+ for i := range n {bs[i] = newBackup(ref.Add(-time.Duration(i) * hour))}return bs@@ -62,7 +62,7 @@ func Test_BuildGFSKeepSet(t *testing.T) {// backupsEveryMonth returns n backups, newest-first, each ~1 month apart.backupsEveryMonth := func(n int) []*backups_core.Backup {bs := make([]*backups_core.Backup, n)- for i := 0; i < n; i++ {+ for i := range n {bs[i] = newBackup(ref.AddDate(0, -i, 0))}return bs@@ -71,7 +71,7 @@ func Test_BuildGFSKeepSet(t *testing.T) {// backupsEveryYear returns n backups, newest-first, each 1 year apart.backupsEveryYear := func(n int) []*backups_core.Backup {bs := make([]*backups_core.Backup, n)- for i := 0; i < n; i++ {+ for i := range n {bs[i] = newBackup(ref.AddDate(-i, 0, 0))}return bs@@ -410,7 +410,7 @@ func Test_CleanByGFS_KeepsCorrectBackupsPerSlot(t *testing.T) {// Create 5 backups on 5 different days; only the 3 newest days should be keptvar backupIDs []uuid.UUID- for i := 0; i < 5; i++ {+ for i := range 5 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -486,7 +486,7 @@ func Test_CleanByGFS_WithWeeklyAndMonthlySlots_KeepsWiderSpread(t *testing.T) {// Create one backup per week for 6 weeks (each on Monday of that week)// GFS should keep: 2 daily (most recent 2 unique days) + 2 weekly + 1 monthly = up to 5 uniquevar createdIDs []uuid.UUID- for i := 0; i < 6; i++ {+ for i := range 6 {weekOffset := time.Duration(5-i) * 7 * 24 * time.Hourbackup := &backups_core.Backup{ID: uuid.New(),@@ -561,7 +561,7 @@ func Test_CleanByGFS_WithHourlySlots_KeepsCorrectBackups(t *testing.T) {// Create 5 backups spaced 1 hour apart; only the 3 newest hours should be keptvar backupIDs []uuid.UUID- for i := 0; i < 5; i++ {+ for i := range 5 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -824,8 +824,8 @@ func Test_CleanByGFS_WithMultipleBackupsPerDay_KeepsOnlyOnePerDailySlot(t *testi// Create 3 backups per day for 10 days = 30 total, all beyond grace period.// Each day gets backups at base+0h, base+6h, base+12h.- for day := 0; day < 10; day++ {- for sub := 0; sub < 3; sub++ {+ for day := range 10 {+ for sub := range 3 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -915,7 +915,7 @@ func Test_CleanByGFS_With24HourlySlotsAnd23DailyBackups_DeletesExcessBackups(t *now := time.Now().UTC()- for i := 0; i < 23; i++ {+ for i := range 23 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -985,7 +985,7 @@ func Test_CleanByGFS_WithDisabledHourlySlotsAnd23DailyBackups_DeletesExcessBackunow := time.Now().UTC()- for i := 0; i < 23; i++ {+ for i := range 23 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -1055,7 +1055,7 @@ func Test_CleanByGFS_WithDailySlotsAndWeeklyBackups_DeletesExcessBackups(t *test// Create 10 weekly backups (1 per week, all >2h old past grace period).// With 7d/4w config, correct behavior: ~8 kept (4 weekly + overlap with daily for recent ones).// Daily slots should NOT absorb weekly backups that are older than 7 days.- for i := 0; i < 10; i++ {+ for i := range 10 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -1138,7 +1138,7 @@ func Test_CleanByGFS_WithWeeklySlotsAndMonthlyBackups_DeletesExcessBackups(t *te// With 52w/3m config, correct behavior: 3 kept (3 monthly slots; weekly should only// cover recent 52 weeks but not artificially retain old monthly backups).// Bug: all 8 kept because each monthly backup fills a unique weekly slot.- for i := 0; i < 8; i++ {+ for i := range 8 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,diff --git a/backend/internal/features/backups/backups/backuping/cleaner_test.go b/backend/internal/features/backups/backups/backuping/cleaner_test.goindex d629483a..1ed9d178 100644--- a/backend/internal/features/backups/backups/backuping/cleaner_test.go+++ b/backend/internal/features/backups/backups/backuping/cleaner_test.go@@ -197,7 +197,7 @@ func Test_CleanExceededBackups_WhenUnderStorageLimit_NoBackupsDeleted(t *testing_, err := backups_config.GetBackupConfigService().SaveBackupConfig(backupConfig)assert.NoError(t, err)- for i := 0; i < 3; i++ {+ for i := range 3 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -263,7 +263,7 @@ func Test_CleanExceededBackups_WhenOverStorageLimit_DeletesOldestBackups(t *test// Expect 2 oldest deleted, 3 remain (900 MB < 1024 MB)now := time.Now().UTC()var backupIDs []uuid.UUID- for i := 0; i < 5; i++ {+ for i := range 5 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -340,7 +340,7 @@ func Test_CleanExceededBackups_SkipsInProgressBackups(t *testing.T) {// 3 completed at 500 MB each = 1500 MB, limit = 1 GB (1024 MB)completedBackups := make([]*backups_core.Backup, 3)- for i := 0; i < 3; i++ {+ for i := range 3 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -423,7 +423,7 @@ func Test_CleanExceededBackups_WithZeroStorageLimit_RemovesAllBackups(t *testing_, err := backups_config.GetBackupConfigService().SaveBackupConfig(backupConfig)assert.NoError(t, err)- for i := 0; i < 10; i++ {+ for i := range 10 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -555,7 +555,7 @@ func Test_CleanByCount_KeepsNewestNBackups_DeletesOlder(t *testing.T) {now := time.Now().UTC()var backupIDs []uuid.UUID- for i := 0; i < 5; i++ {+ for i := range 5 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -626,7 +626,7 @@ func Test_CleanByCount_WhenUnderLimit_NoBackupsDeleted(t *testing.T) {_, err := backups_config.GetBackupConfigService().SaveBackupConfig(backupConfig)assert.NoError(t, err)- for i := 0; i < 5; i++ {+ for i := range 5 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -686,7 +686,7 @@ func Test_CleanByCount_DoesNotDeleteInProgressBackups(t *testing.T) {now := time.Now().UTC()- for i := 0; i < 3; i++ {+ for i := range 3 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,@@ -1064,7 +1064,7 @@ func Test_CleanExceededStorageBackups_WhenNonCloud_SkipsCleanup(t *testing.T) {// 5 backups at 500 MB each = 2500 MB, would exceed 1 GB limit in cloud modenow := time.Now().UTC()- for i := 0; i < 5; i++ {+ for i := range 5 {backup := &backups_core.Backup{ID: uuid.New(),DatabaseID: database.ID,diff --git a/backend/internal/features/backups/backups/backuping/di.go b/backend/internal/features/backups/backups/backuping/di.goindex 623449da..332b62d7 100644--- a/backend/internal/features/backups/backups/backuping/di.go+++ b/backend/internal/features/backups/backups/backuping/di.go@@ -1,7 +1,6 @@package backupingimport (- "sync""sync/atomic""time"@@ -33,7 +32,6 @@ var backupCleaner = &BackupCleaner{encryption.GetFieldEncryptor(),logger.GetLogger(),[]backups_core.BackupRemoveListener{},- sync.Once{},atomic.Bool{},}@@ -43,7 +41,6 @@ var backupNodesRegistry = &BackupNodesRegistry{cache_utils.DefaultCacheTimeout,cache_utils.NewPubSubManager(),cache_utils.NewPubSubManager(),- sync.Once{},atomic.Bool{},}@@ -65,7 +62,6 @@ var backuperNode = &BackuperNode{usecases.GetCreateBackupUsecase(),getNodeID(),time.Time{},- sync.Once{},atomic.Bool{},}@@ -80,7 +76,6 @@ var backupsScheduler = &BackupsScheduler{logger.GetLogger(),make(map[uuid.UUID]BackupToNodeRelation),backuperNode,- sync.Once{},atomic.Bool{},}diff --git a/backend/internal/features/backups/backups/backuping/registry.go b/backend/internal/features/backups/backups/backuping/registry.goindex 415d41d4..b5d63058 100644--- a/backend/internal/features/backups/backups/backuping/registry.go+++ b/backend/internal/features/backups/backups/backuping/registry.go@@ -6,7 +6,6 @@ import ("fmt""log/slog""strings"- "sync""sync/atomic""time"@@ -50,36 +49,30 @@ type BackupNodesRegistry struct {pubsubBackups *cache_utils.PubSubManagerpubsubCompletions *cache_utils.PubSubManager- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (r *BackupNodesRegistry) Run(ctx context.Context) {- wasAlreadyRun := r.hasRun.Load()+ if r.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", r))+ }- r.runOnce.Do(func() {- r.hasRun.Store(true)+ if err := r.cleanupDeadNodes(); err != nil {+ r.logger.Error("Failed to cleanup dead nodes on startup", "error", err)+ }- if err := r.cleanupDeadNodes(); err != nil {- r.logger.Error("Failed to cleanup dead nodes on startup", "error", err)- }+ ticker := time.NewTicker(cleanupTickerInterval)+ defer ticker.Stop()- ticker := time.NewTicker(cleanupTickerInterval)- defer ticker.Stop()- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- if err := r.cleanupDeadNodes(); err != nil {- r.logger.Error("Failed to cleanup dead nodes", "error", err)- }+ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ if err := r.cleanupDeadNodes(); err != nil {+ r.logger.Error("Failed to cleanup dead nodes", "error", err)}}- })-- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", r))}}diff --git a/backend/internal/features/backups/backups/backuping/registry_test.go b/backend/internal/features/backups/backups/backuping/registry_test.goindex 3c614fd1..efc331ad 100644--- a/backend/internal/features/backups/backups/backuping/registry_test.go+++ b/backend/internal/features/backups/backups/backuping/registry_test.go@@ -4,8 +4,6 @@ import ("context""encoding/json""fmt"- "sync"- "sync/atomic""testing""time"@@ -322,7 +320,7 @@ func Test_GetAvailableNodes_SkipsInvalidJsonData(t *testing.T) {err := registry.HearthbeatNodeInRegistry(time.Now().UTC(), node)assert.NoError(t, err)- ctx, cancel := context.WithTimeout(context.Background(), registry.timeout)+ ctx, cancel := context.WithTimeout(t.Context(), registry.timeout)defer cancel()invalidKey := nodeInfoKeyPrefix + uuid.New().String() + nodeInfoKeySuffix@@ -331,7 +329,7 @@ func Test_GetAvailableNodes_SkipsInvalidJsonData(t *testing.T) {registry.client.B().Set().Key(invalidKey).Value("invalid json data").Build(),)defer func() {- cleanupCtx, cleanupCancel := context.WithTimeout(context.Background(), registry.timeout)+ cleanupCtx, cleanupCancel := context.WithTimeout(t.Context(), registry.timeout)defer cleanupCancel()registry.client.Do(cleanupCtx, registry.client.B().Del().Key(invalidKey).Build())}()@@ -401,7 +399,7 @@ func Test_GetAvailableNodes_ExcludesStaleNodesFromCache(t *testing.T) {err = registry.HearthbeatNodeInRegistry(time.Now().UTC(), node3)assert.NoError(t, err)- ctx, cancel := context.WithTimeout(context.Background(), registry.timeout)+ ctx, cancel := context.WithTimeout(t.Context(), registry.timeout)defer cancel()key := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node2.ID.String(), nodeInfoKeySuffix)@@ -419,7 +417,7 @@ func Test_GetAvailableNodes_ExcludesStaleNodesFromCache(t *testing.T) {modifiedData, err := json.Marshal(node)assert.NoError(t, err)- setCtx, setCancel := context.WithTimeout(context.Background(), registry.timeout)+ setCtx, setCancel := context.WithTimeout(t.Context(), registry.timeout)defer setCancel()setResult := registry.client.Do(setCtx,@@ -464,7 +462,7 @@ func Test_GetBackupNodesStats_ExcludesStaleNodesFromCache(t *testing.T) {err = registry.IncrementBackupsInProgress(node3.ID)assert.NoError(t, err)- ctx, cancel := context.WithTimeout(context.Background(), registry.timeout)+ ctx, cancel := context.WithTimeout(t.Context(), registry.timeout)defer cancel()key := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node2.ID.String(), nodeInfoKeySuffix)@@ -482,7 +480,7 @@ func Test_GetBackupNodesStats_ExcludesStaleNodesFromCache(t *testing.T) {modifiedData, err := json.Marshal(node)assert.NoError(t, err)- setCtx, setCancel := context.WithTimeout(context.Background(), registry.timeout)+ setCtx, setCancel := context.WithTimeout(t.Context(), registry.timeout)defer setCancel()setResult := registry.client.Do(setCtx,@@ -524,7 +522,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {err = registry.IncrementBackupsInProgress(node2.ID)assert.NoError(t, err)- ctx, cancel := context.WithTimeout(context.Background(), registry.timeout)+ ctx, cancel := context.WithTimeout(t.Context(), registry.timeout)defer cancel()key := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node2.ID.String(), nodeInfoKeySuffix)@@ -542,7 +540,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {modifiedData, err := json.Marshal(node)assert.NoError(t, err)- setCtx, setCancel := context.WithTimeout(context.Background(), registry.timeout)+ setCtx, setCancel := context.WithTimeout(t.Context(), registry.timeout)defer setCancel()setResult := registry.client.Do(setCtx,@@ -553,7 +551,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {err = registry.cleanupDeadNodes()assert.NoError(t, err)- checkCtx, checkCancel := context.WithTimeout(context.Background(), registry.timeout)+ checkCtx, checkCancel := context.WithTimeout(t.Context(), registry.timeout)defer checkCancel()infoKey := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node2.ID.String(), nodeInfoKeySuffix)@@ -566,7 +564,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {node2.ID.String(),nodeActiveBackupsSuffix,)- counterCtx, counterCancel := context.WithTimeout(context.Background(), registry.timeout)+ counterCtx, counterCancel := context.WithTimeout(t.Context(), registry.timeout)defer counterCancel()counterResult := registry.client.Do(counterCtx,@@ -575,7 +573,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {assert.Error(t, counterResult.Error())activeInfoKey := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node1.ID.String(), nodeInfoKeySuffix)- activeCtx, activeCancel := context.WithTimeout(context.Background(), registry.timeout)+ activeCtx, activeCancel := context.WithTimeout(t.Context(), registry.timeout)defer activeCancel()activeResult := registry.client.Do(activeCtx,@@ -601,8 +599,6 @@ func createTestRegistry() *BackupNodesRegistry {timeout: cache_utils.DefaultCacheTimeout,pubsubBackups: cache_utils.NewPubSubManager(),pubsubCompletions: cache_utils.NewPubSubManager(),- runOnce: sync.Once{},- hasRun: atomic.Bool{},}}@@ -732,7 +728,7 @@ func Test_SubscribeNodeForBackupsAssignment_HandlesInvalidJson(t *testing.T) {time.Sleep(100 * time.Millisecond)- ctx := context.Background()+ ctx := t.Context()err = registry.pubsubBackups.Publish(ctx, "backup:submit", "invalid json")assert.NoError(t, err)@@ -978,7 +974,7 @@ func Test_SubscribeForBackupsCompletions_HandlesInvalidJson(t *testing.T) {time.Sleep(100 * time.Millisecond)- ctx := context.Background()+ ctx := t.Context()err = registry.pubsubCompletions.Publish(ctx, "backup:completion", "invalid json")assert.NoError(t, err)@@ -1093,7 +1089,7 @@ func Test_MultipleSubscribers_EachReceivesCompletionMessages(t *testing.T) {receivedAll2 := []uuid.UUID{}receivedAll3 := []uuid.UUID{}- for i := 0; i < 3; i++ {+ for range 3 {select {case received := <-receivedBackups1:receivedAll1 = append(receivedAll1, received)@@ -1102,7 +1098,7 @@ func Test_MultipleSubscribers_EachReceivesCompletionMessages(t *testing.T) {}}- for i := 0; i < 3; i++ {+ for range 3 {select {case received := <-receivedBackups2:receivedAll2 = append(receivedAll2, received)@@ -1111,7 +1107,7 @@ func Test_MultipleSubscribers_EachReceivesCompletionMessages(t *testing.T) {}}- for i := 0; i < 3; i++ {+ for range 3 {select {case received := <-receivedBackups3:receivedAll3 = append(receivedAll3, received)diff --git a/backend/internal/features/backups/backups/backuping/scheduler.go b/backend/internal/features/backups/backups/backuping/scheduler.goindex cb8624ad..732cd57a 100644--- a/backend/internal/features/backups/backups/backuping/scheduler.go+++ b/backend/internal/features/backups/backups/backuping/scheduler.go@@ -4,7 +4,6 @@ import ("context""fmt""log/slog"- "sync""sync/atomic""time"@@ -37,67 +36,60 @@ type BackupsScheduler struct {backupToNodeRelations map[uuid.UUID]BackupToNodeRelationbackuperNode *BackuperNode- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (s *BackupsScheduler) Run(ctx context.Context) {- wasAlreadyRun := s.hasRun.Load()-- s.runOnce.Do(func() {- s.hasRun.Store(true)-- s.lastBackupTime = time.Now().UTC()+ if s.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", s))+ }- if config.GetEnv().IsManyNodesMode {- // wait other nodes to start- time.Sleep(schedulerStartupDelay)- }+ s.lastBackupTime = time.Now().UTC()- if err := s.failBackupsInProgress(); err != nil {- s.logger.Error("Failed to fail backups in progress", "error", err)- panic(err)- }+ if config.GetEnv().IsManyNodesMode {+ // wait other nodes to start+ time.Sleep(schedulerStartupDelay)+ }- err := s.backupNodesRegistry.SubscribeForBackupsCompletions(s.onBackupCompleted)- if err != nil {- s.logger.Error("Failed to subscribe to backup completions", "error", err)- panic(err)- }+ if err := s.failBackupsInProgress(); err != nil {+ s.logger.Error("Failed to fail backups in progress", "error", err)+ panic(err)+ }- defer func() {- if err := s.backupNodesRegistry.UnsubscribeForBackupsCompletions(); err != nil {- s.logger.Error("Failed to unsubscribe from backup completions", "error", err)- }- }()+ err := s.backupNodesRegistry.SubscribeForBackupsCompletions(s.onBackupCompleted)+ if err != nil {+ s.logger.Error("Failed to subscribe to backup completions", "error", err)+ panic(err)+ }- if ctx.Err() != nil {- return+ defer func() {+ if err := s.backupNodesRegistry.UnsubscribeForBackupsCompletions(); err != nil {+ s.logger.Error("Failed to unsubscribe from backup completions", "error", err)}+ }()- ticker := time.NewTicker(schedulerTickerInterval)- defer ticker.Stop()+ if ctx.Err() != nil {+ return+ }- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- if err := s.checkDeadNodesAndFailBackups(); err != nil {- s.logger.Error("Failed to check dead nodes and fail backups", "error", err)- }+ ticker := time.NewTicker(schedulerTickerInterval)+ defer ticker.Stop()- if err := s.runPendingBackups(); err != nil {- s.logger.Error("Failed to run pending backups", "error", err)- }+ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ if err := s.checkDeadNodesAndFailBackups(); err != nil {+ s.logger.Error("Failed to check dead nodes and fail backups", "error", err)+ }- s.lastBackupTime = time.Now().UTC()+ if err := s.runPendingBackups(); err != nil {+ s.logger.Error("Failed to run pending backups", "error", err)}- }- })- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", s))+ s.lastBackupTime = time.Now().UTC()+ }}}diff --git a/backend/internal/features/backups/backups/backuping/testing.go b/backend/internal/features/backups/backups/backuping/testing.goindex 0d2fec71..3ce2e2e1 100644--- a/backend/internal/features/backups/backups/backuping/testing.go+++ b/backend/internal/features/backups/backups/backuping/testing.go@@ -3,7 +3,6 @@ package backupingimport ("context""fmt"- "sync""sync/atomic""testing""time"@@ -44,7 +43,6 @@ func CreateTestBackupCleaner(billingService BillingService) *BackupCleaner {encryption.GetFieldEncryptor(),logger.GetLogger(),[]backups_core.BackupRemoveListener{},- sync.Once{},atomic.Bool{},}}@@ -64,7 +62,6 @@ func CreateTestBackuperNode() *BackuperNode {usecases.GetCreateBackupUsecase(),uuid.New(),time.Time{},- sync.Once{},atomic.Bool{},}}@@ -84,7 +81,6 @@ func CreateTestBackuperNodeWithUseCase(useCase backups_core.CreateBackupUsecase)useCase,uuid.New(),time.Time{},- sync.Once{},atomic.Bool{},}}@@ -101,7 +97,6 @@ func CreateTestScheduler(billingService BillingService) *BackupsScheduler {logger.GetLogger(),make(map[uuid.UUID]BackupToNodeRelation),CreateTestBackuperNode(),- sync.Once{},atomic.Bool{},}}diff --git a/backend/internal/features/backups/backups/download/background.go b/backend/internal/features/backups/backups/download/background.goindex 54e664a4..0f95240d 100644--- a/backend/internal/features/backups/backups/download/background.go+++ b/backend/internal/features/backups/backups/download/background.go@@ -4,7 +4,6 @@ import ("context""fmt""log/slog"- "sync""sync/atomic""time")@@ -13,38 +12,31 @@ type DownloadTokenBackgroundService struct {downloadTokenService *DownloadTokenServicelogger *slog.Logger- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (s *DownloadTokenBackgroundService) Run(ctx context.Context) {- wasAlreadyRun := s.hasRun.Load()+ if s.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", s))+ }- s.runOnce.Do(func() {- s.hasRun.Store(true)+ s.logger.Info("Starting download token cleanup background service")- s.logger.Info("Starting download token cleanup background service")+ if ctx.Err() != nil {+ return+ }- if ctx.Err() != nil {- return- }+ ticker := time.NewTicker(1 * time.Minute)+ defer ticker.Stop()- ticker := time.NewTicker(1 * time.Minute)- defer ticker.Stop()-- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- if err := s.downloadTokenService.CleanExpiredTokens(); err != nil {- s.logger.Error("Failed to clean expired download tokens", "error", err)- }+ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ if err := s.downloadTokenService.CleanExpiredTokens(); err != nil {+ s.logger.Error("Failed to clean expired download tokens", "error", err)}}- })-- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", s))}}diff --git a/backend/internal/features/backups/backups/download/di.go b/backend/internal/features/backups/backups/download/di.goindex 80c72b6e..4161df95 100644--- a/backend/internal/features/backups/backups/download/di.go+++ b/backend/internal/features/backups/backups/download/di.go@@ -1,9 +1,6 @@package backups_downloadimport (- "sync"- "sync/atomic"-"databasus-backend/internal/config"cache_utils "databasus-backend/internal/util/cache""databasus-backend/internal/util/logger"@@ -37,8 +34,6 @@ func init() {downloadTokenBackgroundService = &DownloadTokenBackgroundService{downloadTokenService: downloadTokenService,logger: logger.GetLogger(),- runOnce: sync.Once{},- hasRun: atomic.Bool{},}}diff --git a/backend/internal/features/backups/backups/services/di.go b/backend/internal/features/backups/backups/services/di.goindex a0b5cfca..3094e520 100644--- a/backend/internal/features/backups/backups/services/di.go+++ b/backend/internal/features/backups/backups/services/di.go@@ -2,7 +2,6 @@ package backups_servicesimport ("sync"- "sync/atomic"audit_logs "databasus-backend/internal/features/audit_logs""databasus-backend/internal/features/backups/backups/backuping"@@ -59,26 +58,11 @@ func GetWalService() *PostgreWalBackupService {return walService}-var (- setupOnce sync.Once- isSetup atomic.Bool-)--func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- backups_config.- GetBackupConfigService().- SetDatabaseStorageChangeListener(backupService)+var SetupDependencies = sync.OnceFunc(func() {+ backups_config.+ GetBackupConfigService().+ SetDatabaseStorageChangeListener(backupService)- databases.GetDatabaseService().AddDbRemoveListener(backupService)- databases.GetDatabaseService().AddDbCopyListener(backups_config.GetBackupConfigService())-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+ databases.GetDatabaseService().AddDbRemoveListener(backupService)+ databases.GetDatabaseService().AddDbCopyListener(backups_config.GetBackupConfigService())+})diff --git a/backend/internal/features/backups/config/di.go b/backend/internal/features/backups/config/di.goindex 0626619e..bbf1a12b 100644--- a/backend/internal/features/backups/config/di.go+++ b/backend/internal/features/backups/config/di.go@@ -2,13 +2,11 @@ package backups_configimport ("sync"- "sync/atomic""databasus-backend/internal/features/databases""databasus-backend/internal/features/notifiers""databasus-backend/internal/features/storages"workspaces_services "databasus-backend/internal/features/workspaces/services"- "databasus-backend/internal/util/logger")var (@@ -35,21 +33,6 @@ func GetBackupConfigService() *BackupConfigService {return backupConfigService}-var (- setupOnce sync.Once- isSetup atomic.Bool-)--func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- storages.GetStorageService().SetStorageDatabaseCounter(backupConfigService)-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ storages.GetStorageService().SetStorageDatabaseCounter(backupConfigService)+})diff --git a/backend/internal/features/backups/config/dto.go b/backend/internal/features/backups/config/dto.goindex 46559cf8..4a9d2131 100644--- a/backend/internal/features/backups/config/dto.go+++ b/backend/internal/features/backups/config/dto.go@@ -7,5 +7,5 @@ type TransferDatabaseRequest struct {TargetStorageID *uuid.UUID `json:"targetStorageId,omitempty"`IsTransferWithStorage bool `json:"isTransferWithStorage,omitempty"`IsTransferWithNotifiers bool `json:"isTransferWithNotifiers,omitempty"`- TargetNotifierIDs []uuid.UUID `json:"targetNotifierIds,omitempty"`+ TargetNotifierIDs []uuid.UUID `json:"targetNotifierIds,omitzero"`}diff --git a/backend/internal/features/backups/config/model.go b/backend/internal/features/backups/config/model.goindex bd2bc606..51f483b9 100644--- a/backend/internal/features/backups/config/model.go+++ b/backend/internal/features/backups/config/model.go@@ -28,8 +28,8 @@ type BackupConfig struct {RetentionGfsMonths int `json:"retentionGfsMonths" gorm:"column:retention_gfs_months;type:int;not null;default:0"`RetentionGfsYears int `json:"retentionGfsYears" gorm:"column:retention_gfs_years;type:int;not null;default:0"`- BackupIntervalID uuid.UUID `json:"backupIntervalId" gorm:"column:backup_interval_id;type:uuid;not null"`- BackupInterval *intervals.Interval `json:"backupInterval,omitempty" gorm:"foreignKey:BackupIntervalID"`+ BackupIntervalID uuid.UUID `json:"backupIntervalId" gorm:"column:backup_interval_id;type:uuid;not null"`+ BackupInterval *intervals.Interval `json:"backupInterval,omitzero" gorm:"foreignKey:BackupIntervalID"`Storage *storages.Storage `json:"storage" gorm:"foreignKey:StorageID"`StorageID *uuid.UUID `json:"storageId" gorm:"column:storage_id;type:uuid;"`diff --git a/backend/internal/features/billing/controller_test.go b/backend/internal/features/billing/controller_test.goindex 2257a1f1..4571c455 100644--- a/backend/internal/features/billing/controller_test.go+++ b/backend/internal/features/billing/controller_test.go@@ -584,7 +584,7 @@ func Test_GetInvoices_WithPagination_ReturnsCorrectPage(t *testing.T) {sub := activateSubscriptionViaWebhook(t, router, owner.Token, db.ID, 50)- for i := 0; i < 3; i++ {+ for i := range 3 {invoiceID := fmt.Sprintf("inv-pag-%d-%s", i, uuid.New().String()[:8])evt := makePaymentWebhookEvent(invoiceID, 50, int64(500+i*100))err := billingService.RecordPaymentSuccess(log, sub, evt)diff --git a/backend/internal/features/billing/di.go b/backend/internal/features/billing/di.goindex 64182910..7d40126a 100644--- a/backend/internal/features/billing/di.go+++ b/backend/internal/features/billing/di.go@@ -7,7 +7,6 @@ import (billing_repositories "databasus-backend/internal/features/billing/repositories""databasus-backend/internal/features/databases"workspaces_services "databasus-backend/internal/features/workspaces/services"- "databasus-backend/internal/util/logger")var (@@ -18,13 +17,9 @@ var (nil, // billing provider will be set later to avoid circular dependencyworkspaces_services.GetWorkspaceService(),*databases.GetDatabaseService(),- sync.Once{},atomic.Bool{},}billingController = &BillingController{billingService}-- setupOnce sync.Once- isSetup atomic.Bool)func GetBillingService() *BillingService {@@ -35,15 +30,6 @@ func GetBillingController() *BillingController {return billingController}-func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- databases.GetDatabaseService().AddDbCreationListener(billingService)- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("billing.SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ databases.GetDatabaseService().AddDbCreationListener(billingService)+})diff --git a/backend/internal/features/billing/models/invoice.go b/backend/internal/features/billing/models/invoice.goindex dc03d0d7..03667dc4 100644--- a/backend/internal/features/billing/models/invoice.go+++ b/backend/internal/features/billing/models/invoice.go@@ -15,7 +15,7 @@ type Invoice struct {PeriodStart time.Time `json:"periodStart" gorm:"column:period_start;type:timestamptz;not null"`PeriodEnd time.Time `json:"periodEnd" gorm:"column:period_end;type:timestamptz;not null"`Status InvoiceStatus `json:"status" gorm:"column:status;type:text;not null"`- PaidAt *time.Time `json:"paidAt,omitempty" gorm:"column:paid_at;type:timestamptz"`+ PaidAt *time.Time `json:"paidAt,omitzero" gorm:"column:paid_at;type:timestamptz"`CreatedAt time.Time `json:"createdAt" gorm:"column:created_at;type:timestamptz;not null"`}diff --git a/backend/internal/features/billing/models/subscription.go b/backend/internal/features/billing/models/subscription.goindex 707fc36e..ace1caba 100644--- a/backend/internal/features/billing/models/subscription.go+++ b/backend/internal/features/billing/models/subscription.go@@ -16,11 +16,11 @@ type Subscription struct {StorageGB int `json:"storageGb" gorm:"column:storage_gb;type:int;not null"`PendingStorageGB *int `json:"pendingStorageGb,omitempty" gorm:"column:pending_storage_gb;type:int"`- CurrentPeriodStart time.Time `json:"currentPeriodStart" gorm:"column:current_period_start;type:timestamptz;not null"`- CurrentPeriodEnd time.Time `json:"currentPeriodEnd" gorm:"column:current_period_end;type:timestamptz;not null"`- CanceledAt *time.Time `json:"canceledAt,omitempty" gorm:"column:canceled_at;type:timestamptz"`+ CurrentPeriodStart time.Time `json:"currentPeriodStart" gorm:"column:current_period_start;type:timestamptz;not null"`+ CurrentPeriodEnd time.Time `json:"currentPeriodEnd" gorm:"column:current_period_end;type:timestamptz;not null"`+ CanceledAt *time.Time `json:"canceledAt,omitzero" gorm:"column:canceled_at;type:timestamptz"`- DataRetentionGracePeriodUntil *time.Time `json:"dataRetentionGracePeriodUntil,omitempty" gorm:"column:data_retention_grace_period_until;type:timestamptz"`+ DataRetentionGracePeriodUntil *time.Time `json:"dataRetentionGracePeriodUntil,omitzero" gorm:"column:data_retention_grace_period_until;type:timestamptz"`ProviderName *string `json:"providerName,omitempty" gorm:"column:provider_name;type:text"`ProviderSubID *string `json:"providerSubId,omitempty" gorm:"column:provider_sub_id;type:text"`diff --git a/backend/internal/features/billing/paddle/di.go b/backend/internal/features/billing/paddle/di.goindex e7793fec..a53b40ca 100644--- a/backend/internal/features/billing/paddle/di.go+++ b/backend/internal/features/billing/paddle/di.go@@ -13,46 +13,46 @@ import (var (paddleBillingService *PaddleBillingServicepaddleBillingController *PaddleBillingController- initOnce sync.Once)-func GetPaddleBillingService() *PaddleBillingService {- if !config.GetEnv().IsCloud {- return nil- }-- initOnce.Do(func() {- if config.GetEnv().IsPaddleSandbox {- paddleClient, err := paddle.NewSandbox(config.GetEnv().PaddleApiKey)- if err != nil {- return- }+var initPaddle = sync.OnceFunc(func() {+ if config.GetEnv().IsPaddleSandbox {+ paddleClient, err := paddle.NewSandbox(config.GetEnv().PaddleApiKey)+ if err != nil {+ return+ }- paddleBillingService = &PaddleBillingService{- paddleClient,- paddle.NewWebhookVerifier(config.GetEnv().PaddleWebhookSecret),- config.GetEnv().PaddlePriceID,- billing_webhooks.WebhookRepository{},- billing.GetBillingService(),- }- } else {- paddleClient, err := paddle.New(config.GetEnv().PaddleApiKey)- if err != nil {- return- }+ paddleBillingService = &PaddleBillingService{+ paddleClient,+ paddle.NewWebhookVerifier(config.GetEnv().PaddleWebhookSecret),+ config.GetEnv().PaddlePriceID,+ billing_webhooks.WebhookRepository{},+ billing.GetBillingService(),+ }+ } else {+ paddleClient, err := paddle.New(config.GetEnv().PaddleApiKey)+ if err != nil {+ return+ }- paddleBillingService = &PaddleBillingService{- paddleClient,- paddle.NewWebhookVerifier(config.GetEnv().PaddleWebhookSecret),- config.GetEnv().PaddlePriceID,- billing_webhooks.WebhookRepository{},- billing.GetBillingService(),- }+ paddleBillingService = &PaddleBillingService{+ paddleClient,+ paddle.NewWebhookVerifier(config.GetEnv().PaddleWebhookSecret),+ config.GetEnv().PaddlePriceID,+ billing_webhooks.WebhookRepository{},+ billing.GetBillingService(),}+ }- paddleBillingController = &PaddleBillingController{paddleBillingService}- })+ paddleBillingController = &PaddleBillingController{paddleBillingService}+})++func GetPaddleBillingService() *PaddleBillingService {+ if !config.GetEnv().IsCloud {+ return nil+ }+ initPaddle()return paddleBillingService}diff --git a/backend/internal/features/billing/service.go b/backend/internal/features/billing/service.goindex 6b94b379..de4016fa 100644--- a/backend/internal/features/billing/service.go+++ b/backend/internal/features/billing/service.go@@ -5,7 +5,6 @@ import ("errors""fmt""log/slog"- "sync""sync/atomic""time"@@ -35,57 +34,50 @@ type BillingService struct {workspaceService *workspaces_services.WorkspaceServicedatabaseService databases.DatabaseService- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (s *BillingService) Run(ctx context.Context, logger slog.Logger) {- wasAlreadyRun := s.hasRun.Load()+ if s.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", s))+ }- s.runOnce.Do(func() {- s.hasRun.Store(true)+ ticker := time.NewTicker(billingTickerInterval)+ defer ticker.Stop()- ticker := time.NewTicker(billingTickerInterval)- defer ticker.Stop()+ // Run immediately on start+ expiredSubsLog := logger.With("task_name", "process_expired_subscriptions")+ if err := s.processExpiredSubscriptions(expiredSubsLog); err != nil {+ expiredSubsLog.Error("failed to process expired subscriptions", "error", err)+ }- // Run immediately on start- expiredSubsLog := logger.With("task_name", "process_expired_subscriptions")- if err := s.processExpiredSubscriptions(expiredSubsLog); err != nil {- expiredSubsLog.Error("failed to process expired subscriptions", "error", err)- }+ expiredTrialsLog := logger.With("task_name", "process_expired_trials")+ if err := s.processExpiredTrials(expiredTrialsLog); err != nil {+ expiredTrialsLog.Error("failed to process expired trials", "error", err)+ }- expiredTrialsLog := logger.With("task_name", "process_expired_trials")- if err := s.processExpiredTrials(expiredTrialsLog); err != nil {- expiredTrialsLog.Error("failed to process expired trials", "error", err)- }+ reconcileSubsLog := logger.With("task_name", "reconcile_subscriptions")+ if err := s.reconcileSubscriptions(reconcileSubsLog); err != nil {+ reconcileSubsLog.Error("failed to reconcile subscriptions", "error", err)+ }- reconcileSubsLog := logger.With("task_name", "reconcile_subscriptions")- if err := s.reconcileSubscriptions(reconcileSubsLog); err != nil {- reconcileSubsLog.Error("failed to reconcile subscriptions", "error", err)- }+ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ if err := s.processExpiredSubscriptions(expiredSubsLog); err != nil {+ expiredSubsLog.Error("failed to process expired subscriptions", "error", err)+ }- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- if err := s.processExpiredSubscriptions(expiredSubsLog); err != nil {- expiredSubsLog.Error("failed to process expired subscriptions", "error", err)- }-- if err := s.processExpiredTrials(expiredTrialsLog); err != nil {- expiredTrialsLog.Error("failed to process expired trials", "error", err)- }-- if err := s.reconcileSubscriptions(reconcileSubsLog); err != nil {- reconcileSubsLog.Error("failed to reconcile subscriptions", "error", err)- }+ if err := s.processExpiredTrials(expiredTrialsLog); err != nil {+ expiredTrialsLog.Error("failed to process expired trials", "error", err)}- }- })- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", s))+ if err := s.reconcileSubscriptions(reconcileSubsLog); err != nil {+ reconcileSubsLog.Error("failed to reconcile subscriptions", "error", err)+ }+ }}}diff --git a/backend/internal/features/databases/databases/mariadb/model_test.go b/backend/internal/features/databases/databases/mariadb/model_test.goindex 96f6bc60..e1d699da 100644--- a/backend/internal/features/databases/databases/mariadb/model_test.go+++ b/backend/internal/features/databases/databases/mariadb/model_test.go@@ -1,7 +1,6 @@package mariadbimport (- "context""fmt""log/slog""os"@@ -212,7 +211,7 @@ func Test_IsUserReadOnly_AdminUser_ReturnsFalse(t *testing.T) {mariadbModel := createMariadbModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()isReadOnly, privileges, err := mariadbModel.IsUserReadOnly(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -241,7 +240,7 @@ func Test_IsUserReadOnly_ReadOnlyUser_ReturnsTrue(t *testing.T) {mariadbModel := createMariadbModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mariadbModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -313,7 +312,7 @@ func Test_CreateReadOnlyUser_UserCanReadButNotWrite(t *testing.T) {mariadbModel := createMariadbModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mariadbModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -390,7 +389,7 @@ func Test_ReadOnlyUser_FutureTables_NoSelectPermission(t *testing.T) {mariadbModel := createMariadbModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mariadbModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -466,7 +465,7 @@ func Test_CreateReadOnlyUser_DatabaseNameWithDash_Success(t *testing.T) {}logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mariadbModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -511,7 +510,7 @@ func Test_ReadOnlyUser_CannotDropOrAlterTables(t *testing.T) {mariadbModel := createMariadbModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mariadbModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)diff --git a/backend/internal/features/databases/databases/mongodb/model_test.go b/backend/internal/features/databases/databases/mongodb/model_test.goindex 53c57344..64bb8097 100644--- a/backend/internal/features/databases/databases/mongodb/model_test.go+++ b/backend/internal/features/databases/databases/mongodb/model_test.go@@ -42,9 +42,9 @@ func Test_TestConnection_InsufficientPermissions_ReturnsError(t *testing.T) {t.Parallel()container := connectToMongodbContainer(t, tc.port, tc.version)- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())- ctx := context.Background()+ ctx := t.Context()db := container.Client.Database(container.Database)_ = db.Collection("permission_test").Drop(ctx)@@ -108,9 +108,9 @@ func Test_TestConnection_SufficientPermissions_Success(t *testing.T) {t.Parallel()container := connectToMongodbContainer(t, tc.port, tc.version)- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())- ctx := context.Background()+ ctx := t.Context()db := container.Client.Database(container.Database)_ = db.Collection("backup_test").Drop(ctx)@@ -178,11 +178,11 @@ func Test_IsUserReadOnly_AdminUser_ReturnsFalse(t *testing.T) {t.Parallel()container := connectToMongodbContainer(t, tc.port, tc.version)- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())mongodbModel := createMongodbModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()isReadOnly, roles, err := mongodbModel.IsUserReadOnly(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -195,9 +195,9 @@ func Test_IsUserReadOnly_AdminUser_ReturnsFalse(t *testing.T) {func Test_IsUserReadOnly_ReadOnlyUser_ReturnsTrue(t *testing.T) {env := config.GetEnv()container := connectToMongodbContainer(t, env.TestMongodb70Port, tools.MongodbVersion7)- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())- ctx := context.Background()+ ctx := t.Context()db := container.Client.Database(container.Database)_ = db.Collection("readonly_check_test").Drop(ctx)@@ -251,15 +251,15 @@ func Test_CreateReadOnlyUser_UserCanReadButNotWrite(t *testing.T) {t.Parallel()container := connectToMongodbContainer(t, tc.port, tc.version)- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())- ctx := context.Background()+ ctx := t.Context()db := container.Client.Database(container.Database)_ = db.Collection("readonly_test").Drop(ctx)_ = db.Collection("hack_collection").Drop(ctx)- _, err := db.Collection("readonly_test").InsertMany(ctx, []interface{}{+ _, err := db.Collection("readonly_test").InsertMany(ctx, []any{bson.M{"data": "test1"},bson.M{"data": "test2"},})@@ -317,9 +317,9 @@ func Test_CreateReadOnlyUser_UserCanReadButNotWrite(t *testing.T) {func Test_ReadOnlyUser_FutureCollections_CanSelect(t *testing.T) {env := config.GetEnv()container := connectToMongodbContainer(t, env.TestMongodb70Port, tools.MongodbVersion7)- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())- ctx := context.Background()+ ctx := t.Context()db := container.Client.Database(container.Database)mongodbModel := createMongodbModel(container)@@ -348,9 +348,9 @@ func Test_ReadOnlyUser_FutureCollections_CanSelect(t *testing.T) {func Test_ReadOnlyUser_CannotDropOrModifyCollections(t *testing.T) {env := config.GetEnv()container := connectToMongodbContainer(t, env.TestMongodb70Port, tools.MongodbVersion7)- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())- ctx := context.Background()+ ctx := t.Context()db := container.Client.Database(container.Database)_ = db.Collection("drop_test").Drop(ctx)@@ -420,7 +420,7 @@ func connectToMongodbContainer(authDatabase,)- ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)+ ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)defer cancel()clientOptions := options.Client().ApplyURI(uri)@@ -473,7 +473,7 @@ func connectWithCredentials(container.Database, container.AuthDatabase,)- ctx := context.Background()+ ctx := t.Context()clientOptions := options.Client().ApplyURI(uri)client, err := mongo.Connect(ctx, clientOptions)assert.NoError(t, err)diff --git a/backend/internal/features/databases/databases/mysql/model_test.go b/backend/internal/features/databases/databases/mysql/model_test.goindex 68127a61..0d0ee9ed 100644--- a/backend/internal/features/databases/databases/mysql/model_test.go+++ b/backend/internal/features/databases/databases/mysql/model_test.go@@ -1,7 +1,6 @@package mysqlimport (- "context""fmt""log/slog""os"@@ -231,7 +230,7 @@ func Test_IsUserReadOnly_AdminUser_ReturnsFalse(t *testing.T) {mysqlModel := createMysqlModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()isReadOnly, privileges, err := mysqlModel.IsUserReadOnly(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -260,7 +259,7 @@ func Test_IsUserReadOnly_ReadOnlyUser_ReturnsTrue(t *testing.T) {mysqlModel := createMysqlModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mysqlModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -326,7 +325,7 @@ func Test_CreateReadOnlyUser_UserCanReadButNotWrite(t *testing.T) {mysqlModel := createMysqlModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mysqlModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -400,7 +399,7 @@ func Test_ReadOnlyUser_FutureTables_NoSelectPermission(t *testing.T) {mysqlModel := createMysqlModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mysqlModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -477,7 +476,7 @@ func Test_CreateReadOnlyUser_DatabaseNameWithDash_Success(t *testing.T) {}logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mysqlModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -523,7 +522,7 @@ func Test_ReadOnlyUser_CannotDropOrAlterTables(t *testing.T) {mysqlModel := createMysqlModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := mysqlModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)diff --git a/backend/internal/features/databases/databases/postgresql/model_test.go b/backend/internal/features/databases/databases/postgresql/model_test.goindex 0eb4c40a..2476cf71 100644--- a/backend/internal/features/databases/databases/postgresql/model_test.go+++ b/backend/internal/features/databases/databases/postgresql/model_test.go@@ -1,7 +1,6 @@package postgresqlimport (- "context""fmt""log/slog""os"@@ -267,7 +266,7 @@ func Test_IsUserReadOnly_AdminUser_ReturnsFalse(t *testing.T) {pgModel := createPostgresModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()isReadOnly, privileges, err := pgModel.IsUserReadOnly(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -294,7 +293,7 @@ func Test_IsUserReadOnly_ReadOnlyUser_ReturnsTrue(t *testing.T) {pgModel := createPostgresModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := pgModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -359,7 +358,7 @@ func Test_CreateReadOnlyUser_UserCanReadButNotWrite(t *testing.T) {pgModel := createPostgresModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := pgModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -438,7 +437,7 @@ func Test_ReadOnlyUser_FutureTables_HaveSelectPermission(t *testing.T) {pgModel := createPostgresModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := pgModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -491,7 +490,7 @@ func Test_ReadOnlyUser_MultipleSchemas_AllAccessible(t *testing.T) {pgModel := createPostgresModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := pgModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -566,7 +565,7 @@ func Test_CreateReadOnlyUser_DatabaseNameWithDash_Success(t *testing.T) {}logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := pgModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -653,7 +652,7 @@ func Test_CreateReadOnlyUser_Supabase_UserCanReadButNotWrite(t *testing.T) {}logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()connectionUsername, newPassword, err := pgModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -743,7 +742,7 @@ func Test_CreateReadOnlyUser_WithPublicSchema_Success(t *testing.T) {pgModel := createPostgresModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := pgModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err)@@ -851,7 +850,7 @@ func Test_CreateReadOnlyUser_WithoutPublicSchema_Success(t *testing.T) {pgModel := createPostgresModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := pgModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.NoError(t, err, "CreateReadOnlyUser should succeed without public schema")@@ -1018,7 +1017,7 @@ func Test_CreateReadOnlyUser_PublicSchemaExistsButNoPermissions_ReturnsError(t *}logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()username, password, err := pgModel.CreateReadOnlyUser(ctx, logger, nil, uuid.New())assert.Error(@@ -1435,7 +1434,7 @@ func Test_CreateReadOnlyUser_TablesCreatedByDifferentUser_ReadOnlyUserCanRead(t// At this point, user_creator already owns objects, so ALTER DEFAULT PRIVILEGES FOR ROLE should applypgModel := createPostgresModel(container)logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()readonlyUsername, readonlyPassword, err := pgModel.CreateReadOnlyUser(ctx,@@ -1602,7 +1601,7 @@ func Test_CreateReadOnlyUser_WithIncludeSchemas_OnlyGrantsAccessToSpecifiedSchempgModel.IncludeSchemas = []string{"public", "included_schema"}logger := slog.New(slog.NewTextHandler(os.Stdout, nil))- ctx := context.Background()+ ctx := t.Context()readonlyUsername, readonlyPassword, err := pgModel.CreateReadOnlyUser(ctx,diff --git a/backend/internal/features/databases/di.go b/backend/internal/features/databases/di.goindex 870c3a6e..4dec3b45 100644--- a/backend/internal/features/databases/di.go+++ b/backend/internal/features/databases/di.go@@ -2,7 +2,6 @@ package databasesimport ("sync"- "sync/atomic"audit_logs "databasus-backend/internal/features/audit_logs""databasus-backend/internal/features/notifiers"@@ -40,22 +39,7 @@ func GetDatabaseController() *DatabaseController {return databaseController}-var (- setupOnce sync.Once- isSetup atomic.Bool-)--func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- workspaces_services.GetWorkspaceService().AddWorkspaceDeletionListener(databaseService)- notifiers.GetNotifierService().SetNotifierDatabaseCounter(databaseService)-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ workspaces_services.GetWorkspaceService().AddWorkspaceDeletionListener(databaseService)+ notifiers.GetNotifierService().SetNotifierDatabaseCounter(databaseService)+})diff --git a/backend/internal/features/databases/model.go b/backend/internal/features/databases/model.goindex 0e8f0120..f13e7a7b 100644--- a/backend/internal/features/databases/model.go+++ b/backend/internal/features/databases/model.go@@ -25,16 +25,16 @@ type Database struct {Name string `json:"name" gorm:"column:name;type:text;not null"`Type DatabaseType `json:"type" gorm:"column:type;type:text;not null"`- Postgresql *postgresql.PostgresqlDatabase `json:"postgresql,omitempty" gorm:"foreignKey:DatabaseID"`- Mysql *mysql.MysqlDatabase `json:"mysql,omitempty" gorm:"foreignKey:DatabaseID"`- Mariadb *mariadb.MariadbDatabase `json:"mariadb,omitempty" gorm:"foreignKey:DatabaseID"`- Mongodb *mongodb.MongodbDatabase `json:"mongodb,omitempty" gorm:"foreignKey:DatabaseID"`+ Postgresql *postgresql.PostgresqlDatabase `json:"postgresql,omitzero" gorm:"foreignKey:DatabaseID"`+ Mysql *mysql.MysqlDatabase `json:"mysql,omitzero" gorm:"foreignKey:DatabaseID"`+ Mariadb *mariadb.MariadbDatabase `json:"mariadb,omitzero" gorm:"foreignKey:DatabaseID"`+ Mongodb *mongodb.MongodbDatabase `json:"mongodb,omitzero" gorm:"foreignKey:DatabaseID"`Notifiers []notifiers.Notifier `json:"notifiers" gorm:"many2many:database_notifiers;"`// these fields are not reliable, but// they are used for pretty UI- LastBackupTime *time.Time `json:"lastBackupTime,omitempty" gorm:"column:last_backup_time;type:timestamp with time zone"`+ LastBackupTime *time.Time `json:"lastBackupTime,omitzero" gorm:"column:last_backup_time;type:timestamp with time zone"`LastBackupErrorMessage *string `json:"lastBackupErrorMessage,omitempty" gorm:"column:last_backup_error_message;type:text"`HealthStatus *HealthStatus `json:"healthStatus" gorm:"column:health_status;type:text;not null"`diff --git a/backend/internal/features/healthcheck/attempt/background_service.go b/backend/internal/features/healthcheck/attempt/background_service.goindex dda0d105..c809ba5f 100644--- a/backend/internal/features/healthcheck/attempt/background_service.go+++ b/backend/internal/features/healthcheck/attempt/background_service.go@@ -4,7 +4,6 @@ import ("context""fmt""log/slog"- "sync""sync/atomic""time"@@ -16,33 +15,27 @@ type HealthcheckAttemptBackgroundService struct {checkDatabaseHealthUseCase *CheckDatabaseHealthUseCaselogger *slog.Logger- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (s *HealthcheckAttemptBackgroundService) Run(ctx context.Context) {- wasAlreadyRun := s.hasRun.Load()+ if s.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", s))+ }- s.runOnce.Do(func() {- s.hasRun.Store(true)+ // first healthcheck immediately+ s.checkDatabases()- // first healthcheck immediately- s.checkDatabases()+ ticker := time.NewTicker(time.Minute)+ defer ticker.Stop()- ticker := time.NewTicker(time.Minute)- defer ticker.Stop()- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- s.checkDatabases()- }+ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ s.checkDatabases()}- })-- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", s))}}diff --git a/backend/internal/features/healthcheck/attempt/di.go b/backend/internal/features/healthcheck/attempt/di.goindex f1d8d151..381874c7 100644--- a/backend/internal/features/healthcheck/attempt/di.go+++ b/backend/internal/features/healthcheck/attempt/di.go@@ -1,9 +1,6 @@package healthcheck_attemptimport (- "sync"- "sync/atomic"-"databasus-backend/internal/features/databases"healthcheck_config "databasus-backend/internal/features/healthcheck/config""databasus-backend/internal/features/notifiers"@@ -30,8 +27,6 @@ var healthcheckAttemptBackgroundService = &HealthcheckAttemptBackgroundService{healthcheckConfigService: healthcheck_config.GetHealthcheckConfigService(),checkDatabaseHealthUseCase: checkDatabaseHealthUseCase,logger: logger.GetLogger(),- runOnce: sync.Once{},- hasRun: atomic.Bool{},}var healthcheckAttemptController = &HealthcheckAttemptController{diff --git a/backend/internal/features/healthcheck/config/di.go b/backend/internal/features/healthcheck/config/di.goindex bb2a4a62..b205027c 100644--- a/backend/internal/features/healthcheck/config/di.go+++ b/backend/internal/features/healthcheck/config/di.go@@ -2,7 +2,6 @@ package healthcheck_configimport ("sync"- "sync/atomic""databasus-backend/internal/features/audit_logs""databasus-backend/internal/features/databases"@@ -33,23 +32,8 @@ func GetHealthcheckConfigController() *HealthcheckConfigController {return healthcheckConfigController}-var (- setupOnce sync.Once- isSetup atomic.Bool-)--func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- databases.- GetDatabaseService().- AddDbCreationListener(healthcheckConfigService)-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ databases.+ GetDatabaseService().+ AddDbCreationListener(healthcheckConfigService)+})diff --git a/backend/internal/features/notifiers/di.go b/backend/internal/features/notifiers/di.goindex c86f02a6..eefd8886 100644--- a/backend/internal/features/notifiers/di.go+++ b/backend/internal/features/notifiers/di.go@@ -2,7 +2,6 @@ package notifiersimport ("sync"- "sync/atomic"audit_logs "databasus-backend/internal/features/audit_logs"workspaces_services "databasus-backend/internal/features/workspaces/services"@@ -39,21 +38,6 @@ func GetNotifierRepository() *NotifierRepository {return notifierRepository}-var (- setupOnce sync.Once- isSetup atomic.Bool-)--func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- workspaces_services.GetWorkspaceService().AddWorkspaceDeletionListener(notifierService)-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ workspaces_services.GetWorkspaceService().AddWorkspaceDeletionListener(notifierService)+})diff --git a/backend/internal/features/notifiers/model.go b/backend/internal/features/notifiers/model.goindex 1aa9d3d6..bd636d9a 100644--- a/backend/internal/features/notifiers/model.go+++ b/backend/internal/features/notifiers/model.go@@ -23,12 +23,12 @@ type Notifier struct {LastSendError *string `json:"lastSendError" gorm:"column:last_send_error;type:text"`// specific notifier- TelegramNotifier *telegram_notifier.TelegramNotifier `json:"telegramNotifier" gorm:"foreignKey:NotifierID"`- EmailNotifier *email_notifier.EmailNotifier `json:"emailNotifier" gorm:"foreignKey:NotifierID"`- WebhookNotifier *webhook_notifier.WebhookNotifier `json:"webhookNotifier" gorm:"foreignKey:NotifierID"`- SlackNotifier *slack_notifier.SlackNotifier `json:"slackNotifier" gorm:"foreignKey:NotifierID"`- DiscordNotifier *discord_notifier.DiscordNotifier `json:"discordNotifier" gorm:"foreignKey:NotifierID"`- TeamsNotifier *teams_notifier.TeamsNotifier `json:"teamsNotifier,omitempty" gorm:"foreignKey:NotifierID;constraint:OnDelete:CASCADE"`+ TelegramNotifier *telegram_notifier.TelegramNotifier `json:"telegramNotifier" gorm:"foreignKey:NotifierID"`+ EmailNotifier *email_notifier.EmailNotifier `json:"emailNotifier" gorm:"foreignKey:NotifierID"`+ WebhookNotifier *webhook_notifier.WebhookNotifier `json:"webhookNotifier" gorm:"foreignKey:NotifierID"`+ SlackNotifier *slack_notifier.SlackNotifier `json:"slackNotifier" gorm:"foreignKey:NotifierID"`+ DiscordNotifier *discord_notifier.DiscordNotifier `json:"discordNotifier" gorm:"foreignKey:NotifierID"`+ TeamsNotifier *teams_notifier.TeamsNotifier `json:"teamsNotifier,omitzero" gorm:"foreignKey:NotifierID;constraint:OnDelete:CASCADE"`}func (n *Notifier) TableName() string {diff --git a/backend/internal/features/notifiers/models/teams/model.go b/backend/internal/features/notifiers/models/teams/model.goindex c75933ea..9f925a78 100644--- a/backend/internal/features/notifiers/models/teams/model.go+++ b/backend/internal/features/notifiers/models/teams/model.go@@ -49,7 +49,7 @@ type cardAttachment struct {type payload struct {Title string `json:"title"`Text string `json:"text"`- Attachments []cardAttachment `json:"attachments,omitempty"`+ Attachments []cardAttachment `json:"attachments,omitzero"`}func (n *TeamsNotifier) Send(diff --git a/backend/internal/features/restores/controller_test.go b/backend/internal/features/restores/controller_test.goindex 9663dbe6..8a90b161 100644--- a/backend/internal/features/restores/controller_test.go+++ b/backend/internal/features/restores/controller_test.go@@ -462,7 +462,7 @@ func Test_CancelRestore_InProgressRestore_SuccessfullyCancelled(t *testing.T) {},}- var restoreResponse map[string]interface{}+ var restoreResponse map[string]anytest_utils.MakePostRequestAndUnmarshal(t,router,diff --git a/backend/internal/features/restores/di.go b/backend/internal/features/restores/di.goindex d9e05d16..f2ea1a47 100644--- a/backend/internal/features/restores/di.go+++ b/backend/internal/features/restores/di.go@@ -2,7 +2,6 @@ package restoresimport ("sync"- "sync/atomic"audit_logs "databasus-backend/internal/features/audit_logs""databasus-backend/internal/features/backups/backups/backuping"@@ -45,22 +44,7 @@ func GetRestoreController() *RestoreController {return restoreController}-var (- setupOnce sync.Once- isSetup atomic.Bool-)--func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- backups_services.GetBackupService().AddBackupRemoveListener(restoreService)- backuping.GetBackupCleaner().AddBackupRemoveListener(restoreService)-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ backups_services.GetBackupService().AddBackupRemoveListener(restoreService)+ backuping.GetBackupCleaner().AddBackupRemoveListener(restoreService)+})diff --git a/backend/internal/features/restores/restoring/di.go b/backend/internal/features/restores/restoring/di.goindex c2000acd..facafb50 100644--- a/backend/internal/features/restores/restoring/di.go+++ b/backend/internal/features/restores/restoring/di.go@@ -1,7 +1,6 @@package restoringimport (- "sync""sync/atomic""time"@@ -27,8 +26,6 @@ var restoreNodesRegistry = &RestoreNodesRegistry{timeout: cache_utils.DefaultCacheTimeout,pubsubRestores: cache_utils.NewPubSubManager(),pubsubCompletions: cache_utils.NewPubSubManager(),- runOnce: sync.Once{},- hasRun: atomic.Bool{},}var restoreDatabaseCache = cache_utils.NewCacheUtil[RestoreDatabaseCache](@@ -52,7 +49,6 @@ var restorerNode = &RestorerNode{restoreDatabaseCache,restoreCancelManager,time.Time{},- sync.Once{},atomic.Bool{},}@@ -68,7 +64,6 @@ var restoresScheduler = &RestoresScheduler{restorerNode,restoreDatabaseCache,uuid.Nil,- sync.Once{},atomic.Bool{},}diff --git a/backend/internal/features/restores/restoring/dto.go b/backend/internal/features/restores/restoring/dto.goindex fb17e701..e1a6d550 100644--- a/backend/internal/features/restores/restoring/dto.go+++ b/backend/internal/features/restores/restoring/dto.go@@ -12,10 +12,10 @@ import ()type RestoreDatabaseCache struct {- PostgresqlDatabase *postgresql.PostgresqlDatabase `json:"postgresqlDatabase,omitempty"`- MysqlDatabase *mysql.MysqlDatabase `json:"mysqlDatabase,omitempty"`- MariadbDatabase *mariadb.MariadbDatabase `json:"mariadbDatabase,omitempty"`- MongodbDatabase *mongodb.MongodbDatabase `json:"mongodbDatabase,omitempty"`+ PostgresqlDatabase *postgresql.PostgresqlDatabase `json:"postgresqlDatabase,omitzero"`+ MysqlDatabase *mysql.MysqlDatabase `json:"mysqlDatabase,omitzero"`+ MariadbDatabase *mariadb.MariadbDatabase `json:"mariadbDatabase,omitzero"`+ MongodbDatabase *mongodb.MongodbDatabase `json:"mongodbDatabase,omitzero"`}type RestoreToNodeRelation struct {diff --git a/backend/internal/features/restores/restoring/registry.go b/backend/internal/features/restores/restoring/registry.goindex 950dfc06..ffc095d2 100644--- a/backend/internal/features/restores/restoring/registry.go+++ b/backend/internal/features/restores/restoring/registry.go@@ -6,7 +6,6 @@ import ("fmt""log/slog""strings"- "sync""sync/atomic""time"@@ -50,36 +49,30 @@ type RestoreNodesRegistry struct {pubsubRestores *cache_utils.PubSubManagerpubsubCompletions *cache_utils.PubSubManager- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (r *RestoreNodesRegistry) Run(ctx context.Context) {- wasAlreadyRun := r.hasRun.Load()+ if r.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", r))+ }- r.runOnce.Do(func() {- r.hasRun.Store(true)+ if err := r.cleanupDeadNodes(); err != nil {+ r.logger.Error("Failed to cleanup dead nodes on startup", "error", err)+ }- if err := r.cleanupDeadNodes(); err != nil {- r.logger.Error("Failed to cleanup dead nodes on startup", "error", err)- }+ ticker := time.NewTicker(cleanupTickerInterval)+ defer ticker.Stop()- ticker := time.NewTicker(cleanupTickerInterval)- defer ticker.Stop()- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- if err := r.cleanupDeadNodes(); err != nil {- r.logger.Error("Failed to cleanup dead nodes", "error", err)- }+ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ if err := r.cleanupDeadNodes(); err != nil {+ r.logger.Error("Failed to cleanup dead nodes", "error", err)}}- })-- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", r))}}diff --git a/backend/internal/features/restores/restoring/registry_test.go b/backend/internal/features/restores/restoring/registry_test.goindex 653b4915..0c2fd9dc 100644--- a/backend/internal/features/restores/restoring/registry_test.go+++ b/backend/internal/features/restores/restoring/registry_test.go@@ -4,8 +4,6 @@ import ("context""encoding/json""fmt"- "sync"- "sync/atomic""testing""time"@@ -322,7 +320,7 @@ func Test_GetAvailableNodes_SkipsInvalidJsonData(t *testing.T) {err := registry.HearthbeatNodeInRegistry(time.Now().UTC(), node)assert.NoError(t, err)- ctx, cancel := context.WithTimeout(context.Background(), registry.timeout)+ ctx, cancel := context.WithTimeout(t.Context(), registry.timeout)defer cancel()invalidKey := nodeInfoKeyPrefix + uuid.New().String() + nodeInfoKeySuffix@@ -331,7 +329,7 @@ func Test_GetAvailableNodes_SkipsInvalidJsonData(t *testing.T) {registry.client.B().Set().Key(invalidKey).Value("invalid json data").Build(),)defer func() {- cleanupCtx, cleanupCancel := context.WithTimeout(context.Background(), registry.timeout)+ cleanupCtx, cleanupCancel := context.WithTimeout(t.Context(), registry.timeout)defer cleanupCancel()registry.client.Do(cleanupCtx, registry.client.B().Del().Key(invalidKey).Build())}()@@ -401,7 +399,7 @@ func Test_GetAvailableNodes_ExcludesStaleNodesFromCache(t *testing.T) {err = registry.HearthbeatNodeInRegistry(time.Now().UTC(), node3)assert.NoError(t, err)- ctx, cancel := context.WithTimeout(context.Background(), registry.timeout)+ ctx, cancel := context.WithTimeout(t.Context(), registry.timeout)defer cancel()key := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node2.ID.String(), nodeInfoKeySuffix)@@ -419,7 +417,7 @@ func Test_GetAvailableNodes_ExcludesStaleNodesFromCache(t *testing.T) {modifiedData, err := json.Marshal(node)assert.NoError(t, err)- setCtx, setCancel := context.WithTimeout(context.Background(), registry.timeout)+ setCtx, setCancel := context.WithTimeout(t.Context(), registry.timeout)defer setCancel()setResult := registry.client.Do(setCtx,@@ -464,7 +462,7 @@ func Test_GetRestoreNodesStats_ExcludesStaleNodesFromCache(t *testing.T) {err = registry.IncrementRestoresInProgress(node3.ID)assert.NoError(t, err)- ctx, cancel := context.WithTimeout(context.Background(), registry.timeout)+ ctx, cancel := context.WithTimeout(t.Context(), registry.timeout)defer cancel()key := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node2.ID.String(), nodeInfoKeySuffix)@@ -482,7 +480,7 @@ func Test_GetRestoreNodesStats_ExcludesStaleNodesFromCache(t *testing.T) {modifiedData, err := json.Marshal(node)assert.NoError(t, err)- setCtx, setCancel := context.WithTimeout(context.Background(), registry.timeout)+ setCtx, setCancel := context.WithTimeout(t.Context(), registry.timeout)defer setCancel()setResult := registry.client.Do(setCtx,@@ -524,7 +522,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {err = registry.IncrementRestoresInProgress(node2.ID)assert.NoError(t, err)- ctx, cancel := context.WithTimeout(context.Background(), registry.timeout)+ ctx, cancel := context.WithTimeout(t.Context(), registry.timeout)defer cancel()key := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node2.ID.String(), nodeInfoKeySuffix)@@ -542,7 +540,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {modifiedData, err := json.Marshal(node)assert.NoError(t, err)- setCtx, setCancel := context.WithTimeout(context.Background(), registry.timeout)+ setCtx, setCancel := context.WithTimeout(t.Context(), registry.timeout)defer setCancel()setResult := registry.client.Do(setCtx,@@ -553,7 +551,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {err = registry.cleanupDeadNodes()assert.NoError(t, err)- checkCtx, checkCancel := context.WithTimeout(context.Background(), registry.timeout)+ checkCtx, checkCancel := context.WithTimeout(t.Context(), registry.timeout)defer checkCancel()infoKey := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node2.ID.String(), nodeInfoKeySuffix)@@ -566,7 +564,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {node2.ID.String(),nodeActiveRestoresSuffix,)- counterCtx, counterCancel := context.WithTimeout(context.Background(), registry.timeout)+ counterCtx, counterCancel := context.WithTimeout(t.Context(), registry.timeout)defer counterCancel()counterResult := registry.client.Do(counterCtx,@@ -575,7 +573,7 @@ func Test_CleanupDeadNodes_RemovesNodeInfoAndCounter(t *testing.T) {assert.Error(t, counterResult.Error())activeInfoKey := fmt.Sprintf("%s%s%s", nodeInfoKeyPrefix, node1.ID.String(), nodeInfoKeySuffix)- activeCtx, activeCancel := context.WithTimeout(context.Background(), registry.timeout)+ activeCtx, activeCancel := context.WithTimeout(t.Context(), registry.timeout)defer activeCancel()activeResult := registry.client.Do(activeCtx,@@ -601,8 +599,6 @@ func createTestRegistry() *RestoreNodesRegistry {timeout: cache_utils.DefaultCacheTimeout,pubsubRestores: cache_utils.NewPubSubManager(),pubsubCompletions: cache_utils.NewPubSubManager(),- runOnce: sync.Once{},- hasRun: atomic.Bool{},}}@@ -734,7 +730,7 @@ func Test_SubscribeNodeForRestoresAssignment_HandlesInvalidJson(t *testing.T) {time.Sleep(100 * time.Millisecond)- ctx := context.Background()+ ctx := t.Context()err = registry.pubsubRestores.Publish(ctx, "restore:submit", "invalid json")assert.NoError(t, err)@@ -980,7 +976,7 @@ func Test_SubscribeForRestoresCompletions_HandlesInvalidJson(t *testing.T) {time.Sleep(100 * time.Millisecond)- ctx := context.Background()+ ctx := t.Context()err = registry.pubsubCompletions.Publish(ctx, "restore:completion", "invalid json")assert.NoError(t, err)@@ -1095,7 +1091,7 @@ func Test_MultipleSubscribers_EachReceivesCompletionMessages(t *testing.T) {receivedAll2 := []uuid.UUID{}receivedAll3 := []uuid.UUID{}- for i := 0; i < 3; i++ {+ for range 3 {select {case received := <-receivedRestores1:receivedAll1 = append(receivedAll1, received)@@ -1104,7 +1100,7 @@ func Test_MultipleSubscribers_EachReceivesCompletionMessages(t *testing.T) {}}- for i := 0; i < 3; i++ {+ for range 3 {select {case received := <-receivedRestores2:receivedAll2 = append(receivedAll2, received)@@ -1113,7 +1109,7 @@ func Test_MultipleSubscribers_EachReceivesCompletionMessages(t *testing.T) {}}- for i := 0; i < 3; i++ {+ for range 3 {select {case received := <-receivedRestores3:receivedAll3 = append(receivedAll3, received)diff --git a/backend/internal/features/restores/restoring/restorer.go b/backend/internal/features/restores/restoring/restorer.goindex 1ad89cc9..8859bed3 100644--- a/backend/internal/features/restores/restoring/restorer.go+++ b/backend/internal/features/restores/restoring/restorer.go@@ -6,7 +6,6 @@ import ("fmt""log/slog""strings"- "sync""sync/atomic""time"@@ -45,80 +44,73 @@ type RestorerNode struct {lastHeartbeat time.Time- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (n *RestorerNode) Run(ctx context.Context) {- wasAlreadyRun := n.hasRun.Load()-- n.runOnce.Do(func() {- n.hasRun.Store(true)+ if n.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", n))+ }- n.lastHeartbeat = time.Now().UTC()+ n.lastHeartbeat = time.Now().UTC()- throughputMBs := config.GetEnv().NodeNetworkThroughputMBs+ throughputMBs := config.GetEnv().NodeNetworkThroughputMBs- restoreNode := RestoreNode{- ID: n.nodeID,- ThroughputMBs: throughputMBs,- }+ restoreNode := RestoreNode{+ ID: n.nodeID,+ ThroughputMBs: throughputMBs,+ }- if err := n.restoreNodesRegistry.HearthbeatNodeInRegistry(time.Now().UTC(), restoreNode); err != nil {- n.logger.Error("Failed to register node in registry", "error", err)- panic(err)- }+ if err := n.restoreNodesRegistry.HearthbeatNodeInRegistry(time.Now().UTC(), restoreNode); err != nil {+ n.logger.Error("Failed to register node in registry", "error", err)+ panic(err)+ }- restoreHandler := func(restoreID uuid.UUID, isCallNotifier bool) {- n.MakeRestore(restoreID)- if err := n.restoreNodesRegistry.PublishRestoreCompletion(n.nodeID, restoreID); err != nil {- n.logger.Error(- "Failed to publish restore completion",- "error",- err,- "restoreID",- restoreID,- )- }+ restoreHandler := func(restoreID uuid.UUID, isCallNotifier bool) {+ n.MakeRestore(restoreID)+ if err := n.restoreNodesRegistry.PublishRestoreCompletion(n.nodeID, restoreID); err != nil {+ n.logger.Error(+ "Failed to publish restore completion",+ "error",+ err,+ "restoreID",+ restoreID,+ )}+ }- err := n.restoreNodesRegistry.SubscribeNodeForRestoresAssignment(- n.nodeID,- restoreHandler,- )- if err != nil {- n.logger.Error("Failed to subscribe to restore assignments", "error", err)- panic(err)+ err := n.restoreNodesRegistry.SubscribeNodeForRestoresAssignment(+ n.nodeID,+ restoreHandler,+ )+ if err != nil {+ n.logger.Error("Failed to subscribe to restore assignments", "error", err)+ panic(err)+ }+ defer func() {+ if err := n.restoreNodesRegistry.UnsubscribeNodeForRestoresAssignments(); err != nil {+ n.logger.Error("Failed to unsubscribe from restore assignments", "error", err)}- defer func() {- if err := n.restoreNodesRegistry.UnsubscribeNodeForRestoresAssignments(); err != nil {- n.logger.Error("Failed to unsubscribe from restore assignments", "error", err)- }- }()-- ticker := time.NewTicker(heartbeatTickerInterval)- defer ticker.Stop()+ }()- n.logger.Info("Restore node started", "nodeID", n.nodeID, "throughput", throughputMBs)+ ticker := time.NewTicker(heartbeatTickerInterval)+ defer ticker.Stop()- for {- select {- case <-ctx.Done():- n.logger.Info("Shutdown signal received, unregistering node", "nodeID", n.nodeID)+ n.logger.Info("Restore node started", "nodeID", n.nodeID, "throughput", throughputMBs)- if err := n.restoreNodesRegistry.UnregisterNodeFromRegistry(restoreNode); err != nil {- n.logger.Error("Failed to unregister node from registry", "error", err)- }+ for {+ select {+ case <-ctx.Done():+ n.logger.Info("Shutdown signal received, unregistering node", "nodeID", n.nodeID)- return- case <-ticker.C:- n.sendHeartbeat(&restoreNode)+ if err := n.restoreNodesRegistry.UnregisterNodeFromRegistry(restoreNode); err != nil {+ n.logger.Error("Failed to unregister node from registry", "error", err)}- }- })- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", n))+ return+ case <-ticker.C:+ n.sendHeartbeat(&restoreNode)+ }}}diff --git a/backend/internal/features/restores/restoring/restorer_test.go b/backend/internal/features/restores/restoring/restorer_test.goindex f7881fbf..d7ff6efd 100644--- a/backend/internal/features/restores/restoring/restorer_test.go+++ b/backend/internal/features/restores/restoring/restorer_test.go@@ -144,7 +144,7 @@ func Test_MakeRestore_WhenTaskStarts_CacheDeletedImmediately(t *testing.T) {Port: 5432,Username: "test",Password: "test",- Database: stringPtr("testdb"),+ Database: new("testdb"),Version: "16",},}@@ -162,7 +162,3 @@ func Test_MakeRestore_WhenTaskStarts_CacheDeletedImmediately(t *testing.T) {cachedDBAfter := restoreDatabaseCache.Get(restore.ID.String())assert.Nil(t, cachedDBAfter, "Cache should be deleted immediately when task starts")}--func stringPtr(s string) *string {- return &s-}diff --git a/backend/internal/features/restores/restoring/scheduler.go b/backend/internal/features/restores/restoring/scheduler.goindex 80c55a8d..faeab2d4 100644--- a/backend/internal/features/restores/restoring/scheduler.go+++ b/backend/internal/features/restores/restoring/scheduler.go@@ -4,7 +4,6 @@ import ("context""fmt""log/slog"- "sync""sync/atomic""time"@@ -37,63 +36,56 @@ type RestoresScheduler struct {cacheUtil *cache_utils.CacheUtil[RestoreDatabaseCache]completionSubscriptionID uuid.UUID- runOnce sync.Once- hasRun atomic.Bool+ hasRun atomic.Bool}func (s *RestoresScheduler) Run(ctx context.Context) {- wasAlreadyRun := s.hasRun.Load()-- s.runOnce.Do(func() {- s.hasRun.Store(true)-- s.lastCheckTime = time.Now().UTC()+ if s.hasRun.Swap(true) {+ panic(fmt.Sprintf("%T.Run() called multiple times", s))+ }- if config.GetEnv().IsManyNodesMode {- // wait other nodes to start- time.Sleep(schedulerStartupDelay)- }+ s.lastCheckTime = time.Now().UTC()- if err := s.failRestoresInProgress(); err != nil {- s.logger.Error("Failed to fail restores in progress", "error", err)- panic(err)- }+ if config.GetEnv().IsManyNodesMode {+ // wait other nodes to start+ time.Sleep(schedulerStartupDelay)+ }- err := s.restoreNodesRegistry.SubscribeForRestoresCompletions(s.onRestoreCompleted)- if err != nil {- s.logger.Error("Failed to subscribe to restore completions", "error", err)- panic(err)- }+ if err := s.failRestoresInProgress(); err != nil {+ s.logger.Error("Failed to fail restores in progress", "error", err)+ panic(err)+ }- defer func() {- if err := s.restoreNodesRegistry.UnsubscribeForRestoresCompletions(); err != nil {- s.logger.Error("Failed to unsubscribe from restore completions", "error", err)- }- }()+ err := s.restoreNodesRegistry.SubscribeForRestoresCompletions(s.onRestoreCompleted)+ if err != nil {+ s.logger.Error("Failed to subscribe to restore completions", "error", err)+ panic(err)+ }- if ctx.Err() != nil {- return+ defer func() {+ if err := s.restoreNodesRegistry.UnsubscribeForRestoresCompletions(); err != nil {+ s.logger.Error("Failed to unsubscribe from restore completions", "error", err)}+ }()- ticker := time.NewTicker(schedulerTickerInterval)- defer ticker.Stop()+ if ctx.Err() != nil {+ return+ }- for {- select {- case <-ctx.Done():- return- case <-ticker.C:- if err := s.checkDeadNodesAndFailRestores(); err != nil {- s.logger.Error("Failed to check dead nodes and fail restores", "error", err)- }+ ticker := time.NewTicker(schedulerTickerInterval)+ defer ticker.Stop()- s.lastCheckTime = time.Now().UTC()+ for {+ select {+ case <-ctx.Done():+ return+ case <-ticker.C:+ if err := s.checkDeadNodesAndFailRestores(); err != nil {+ s.logger.Error("Failed to check dead nodes and fail restores", "error", err)}- }- })- if wasAlreadyRun {- panic(fmt.Sprintf("%T.Run() called multiple times", s))+ s.lastCheckTime = time.Now().UTC()+ }}}diff --git a/backend/internal/features/restores/restoring/scheduler_test.go b/backend/internal/features/restores/restoring/scheduler_test.goindex 67f3f111..f34ef0be 100644--- a/backend/internal/features/restores/restoring/scheduler_test.go+++ b/backend/internal/features/restores/restoring/scheduler_test.go@@ -686,7 +686,7 @@ func Test_StartRestore_CredentialsStoredEncryptedInCache(t *testing.T) {Port: 5432,Username: "testuser",Password: plaintextPassword,- Database: stringPtr("testdb"),+ Database: new("testdb"),Version: "16",}diff --git a/backend/internal/features/restores/restoring/testing.go b/backend/internal/features/restores/restoring/testing.goindex 30002d70..99e69dbf 100644--- a/backend/internal/features/restores/restoring/testing.go+++ b/backend/internal/features/restores/restoring/testing.go@@ -3,7 +3,6 @@ package restoringimport ("context""fmt"- "sync""sync/atomic""testing""time"@@ -53,7 +52,6 @@ func CreateTestRestorerNode() *RestorerNode {restoreDatabaseCache,tasks_cancellation.GetTaskCancelManager(),time.Time{},- sync.Once{},atomic.Bool{},}}@@ -73,7 +71,6 @@ func CreateTestRestorerNodeWithUsecase(usecase restores_core.RestoreBackupUsecasrestoreDatabaseCache,tasks_cancellation.GetTaskCancelManager(),time.Time{},- sync.Once{},atomic.Bool{},}}@@ -91,7 +88,6 @@ func CreateTestRestoresScheduler() *RestoresScheduler {restorerNode,restoreDatabaseCache,uuid.Nil,- sync.Once{},atomic.Bool{},}}diff --git a/backend/internal/features/storages/di.go b/backend/internal/features/storages/di.goindex e3b6ad95..5259cbd2 100644--- a/backend/internal/features/storages/di.go+++ b/backend/internal/features/storages/di.go@@ -2,12 +2,10 @@ package storagesimport ("sync"- "sync/atomic"audit_logs "databasus-backend/internal/features/audit_logs"workspaces_services "databasus-backend/internal/features/workspaces/services""databasus-backend/internal/util/encryption"- "databasus-backend/internal/util/logger")var (@@ -34,21 +32,6 @@ func GetStorageController() *StorageController {return storageController}-var (- setupOnce sync.Once- isSetup atomic.Bool-)--func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- workspaces_services.GetWorkspaceService().AddWorkspaceDeletionListener(storageService)-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ workspaces_services.GetWorkspaceService().AddWorkspaceDeletionListener(storageService)+})diff --git a/backend/internal/features/storages/model_test.go b/backend/internal/features/storages/model_test.goindex 3958921f..e25cc790 100644--- a/backend/internal/features/storages/model_test.go+++ b/backend/internal/features/storages/model_test.go@@ -49,7 +49,7 @@ type AzuriteContainer struct {}func Test_Storage_BasicOperations(t *testing.T) {- ctx := context.Background()+ ctx := t.Context()validateEnvVariables(t)@@ -227,7 +227,7 @@ acl = private`, s3Container.accessKey, s3Container.secretKey, s3Container.endpoifileID := uuid.New()err = tc.storage.SaveFile(- context.Background(),+ t.Context(),encryptor,logger.GetLogger(),fileID.String(),@@ -250,7 +250,7 @@ acl = private`, s3Container.accessKey, s3Container.secretKey, s3Container.endpoifileID := uuid.New()err = tc.storage.SaveFile(- context.Background(),+ t.Context(),encryptor,logger.GetLogger(),fileID.String(),diff --git a/backend/internal/features/tasks/cancellation/cancel_manager_test.go b/backend/internal/features/tasks/cancellation/cancel_manager_test.goindex 50bdb481..e696ac08 100644--- a/backend/internal/features/tasks/cancellation/cancel_manager_test.go+++ b/backend/internal/features/tasks/cancellation/cancel_manager_test.go@@ -14,7 +14,7 @@ func Test_RegisterTask_TaskRegisteredSuccessfully(t *testing.T) {manager := taskCancelManagertaskID := uuid.New()- _, cancel := context.WithCancel(context.Background())+ _, cancel := context.WithCancel(t.Context())defer cancel()manager.RegisterTask(taskID, cancel)@@ -29,7 +29,7 @@ func Test_UnregisterTask_TaskUnregisteredSuccessfully(t *testing.T) {manager := taskCancelManagertaskID := uuid.New()- _, cancel := context.WithCancel(context.Background())+ _, cancel := context.WithCancel(t.Context())defer cancel()manager.RegisterTask(taskID, cancel)@@ -45,7 +45,7 @@ func Test_CancelTask_OnSameInstance_TaskCancelledViaPubSub(t *testing.T) {manager := taskCancelManagertaskID := uuid.New()- ctx, cancel := context.WithCancel(context.Background())+ ctx, cancel := context.WithCancel(t.Context())cancelled := falsevar mu sync.Mutex@@ -79,7 +79,7 @@ func Test_CancelTask_FromDifferentInstance_TaskCancelledOnRunningInstance(t *tesmanager2 := taskCancelManagertaskID := uuid.New()- ctx, cancel := context.WithCancel(context.Background())+ ctx, cancel := context.WithCancel(t.Context())cancelled := falsevar mu sync.Mutex@@ -131,9 +131,9 @@ func Test_CancelTask_WithMultipleTasks_AllTasksCancelled(t *testing.T) {cancelledFlags := make([]bool, numTasks)var mu sync.Mutex- for i := 0; i < numTasks; i++ {+ for i := range numTasks {taskIDs[i] = uuid.New()- contexts[i], cancels[i] = context.WithCancel(context.Background())+ contexts[i], cancels[i] = context.WithCancel(t.Context())idx := iwrappedCancel := func() {@@ -149,7 +149,7 @@ func Test_CancelTask_WithMultipleTasks_AllTasksCancelled(t *testing.T) {manager.StartSubscription()time.Sleep(100 * time.Millisecond)- for i := 0; i < numTasks; i++ {+ for i := range numTasks {err := manager.CancelTask(taskIDs[i])assert.NoError(t, err, "Cancel should not return error")}@@ -157,7 +157,7 @@ func Test_CancelTask_WithMultipleTasks_AllTasksCancelled(t *testing.T) {time.Sleep(1 * time.Second)mu.Lock()- for i := 0; i < numTasks; i++ {+ for i := range numTasks {assert.True(t, cancelledFlags[i], "Task %d should be cancelled", i)assert.Error(t, contexts[i].Err(), "Context %d should be cancelled", i)}@@ -168,7 +168,7 @@ func Test_CancelTask_AfterUnregister_TaskNotCancelled(t *testing.T) {manager := taskCancelManagertaskID := uuid.New()- _, cancel := context.WithCancel(context.Background())+ _, cancel := context.WithCancel(t.Context())defer cancel()cancelled := falsediff --git a/backend/internal/features/tasks/cancellation/di.go b/backend/internal/features/tasks/cancellation/di.goindex e3026531..740b9d68 100644--- a/backend/internal/features/tasks/cancellation/di.go+++ b/backend/internal/features/tasks/cancellation/di.go@@ -3,7 +3,6 @@ package task_cancellationimport ("context""sync"- "sync/atomic""github.com/google/uuid"@@ -22,21 +21,6 @@ func GetTaskCancelManager() *TaskCancelManager {return taskCancelManager}-var (- setupOnce sync.Once- isSetup atomic.Bool-)--func SetupDependencies() {- wasAlreadySetup := isSetup.Load()-- setupOnce.Do(func() {- taskCancelManager.StartSubscription()-- isSetup.Store(true)- })-- if wasAlreadySetup {- logger.GetLogger().Warn("SetupDependencies called multiple times, ignoring subsequent call")- }-}+var SetupDependencies = sync.OnceFunc(func() {+ taskCancelManager.StartSubscription()+})diff --git a/backend/internal/features/tests/mongodb_backup_restore_test.go b/backend/internal/features/tests/mongodb_backup_restore_test.goindex ef216475..7074c858 100644--- a/backend/internal/features/tests/mongodb_backup_restore_test.go+++ b/backend/internal/features/tests/mongodb_backup_restore_test.go@@ -132,7 +132,7 @@ func testMongodbBackupRestoreForVersion(t.Skipf("Skipping MongoDB %s test: %v", mongodbVersion, err)return}- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())setupMongodbTestData(t, container)@@ -177,7 +177,7 @@ func testMongodbBackupRestoreForVersion(verifyMongodbDataIntegrity(t, container, newDBName)- ctx := context.Background()+ ctx := t.Context()_ = container.Client.Database(newDBName).Drop(ctx)err = os.Remove(filepath.Join(config.GetEnv().DataFolder, backup.ID.String()))@@ -206,7 +206,7 @@ func testMongodbBackupRestoreWithEncryptionForVersion(t.Skipf("Skipping MongoDB %s test: %v", mongodbVersion, err)return}- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())setupMongodbTestData(t, container)@@ -256,7 +256,7 @@ func testMongodbBackupRestoreWithEncryptionForVersion(verifyMongodbDataIntegrity(t, container, newDBName)- ctx := context.Background()+ ctx := t.Context()_ = container.Client.Database(newDBName).Drop(ctx)err = os.Remove(filepath.Join(config.GetEnv().DataFolder, backup.ID.String()))@@ -285,7 +285,7 @@ func testMongodbBackupRestoreWithReadOnlyUserForVersion(t.Skipf("Skipping MongoDB %s test: %v", mongodbVersion, err)return}- defer container.Client.Disconnect(context.Background())+ defer container.Client.Disconnect(t.Context())setupMongodbTestData(t, container)@@ -344,7 +344,7 @@ func testMongodbBackupRestoreWithReadOnlyUserForVersion(verifyMongodbDataIntegrity(t, container, newDBName)- ctx := context.Background()+ ctx := t.Context()_ = container.Client.Database(newDBName).Drop(ctx)dropMongodbUserSafe(container.Client, readOnlyUser.Username, container.AuthDatabase)@@ -498,7 +498,7 @@ func waitForMongodbRestoreCompletion(}func verifyMongodbDataIntegrity(t *testing.T, container *MongodbContainer, restoredDBName string) {- ctx := context.Background()+ ctx := t.Context()originalCollection := container.Client.Database(container.Database).Collection("test_data")restoredCollection := container.Client.Database(restoredDBName).Collection("test_data")@@ -595,12 +595,12 @@ func connectToMongodbContainer(}func setupMongodbTestData(t *testing.T, container *MongodbContainer) {- ctx := context.Background()+ ctx := t.Context()collection := container.Client.Database(container.Database).Collection("test_data")_ = collection.Drop(ctx)- testDocs := []interface{}{+ testDocs := []any{MongodbTestDataItem{ID: "1",Name: "test1",diff --git a/backend/internal/features/users/controllers/password_reset_test.go b/backend/internal/features/users/controllers/password_reset_test.goindex c56cd2d5..b2508cfa 100644--- a/backend/internal/features/users/controllers/password_reset_test.go+++ b/backend/internal/features/users/controllers/password_reset_test.go@@ -539,7 +539,7 @@ func extractCodeFromEmail(emailBody string) string {// Look for pattern: <h1 ... >CODE</h1>// First find <h1h1Start := 0- for i := 0; i < len(emailBody)-3; i++ {+ for i := range len(emailBody) - 3 {if emailBody[i:i+3] == "<h1" {h1Start = ibreak@@ -575,7 +575,7 @@ func extractCodeFromEmail(emailBody string) string {// Extract content and remove whitespacecontent := emailBody[contentStart:contentEnd]code := ""- for i := 0; i < len(content); i++ {+ for i := range len(content) {if isDigit(content[i]) {code += string(content[i])}diff --git a/backend/internal/storage/storage.go b/backend/internal/storage/storage.goindex c549ce84..2e95ace2 100644--- a/backend/internal/storage/storage.go+++ b/backend/internal/storage/storage.go@@ -14,13 +14,12 @@ import (var log = logger.GetLogger()-var (- db *gorm.DB- dbOnce sync.Once-)+var db *gorm.DB++var initDb = sync.OnceFunc(loadDbs)func GetDb() *gorm.DB {- dbOnce.Do(loadDbs)+ initDb()return db}diff --git a/backend/internal/util/cache/cache.go b/backend/internal/util/cache/cache.goindex 0ab5aa85..c844c154 100644--- a/backend/internal/util/cache/cache.go+++ b/backend/internal/util/cache/cache.go@@ -10,35 +10,33 @@ import ("databasus-backend/internal/config")-var (- once sync.Once- valkeyClient valkey.Client-)+var valkeyClient valkey.Client-func getCache() valkey.Client {- once.Do(func() {- env := config.GetEnv()+var initCache = sync.OnceFunc(func() {+ env := config.GetEnv()- options := valkey.ClientOption{- InitAddress: []string{env.ValkeyHost + ":" + env.ValkeyPort},- Password: env.ValkeyPassword,- Username: env.ValkeyUsername,- }+ options := valkey.ClientOption{+ InitAddress: []string{env.ValkeyHost + ":" + env.ValkeyPort},+ Password: env.ValkeyPassword,+ Username: env.ValkeyUsername,+ }- if env.ValkeyIsSsl {- options.TLSConfig = &tls.Config{- ServerName: env.ValkeyHost,- }+ if env.ValkeyIsSsl {+ options.TLSConfig = &tls.Config{+ ServerName: env.ValkeyHost,}+ }- client, err := valkey.NewClient(options)- if err != nil {- panic(err)- }+ client, err := valkey.NewClient(options)+ if err != nil {+ panic(err)+ }- valkeyClient = client- })+ valkeyClient = client+})+func getCache() valkey.Client {+ initCache()return valkeyClient}diff --git a/backend/internal/util/cache/cache_test.go b/backend/internal/util/cache/cache_test.goindex ccbe0414..5abfc428 100644--- a/backend/internal/util/cache/cache_test.go+++ b/backend/internal/util/cache/cache_test.go@@ -72,7 +72,7 @@ func Test_SetWithExpiration_SetsCorrectTTL(t *testing.T) {assert.Equal(t, testValue, *retrieved, "Retrieved value should match")// Check the TTL using Valkey TTL command- ctx, cancel := context.WithTimeout(context.Background(), DefaultCacheTimeout)+ ctx, cancel := context.WithTimeout(t.Context(), DefaultCacheTimeout)defer cancel()fullKey := testPrefix + testKeydiff --git a/backend/internal/util/logger/logger.go b/backend/internal/util/logger/logger.goindex e98093c0..b0ff8e1c 100644--- a/backend/internal/util/logger/logger.go+++ b/backend/internal/util/logger/logger.go@@ -14,56 +14,52 @@ import (var (loggerInstance *slog.LoggervictoriaLogsWriter *VictoriaLogsWriter- once sync.Once- shutdownOnce sync.Once- envLoadOnce sync.Once)-// GetLogger returns a singleton slog.Logger that logs to the console-func GetLogger() *slog.Logger {- once.Do(func() {- // Create stdout handler- stdoutHandler := slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{- Level: slog.LevelInfo,- ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {- if a.Key == slog.TimeKey {- a.Value = slog.StringValue(time.Now().Format("2006/01/02 15:04:05"))- }- if a.Key == slog.LevelKey {- return slog.Attr{}- }- return a- },- })-- // Try to initialize VictoriaLogs writer if configured- // Note: This will be called before config is fully loaded in some cases,- // so we need to handle that gracefully- victoriaLogsWriter = tryInitVictoriaLogs()-- // Create multi-handler- multiHandler := NewMultiHandler(stdoutHandler, victoriaLogsWriter)- loggerInstance = slog.New(multiHandler)-- loggerInstance.Info("Text structured logger initialized")- if victoriaLogsWriter != nil {- loggerInstance.Info("VictoriaLogs enabled")- } else {- loggerInstance.Info("VictoriaLogs disabled")- }+var initLogger = sync.OnceFunc(func() {+ // Create stdout handler+ stdoutHandler := slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{+ Level: slog.LevelInfo,+ ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {+ if a.Key == slog.TimeKey {+ a.Value = slog.StringValue(time.Now().Format("2006/01/02 15:04:05"))+ }+ if a.Key == slog.LevelKey {+ return slog.Attr{}+ }+ return a+ },})+ // Try to initialize VictoriaLogs writer if configured+ // Note: This will be called before config is fully loaded in some cases,+ // so we need to handle that gracefully+ victoriaLogsWriter = tryInitVictoriaLogs()++ // Create multi-handler+ multiHandler := NewMultiHandler(stdoutHandler, victoriaLogsWriter)+ loggerInstance = slog.New(multiHandler)++ loggerInstance.Info("Text structured logger initialized")+ if victoriaLogsWriter != nil {+ loggerInstance.Info("VictoriaLogs enabled")+ } else {+ loggerInstance.Info("VictoriaLogs disabled")+ }+})++// GetLogger returns a singleton slog.Logger that logs to the console+func GetLogger() *slog.Logger {+ initLogger()return loggerInstance}// ShutdownVictoriaLogs gracefully shuts down the VictoriaLogs writer-func ShutdownVictoriaLogs(timeout time.Duration) {- shutdownOnce.Do(func() {- if victoriaLogsWriter != nil {- victoriaLogsWriter.Shutdown(timeout)- }- })-}+var ShutdownVictoriaLogs = sync.OnceFunc(func() {+ if victoriaLogsWriter != nil {+ victoriaLogsWriter.Shutdown(5 * time.Second)+ }+})func tryInitVictoriaLogs() *VictoriaLogsWriter {// Ensure .env is loaded before reading environment variables@@ -82,46 +78,44 @@ func tryInitVictoriaLogs() *VictoriaLogsWriter {return NewVictoriaLogsWriter(url, username, password)}-func ensureEnvLoaded() {- envLoadOnce.Do(func() {- // Get current working directory- cwd, err := os.Getwd()- if err != nil {- fmt.Printf("Warning: could not get current working directory: %v\n", err)- cwd = "."- }-- // Find backend root by looking for go.mod- backendRoot := cwd- for {- if _, err := os.Stat(filepath.Join(backendRoot, "go.mod")); err == nil {- break- }-- parent := filepath.Dir(backendRoot)- if parent == backendRoot {- break- }+var ensureEnvLoaded = sync.OnceFunc(func() {+ // Get current working directory+ cwd, err := os.Getwd()+ if err != nil {+ fmt.Printf("Warning: could not get current working directory: %v\n", err)+ cwd = "."+ }- backendRoot = parent+ // Find backend root by looking for go.mod+ backendRoot := cwd+ for {+ if _, err := os.Stat(filepath.Join(backendRoot, "go.mod")); err == nil {+ break}- // Try to load .env from various locations- envPaths := []string{- filepath.Join(cwd, ".env"),- filepath.Join(backendRoot, ".env"),+ parent := filepath.Dir(backendRoot)+ if parent == backendRoot {+ break}- for _, path := range envPaths {- if err := godotenv.Load(path); err == nil {- fmt.Printf("Logger: loaded .env from %s\n", path)- return- }+ backendRoot = parent+ }++ // Try to load .env from various locations+ envPaths := []string{+ filepath.Join(cwd, ".env"),+ filepath.Join(backendRoot, ".env"),+ }++ for _, path := range envPaths {+ if err := godotenv.Load(path); err == nil {+ fmt.Printf("Logger: loaded .env from %s\n", path)+ return}+ }- fmt.Println("Logger: .env file not found, using existing environment variables")- })-}+ fmt.Println("Logger: .env file not found, using existing environment variables")+})func getVictoriaLogsURL() string {return os.Getenv("VICTORIA_LOGS_URL")diff --git a/backend/internal/util/logger/victorialogs_writer.go b/backend/internal/util/logger/victorialogs_writer.goindex 42beb18e..edc43745 100644--- a/backend/internal/util/logger/victorialogs_writer.go+++ b/backend/internal/util/logger/victorialogs_writer.go@@ -28,7 +28,7 @@ type VictoriaLogsWriter struct {httpClient *http.ClientlogChannel chan logEntrywg sync.WaitGroup- once sync.Once+ shutdown func()ctx context.Contextcancel context.CancelFunclogger *slog.Logger@@ -50,10 +50,28 @@ func NewVictoriaLogsWriter(url, username, password string) *VictoriaLogsWriter {logger: slog.New(slog.NewTextHandler(os.Stdout, nil)),}+ writer.shutdown = sync.OnceFunc(func() {+ // Stop accepting new logs+ writer.cancel()++ // Wait for workers to finish with timeout+ done := make(chan struct{})+ go func() {+ writer.wg.Wait()+ close(done)+ }()++ select {+ case <-done:+ writer.logger.Info("VictoriaLogs writer shutdown gracefully")+ case <-time.After(5 * time.Second):+ writer.logger.Warn("VictoriaLogs writer shutdown timeout, some logs may be lost")+ }+ })+// Start 3 worker goroutinesfor range 3 {- writer.wg.Add(1)- go writer.worker()+ writer.wg.Go(writer.worker)}return writer@@ -77,29 +95,10 @@ func (w *VictoriaLogsWriter) Write(level, message string, attrs map[string]any)}func (w *VictoriaLogsWriter) Shutdown(timeout time.Duration) {- w.once.Do(func() {- // Stop accepting new logs- w.cancel()-- // Wait for workers to finish with timeout- done := make(chan struct{})- go func() {- w.wg.Wait()- close(done)- }()-- select {- case <-done:- w.logger.Info("VictoriaLogs writer shutdown gracefully")- case <-time.After(timeout):- w.logger.Warn("VictoriaLogs writer shutdown timeout, some logs may be lost")- }- })+ w.shutdown()}func (w *VictoriaLogsWriter) worker() {- defer w.wg.Done()-batch := make([]logEntry, 0, 100)ticker := time.NewTicker(1 * time.Second)defer ticker.Stop()