catfile: Move monitor ticker into struct

The cache monitor is currently running concurrently without any way to
stop it. This leads to lots of Goroutine leaks in our test suite.

As an initial step towards a fix, let's embed the ticker into the
structure such that we have access to it.

1 files changed, 6 insertions, 5 deletions

diff --git a/internal/git/catfile/batch_cache.go b/internal/git/catfile/batch_cache.go
index 81a18c813..f8a590d35 100644
--- a/internal/git/catfile/batch_cache.go
+++ b/internal/git/catfile/batch_cache.go
@@ -68,6 +68,8 @@ type BatchCache struct {
 	// injectSpawnErrors is used for testing purposes only. If set to true, then spawned batch
 	// processes will simulate spawn errors.
 	injectSpawnErrors bool
+	// monitorTicker is the ticker used for the monitoring Goroutine.
+	monitorTicker *time.Ticker
 
 	catfileCacheCounter     *prometheus.CounterVec
 	currentCatfileProcesses prometheus.Gauge
@@ -124,9 +126,10 @@ func newCache(ttl time.Duration, maxLen int, refreshInterval time.Duration) *Bat
 				Help: "Gauge of catfile cache members",
 			},
 		),
+		monitorTicker: time.NewTicker(refreshInterval),
 	}
 
-	go bc.monitor(refreshInterval)
+	go bc.monitor()
 	return bc
 }
 
@@ -144,10 +147,8 @@ func (bc *BatchCache) Collect(metrics chan<- prometheus.Metric) {
 	bc.catfileCacheMembers.Collect(metrics)
 }
 
-func (bc *BatchCache) monitor(refreshInterval time.Duration) {
-	ticker := time.NewTicker(refreshInterval)
-
-	for range ticker.C {
+func (bc *BatchCache) monitor() {
+	for range bc.monitorTicker.C {
 		bc.enforceTTL(time.Now())
 	}
 }