introduce index cache tracing

Signed-off-by: Ben Ye <[email protected]>
cortexproject · Dec 7, 2023 · f6cd2da · f6cd2da
1 parent e8a101c
commit f6cd2da
Show file tree

Hide file tree

Showing 10 changed files with 121 additions and 16 deletions.
diff --git a/go.mod b/go.mod
@@ -53,7 +53,7 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/thanos-io/objstore v0.0.0-20231123170144-bffedaa58acb
 	github.com/thanos-io/promql-engine v0.0.0-20231127105941-257543af55e8
-	github.com/thanos-io/thanos v0.32.5-0.20231204192512-28407d61e72d
+	github.com/thanos-io/thanos v0.32.5-0.20231207001313-e7aecb401f54
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d
 	go.etcd.io/etcd/api/v3 v3.5.10

diff --git a/go.sum b/go.sum
@@ -1509,8 +1509,8 @@ github.com/thanos-io/objstore v0.0.0-20231123170144-bffedaa58acb h1:3s/a99MWpt5Z
 github.com/thanos-io/objstore v0.0.0-20231123170144-bffedaa58acb/go.mod h1:RMvJQnpB4QQiYGg1gF8mnPJg6IkIPY28Buh8f6b+F0c=
 github.com/thanos-io/promql-engine v0.0.0-20231127105941-257543af55e8 h1:KX57eKPq3yzX7ENyd0+fOfPb6v9tjOCLRT8/9waWs/w=
 github.com/thanos-io/promql-engine v0.0.0-20231127105941-257543af55e8/go.mod h1:vfXJv1JXNdLfHnjsHsLLJl5tyI7KblF76Wo5lZ9YC4Q=
-github.com/thanos-io/thanos v0.32.5-0.20231204192512-28407d61e72d h1:GJhhQxnEENOF0ZgHfK2WAC0qwQhAnexld0Ujhe0xgrY=
-github.com/thanos-io/thanos v0.32.5-0.20231204192512-28407d61e72d/go.mod h1:tADvTBUwVH/yjWymDztTV8/bErQVIGFlHIZqXc07QQo=
+github.com/thanos-io/thanos v0.32.5-0.20231207001313-e7aecb401f54 h1:DVpL9tb0ZlFXrpZnLXSGfC4E/mlLrlN3iaPvAH+WLos=
+github.com/thanos-io/thanos v0.32.5-0.20231207001313-e7aecb401f54/go.mod h1:tADvTBUwVH/yjWymDztTV8/bErQVIGFlHIZqXc07QQo=
 github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU=
 github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab/go.mod h1:eheTFp954zcWZXCU8d0AT76ftsQOTo4DTqkN/h3k1MY=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

diff --git a/pkg/storage/tsdb/index_cache.go b/pkg/storage/tsdb/index_cache.go
@@ -204,41 +204,43 @@ func NewIndexCache(cfg IndexCacheConfig, logger log.Logger, registerer prometheu
 			iReg = prometheus.WrapRegistererWith(prometheus.Labels{"level": fmt.Sprintf("L%v", i)}, registerer)
 		}
 
+		var (
+			cache storecache.IndexCache
+			err   error
+		)
 		switch backend {
 		case IndexCacheBackendInMemory:
-			c, err := newInMemoryIndexCache(cfg.InMemory, logger, iReg)
+			cache, err = newInMemoryIndexCache(cfg.InMemory, logger, iReg)
 			if err != nil {
-				return c, err
+				return cache, err
 			}
-			caches = append(caches, c)
 			enabledItems = append(enabledItems, cfg.InMemory.EnabledItems)
 		case IndexCacheBackendMemcached:
 			c, err := newMemcachedIndexCacheClient(cfg.Memcached.ClientConfig, logger, registerer)
 			if err != nil {
 				return nil, err
 			}
 			// TODO(yeya24): expose TTL
-			cache, err := storecache.NewRemoteIndexCache(logger, c, nil, iReg, defaultTTL)
+			cache, err = storecache.NewRemoteIndexCache(logger, c, nil, iReg, defaultTTL)
 			if err != nil {
 				return nil, err
 			}
-			caches = append(caches, cache)
 			enabledItems = append(enabledItems, cfg.Memcached.EnabledItems)
 		case IndexCacheBackendRedis:
 			c, err := newRedisIndexCacheClient(cfg.Redis.ClientConfig, logger, iReg)
 			if err != nil {
 				return nil, err
 			}
 			// TODO(yeya24): expose TTL
-			cache, err := storecache.NewRemoteIndexCache(logger, c, nil, iReg, defaultTTL)
+			cache, err = storecache.NewRemoteIndexCache(logger, c, nil, iReg, defaultTTL)
 			if err != nil {
 				return nil, err
 			}
-			caches = append(caches, cache)
 			enabledItems = append(enabledItems, cfg.Redis.EnabledItems)
 		default:
 			return nil, errUnsupportedIndexCacheBackend
 		}
+		caches = append(caches, storecache.NewTracingIndexCache(backend, cache))
 	}
 
 	return newMultiLevelCache(registerer, cfg.MultiLevel, enabledItems, caches...), nil

diff --git a/pkg/storage/tsdb/multilevel_cache_test.go b/pkg/storage/tsdb/multilevel_cache_test.go
@@ -39,7 +39,7 @@ func Test_MultiIndexCacheInstantiation(t *testing.T) {
 			cfg: IndexCacheConfig{
 				Backend: "inmemory",
 			},
-			expectedType: &InMemoryIndexCache{},
+			expectedType: &storecache.TracingIndexCache{},
 		},
 		"instantiate multiples backends - inmemory/redis": {
 			cfg: IndexCacheConfig{

diff --git a/vendor/github.com/thanos-io/thanos/pkg/compact/compact.go b/vendor/github.com/thanos-io/thanos/pkg/compact/compact.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/cache/factory.go b/vendor/github.com/thanos-io/thanos/pkg/store/cache/factory.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/cache/tracing_index_cache.go b/vendor/github.com/thanos-io/thanos/pkg/store/cache/tracing_index_cache.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/prometheus.go b/vendor/github.com/thanos-io/thanos/pkg/store/prometheus.go
diff --git a/vendor/github.com/thanos-io/thanos/pkg/store/tsdb.go b/vendor/github.com/thanos-io/thanos/pkg/store/tsdb.go
diff --git a/vendor/modules.txt b/vendor/modules.txt