diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go index 2994494b1a..186a98a186 100644 --- a/pkg/loki/modules.go +++ b/pkg/loki/modules.go @@ -161,7 +161,7 @@ func (t *Loki) initGroupcache() (_ services.Service, err error) { t.groupcacheRingManager = rm t.Server.HTTP.Path("/groupcache/ring").Methods("GET", "POST").Handler(t.groupcacheRingManager) - gc, err := cache.NewGroupCache(rm, t.Cfg.Common.GroupCacheConfig, t.Server, util_log.Logger, prometheus.DefaultRegisterer) + gc, err := cache.NewGroupCache(rm, t.Cfg.Common.GroupCacheConfig, util_log.Logger, prometheus.DefaultRegisterer) if err != nil { return nil, err } diff --git a/pkg/storage/chunk/cache/groupcache.go b/pkg/storage/chunk/cache/groupcache.go index 79954ece36..315edaffdd 100644 --- a/pkg/storage/chunk/cache/groupcache.go +++ b/pkg/storage/chunk/cache/groupcache.go @@ -21,7 +21,6 @@ import ( "github.com/mailgun/groupcache/v2" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/weaveworks/common/server" "github.com/go-kit/log" "github.com/go-kit/log/level" @@ -89,7 +88,7 @@ type ringManager interface { Ring() ring.ReadRing } -func NewGroupCache(rm ringManager, config GroupCacheConfig, server *server.Server, logger log.Logger, reg prometheus.Registerer) (*GroupCache, error) { +func NewGroupCache(rm ringManager, config GroupCacheConfig, logger log.Logger, reg prometheus.Registerer) (*GroupCache, error) { addr := fmt.Sprintf("http://%s", rm.Addr()) level.Info(logger).Log("msg", "groupcache local address set to", "addr", addr) diff --git a/pkg/storage/chunk/cache/groupcache_test.go b/pkg/storage/chunk/cache/groupcache_test.go index 199a0dcd32..c75d2a727d 100644 --- a/pkg/storage/chunk/cache/groupcache_test.go +++ b/pkg/storage/chunk/cache/groupcache_test.go @@ -5,8 +5,6 @@ import ( "testing" "github.com/go-kit/log" - "github.com/gorilla/mux" - "github.com/weaveworks/common/server" "github.com/grafana/dskit/ring" "github.com/stretchr/testify/assert" @@ -64,7 +62,7 @@ func setupGroupCache() (*GroupCache, error) { return NewGroupCache(&mockRingManager{}, GroupCacheConfig{ Enabled: true, CapacityMB: 1, - }, &server.Server{HTTP: mux.NewRouter()}, log.NewNopLogger(), nil) + }, log.NewNopLogger(), nil) } type mockRingManager struct{}