cache: Replace use of ctxlogrus with injected logger

The ctxlogrus package is going away with the replacement being log
fields extracted from the context via `log.DebugContext()` et al.
Refactor the code to stop using ctxlogrus by injecting a logger and
using the new context-based logging methods.

2 files changed, 9 insertions, 9 deletions

diff --git a/internal/cache/diskcache.go b/internal/cache/diskcache.go
index a1b2da590..8046ae3c5 100644
--- a/internal/cache/diskcache.go
+++ b/internal/cache/diskcache.go
@@ -184,7 +184,7 @@ func New(cfg config.Cfg, locator storage.Locator, logger log.Logger, opts ...Opt
 			},
 		),
 	}
-	cache.keyer = newLeaseKeyer(locator, cache.countErr)
+	cache.keyer = newLeaseKeyer(logger, locator, cache.countErr)
 
 	return cache
 }
@@ -242,9 +242,9 @@ func (c *DiskCache) GetStream(ctx context.Context, repo *gitalypb.Repository, re
 		return nil, err
 	}
 
-	log.FromContext(ctx).
+	c.logger.
 		WithField("stream_path", respPath).
-		Info("getting stream")
+		InfoContext(ctx, "getting stream")
 
 	respF, err := os.Open(respPath)
 	switch {
@@ -281,9 +281,9 @@ func (c *DiskCache) PutStream(ctx context.Context, repo *gitalypb.Repository, re
 		return err
 	}
 
-	log.FromContext(ctx).
+	c.logger.
 		WithField("stream_path", reqPath).
-		Info("putting stream")
+		InfoContext(ctx, "putting stream")
 
 	var n int64
 	isWinner := c.af.trackFile(reqPath)
diff --git a/internal/cache/keyer.go b/internal/cache/keyer.go
index cb919f2d5..3b1833361 100644
--- a/internal/cache/keyer.go
+++ b/internal/cache/keyer.go
@@ -44,13 +44,15 @@ var (
 // atomically created/renamed files. Read more about leaseKeyer's design:
 // https://gitlab.com/gitlab-org/gitaly/issues/1745
 type leaseKeyer struct {
+	logger   log.Logger
 	locator  storage.Locator
 	countErr func(error) error
 }
 
 // newLeaseKeyer initializes a new leaseKeyer
-func newLeaseKeyer(locator storage.Locator, countErr func(error) error) leaseKeyer {
+func newLeaseKeyer(logger log.Logger, locator storage.Locator, countErr func(error) error) leaseKeyer {
 	return leaseKeyer{
+		logger:   logger,
 		locator:  locator,
 		countErr: countErr,
 	}
@@ -92,9 +94,7 @@ func (keyer leaseKeyer) updateLatest(ctx context.Context, repo *gitalypb.Reposit
 		return "", err
 	}
 
-	log.FromContext(ctx).
-		WithField("diskcache", nextGenID).
-		Info("diskcache state change")
+	keyer.logger.WithField("diskcache", nextGenID).InfoContext(ctx, "diskcache state change")
 
 	return nextGenID, nil
 }