Skip to content

Commit eab8559

Browse files
chore: Fix unused-parameter linter errors (backport k238) (#15844)
Co-authored-by: Christian Haudum <christian.haudum@gmail.com>
1 parent 7cb8dd6 commit eab8559

File tree

3 files changed

+5
-29
lines changed

3 files changed

+5
-29
lines changed

‎pkg/bloomgateway/client.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"github.com/grafana/loki/v3/pkg/querier/plan"
2424
"github.com/grafana/loki/v3/pkg/queue"
2525
v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1"
26-
"github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache"
2726
"github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper"
2827
"github.com/grafana/loki/v3/pkg/util/discovery"
2928
)
@@ -121,14 +120,7 @@ type GatewayClient struct {
121120
dnsProvider *discovery.DNS
122121
}
123122

124-
func NewClient(
125-
cfg ClientConfig,
126-
limits Limits,
127-
registerer prometheus.Registerer,
128-
logger log.Logger,
129-
cacheGen resultscache.CacheGenNumberLoader,
130-
retentionEnabled bool,
131-
) (*GatewayClient, error) {
123+
func NewClient(cfg ClientConfig, registerer prometheus.Registerer, logger log.Logger) (*GatewayClient, error) {
132124
metrics := newClientMetrics(registerer)
133125

134126
dialOpts, err := cfg.GRPCClientConfig.DialOption(grpcclient.Instrument(metrics.requestLatency))

‎pkg/bloomgateway/client_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@ func (p *errorMockPool) Addr(_ string) (string, error) {
2828
func TestBloomGatewayClient(t *testing.T) {
2929
logger := log.NewNopLogger()
3030

31-
limits := newLimits()
32-
3331
cfg := ClientConfig{}
3432
flagext.DefaultValues(&cfg)
3533

3634
t.Run("FilterChunks returns response", func(t *testing.T) {
3735
reg := prometheus.NewRegistry()
38-
c, err := NewClient(cfg, limits, reg, logger, nil, false)
36+
c, err := NewClient(cfg, reg, logger)
3937
require.NoError(t, err)
4038
expr, err := syntax.ParseExpr(`{foo="bar"}`)
4139
require.NoError(t, err)
@@ -46,7 +44,7 @@ func TestBloomGatewayClient(t *testing.T) {
4644

4745
t.Run("pool error is suppressed and returns full list of chunks", func(t *testing.T) {
4846
reg := prometheus.NewRegistry()
49-
c, err := NewClient(cfg, limits, reg, logger, nil, false)
47+
c, err := NewClient(cfg, reg, logger)
5048
require.NoError(t, err)
5149
c.pool = &errorMockPool{}
5250

‎pkg/loki/modules.go

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,14 +1544,7 @@ func (t *Loki) initIndexGateway() (services.Service, error) {
15441544

15451545
var bloomQuerier indexgateway.BloomQuerier
15461546
if t.Cfg.BloomGateway.Enabled {
1547-
bloomGatewayClient, err := bloomgateway.NewClient(
1548-
t.Cfg.BloomGateway.Client,
1549-
t.Overrides,
1550-
prometheus.DefaultRegisterer,
1551-
logger,
1552-
t.cacheGenerationLoader,
1553-
t.Cfg.CompactorConfig.RetentionEnabled,
1554-
)
1547+
bloomGatewayClient, err := bloomgateway.NewClient(t.Cfg.BloomGateway.Client, prometheus.DefaultRegisterer, logger)
15551548
if err != nil {
15561549
return nil, err
15571550
}
@@ -1675,14 +1668,7 @@ func (t *Loki) initBloomBuilder() (services.Service, error) {
16751668
var bloomGatewayClient bloomgateway.Client
16761669
if t.Cfg.BloomGateway.Enabled {
16771670
var err error
1678-
bloomGatewayClient, err = bloomgateway.NewClient(
1679-
t.Cfg.BloomGateway.Client,
1680-
t.Overrides,
1681-
prometheus.DefaultRegisterer,
1682-
logger,
1683-
t.cacheGenerationLoader,
1684-
t.Cfg.CompactorConfig.RetentionEnabled,
1685-
)
1671+
bloomGatewayClient, err = bloomgateway.NewClient(t.Cfg.BloomGateway.Client, prometheus.DefaultRegisterer, logger)
16861672
if err != nil {
16871673
return nil, err
16881674
}

0 commit comments

Comments
 (0)