From c236a222845630f41362e80d2270b0549643d578 Mon Sep 17 00:00:00 2001
From: Karl Persson <23356117+kalleep@users.noreply.github.com>
Date: Wed, 26 Mar 2025 13:55:24 +0100
Subject: [PATCH] Authz: Include context in logs when using cache (#102810)

Include context in logs when using cache
---
 pkg/services/authz/rbac/cache.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkg/services/authz/rbac/cache.go b/pkg/services/authz/rbac/cache.go
index 197b4c9ae23..2da84100835 100644
--- a/pkg/services/authz/rbac/cache.go
+++ b/pkg/services/authz/rbac/cache.go
@@ -52,18 +52,20 @@ func newCacheWrap[T any](cache cache.Cache, logger log.Logger, ttl time.Duration
 }
 
 func (c *cacheWrap[T]) Get(ctx context.Context, key string) (T, bool) {
+	logger := c.logger.FromContext(ctx)
+
 	var value T
 	data, err := c.cache.Get(ctx, key)
 	if err != nil {
 		if !errors.Is(err, cache.ErrNotFound) {
-			c.logger.Warn("failed to get from cache", "key", key, "error", err)
+			logger.Warn("failed to get from cache", "key", key, "error", err)
 		}
 		return value, false
 	}
 
 	err = json.Unmarshal(data, &value)
 	if err != nil {
-		c.logger.Warn("failed to unmarshal from cache", "key", key, "error", err)
+		logger.Warn("failed to unmarshal from cache", "key", key, "error", err)
 		return value, false
 	}
 
@@ -71,14 +73,16 @@ func (c *cacheWrap[T]) Get(ctx context.Context, key string) (T, bool) {
 }
 
 func (c *cacheWrap[T]) Set(ctx context.Context, key string, value T) {
+	logger := c.logger.FromContext(ctx)
+
 	data, err := json.Marshal(value)
 	if err != nil {
-		c.logger.Warn("failed to marshal to cache", "key", key, "error", err)
+		logger.Warn("failed to marshal to cache", "key", key, "error", err)
 		return
 	}
 
 	err = c.cache.Set(ctx, key, data, c.ttl)
 	if err != nil {
-		c.logger.Warn("failed to set to cache", "key", key, "error", err)
+		logger.Warn("failed to set to cache", "key", key, "error", err)
 	}
 }