From cba64561422742ef2e26ac900d23e174af7bd393 Mon Sep 17 00:00:00 2001 From: ensiouel <ensiouel@gmail.com> Date: Sat, 16 Dec 2023 20:07:28 +0300 Subject: [PATCH] fix --- pkg/content/client.go | 2 +- pkg/delivery/client/client.go | 2 +- pkg/items/middleware/caching_middleware_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/content/client.go b/pkg/content/client.go index 157b9f9d..5081c4df 100644 --- a/pkg/content/client.go +++ b/pkg/content/client.go @@ -77,7 +77,7 @@ func NewClient(conn *grpc.ClientConn, opts ...Option) *Content { func WithCaching(client *Content, size int, ttl time.Duration) *Content { c := *client - cacheMetrics := metrics.NewCacheMetrics(prometheus.DefaultRegisterer) + cacheMetrics := metrics.NewCacheMetrics(prometheus.WrapRegistererWithPrefix("content_", prometheus.DefaultRegisterer)) c.Clients = clientsSvc.CachingMiddleware(cache.NewCache(size, ttl))(client.Clients) c.Environments = environmentsSvc.CachingMiddleware(cache.NewCache(size, ttl))(client.Environments) diff --git a/pkg/delivery/client/client.go b/pkg/delivery/client/client.go index 9788dd99..0147aab8 100644 --- a/pkg/delivery/client/client.go +++ b/pkg/delivery/client/client.go @@ -45,7 +45,7 @@ func NewClient(conn *grpc.ClientConn, opts ...Option) (delivery.Delivery, error) func WithCaching(cfg *deliveryservice.Config, size int, ttl time.Duration) *deliveryservice.Config { c := *cfg - cacheMetrics := metrics.NewCacheMetrics(prometheus.DefaultRegisterer) + cacheMetrics := metrics.NewCacheMetrics(prometheus.WrapRegistererWithPrefix("delivery_", prometheus.DefaultRegisterer)) c.Environments = environments.CachingMiddleware(cache.NewCache(size, ttl))(cfg.Environments) c.Locales = locales.CachingMiddleware(cache.NewCache(size, ttl))(cfg.Locales) diff --git a/pkg/items/middleware/caching_middleware_test.go b/pkg/items/middleware/caching_middleware_test.go index ce8bd3d3..7019199e 100644 --- a/pkg/items/middleware/caching_middleware_test.go +++ b/pkg/items/middleware/caching_middleware_test.go @@ -34,7 +34,7 @@ func TestItemsCache(t *testing.T) { errNotFound := errors.NotFound(errors.New("not found")) ctx := context.Background() - cacheMetrics := metrics.NewCacheMetrics(prometheus.DefaultRegisterer) + cacheMetrics := metrics.NewCacheMetrics(prometheus.WrapRegistererWithPrefix("test_", prometheus.DefaultRegisterer)) t.Run("Get from cache", func(t *testing.T) { itms := &itmsmocks.Items{} -- GitLab