Skip to content

Commit d829a5b

Browse files
zak-pawelzak-pawel
authored
chore: Fix linter findings for revive:unused-receiver in plugins/inputs/[l-r] (#16325)
1 parent e766c86 commit d829a5b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+145
-166
lines changed

‎plugins/inputs/lanz/lanz.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func (l *Lanz) Start(acc telegraf.Accumulator) error {
5858
return nil
5959
}
6060

61-
func (l *Lanz) Gather(_ telegraf.Accumulator) error {
61+
func (*Lanz) Gather(telegraf.Accumulator) error {
6262
return nil
6363
}
6464

‎plugins/inputs/leofs/leofs.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func (*LeoFS) SampleConfig() string {
159159

160160
func (l *LeoFS) Gather(acc telegraf.Accumulator) error {
161161
if len(l.Servers) == 0 {
162-
return l.gatherServer(defaultEndpoint, serverTypeManagerMaster, acc)
162+
return gatherServer(defaultEndpoint, serverTypeManagerMaster, acc)
163163
}
164164
var wg sync.WaitGroup
165165
for _, endpoint := range l.Servers {
@@ -185,14 +185,14 @@ func (l *LeoFS) Gather(acc telegraf.Accumulator) error {
185185
wg.Add(1)
186186
go func(endpoint string, st serverType) {
187187
defer wg.Done()
188-
acc.AddError(l.gatherServer(endpoint, st, acc))
188+
acc.AddError(gatherServer(endpoint, st, acc))
189189
}(endpoint, st)
190190
}
191191
wg.Wait()
192192
return nil
193193
}
194194

195-
func (l *LeoFS) gatherServer(endpoint string, serverType serverType, acc telegraf.Accumulator) error {
195+
func gatherServer(endpoint string, serverType serverType, acc telegraf.Accumulator) error {
196196
cmd := exec.Command("snmpwalk", "-v2c", "-cpublic", "-On", endpoint, oid)
197197
stdout, err := cmd.StdoutPipe()
198198
if err != nil {

‎plugins/inputs/libvirt/libvirt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ type Libvirt struct {
4747
domainsMap map[string]struct{}
4848
}
4949

50-
func (l *Libvirt) SampleConfig() string {
50+
func (*Libvirt) SampleConfig() string {
5151
return sampleConfig
5252
}
5353

‎plugins/inputs/libvirt/libvirt_metric_format.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ var (
1717
)
1818

1919
func (l *Libvirt) addMetrics(stats []golibvirt.DomainStatsRecord, vcpuInfos map[string][]vcpuAffinity, acc telegraf.Accumulator) {
20-
domainsMetrics := l.translateMetrics(stats)
20+
domainsMetrics := translateMetrics(stats)
2121

2222
for domainName, metrics := range domainsMetrics {
2323
for metricType, values := range metrics {
2424
switch metricType {
2525
case "state":
26-
l.addStateMetrics(values, domainName, acc)
26+
addStateMetrics(values, domainName, acc)
2727
case "cpu":
28-
l.addCPUMetrics(values, domainName, acc)
28+
addCPUMetrics(values, domainName, acc)
2929
case "balloon":
30-
l.addBalloonMetrics(values, domainName, acc)
30+
addBalloonMetrics(values, domainName, acc)
3131
case "vcpu":
3232
l.addVcpuMetrics(values, domainName, vcpuInfos[domainName], acc)
3333
case "net":
34-
l.addInterfaceMetrics(values, domainName, acc)
34+
addInterfaceMetrics(values, domainName, acc)
3535
case "perf":
36-
l.addPerfMetrics(values, domainName, acc)
36+
addPerfMetrics(values, domainName, acc)
3737
case "block":
38-
l.addBlockMetrics(values, domainName, acc)
38+
addBlockMetrics(values, domainName, acc)
3939
case "iothread":
40-
l.addIothreadMetrics(values, domainName, acc)
40+
addIothreadMetrics(values, domainName, acc)
4141
case "memory":
42-
l.addMemoryMetrics(values, domainName, acc)
42+
addMemoryMetrics(values, domainName, acc)
4343
case "dirtyrate":
44-
l.addDirtyrateMetrics(values, domainName, acc)
44+
addDirtyrateMetrics(values, domainName, acc)
4545
}
4646
}
4747
}
@@ -61,7 +61,7 @@ func (l *Libvirt) addMetrics(stats []golibvirt.DomainStatsRecord, vcpuInfos map[
6161
}
6262
}
6363

64-
func (l *Libvirt) translateMetrics(stats []golibvirt.DomainStatsRecord) map[string]map[string]map[string]golibvirt.TypedParamValue {
64+
func translateMetrics(stats []golibvirt.DomainStatsRecord) map[string]map[string]map[string]golibvirt.TypedParamValue {
6565
metrics := make(map[string]map[string]map[string]golibvirt.TypedParamValue)
6666
for _, stat := range stats {
6767
if stat.Params != nil {
@@ -83,7 +83,7 @@ func (l *Libvirt) translateMetrics(stats []golibvirt.DomainStatsRecord) map[stri
8383
return metrics
8484
}
8585

86-
func (l *Libvirt) addStateMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
86+
func addStateMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
8787
var stateFields = make(map[string]interface{})
8888
var stateTags = map[string]string{
8989
"domain_name": domainName,
@@ -101,7 +101,7 @@ func (l *Libvirt) addStateMetrics(metrics map[string]golibvirt.TypedParamValue,
101101
}
102102
}
103103

104-
func (l *Libvirt) addCPUMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
104+
func addCPUMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
105105
var cpuFields = make(map[string]interface{})
106106
var cpuCacheMonitorTotalFields = make(map[string]interface{})
107107

@@ -188,7 +188,7 @@ func (l *Libvirt) addCPUMetrics(metrics map[string]golibvirt.TypedParamValue, do
188188
}
189189
}
190190

191-
func (l *Libvirt) addBalloonMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
191+
func addBalloonMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
192192
var balloonFields = make(map[string]interface{})
193193
var balloonTags = map[string]string{
194194
"domain_name": domainName,
@@ -283,7 +283,7 @@ func (l *Libvirt) getCurrentPCPUForVCPU(vcpuID string, vcpuInfos []vcpuAffinity)
283283
return -1
284284
}
285285

286-
func (l *Libvirt) addInterfaceMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
286+
func addInterfaceMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
287287
var netTotalFields = make(map[string]interface{})
288288
var netData = make(map[string]map[string]interface{})
289289

@@ -330,7 +330,7 @@ func (l *Libvirt) addInterfaceMetrics(metrics map[string]golibvirt.TypedParamVal
330330
}
331331
}
332332

333-
func (l *Libvirt) addPerfMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
333+
func addPerfMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
334334
var perfFields = make(map[string]interface{})
335335
var perfTags = map[string]string{
336336
"domain_name": domainName,
@@ -351,7 +351,7 @@ func (l *Libvirt) addPerfMetrics(metrics map[string]golibvirt.TypedParamValue, d
351351
}
352352
}
353353

354-
func (l *Libvirt) addBlockMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
354+
func addBlockMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
355355
var blockTotalFields = make(map[string]interface{})
356356
var blockData = make(map[string]map[string]interface{})
357357

@@ -399,7 +399,7 @@ func (l *Libvirt) addBlockMetrics(metrics map[string]golibvirt.TypedParamValue,
399399
}
400400
}
401401

402-
func (l *Libvirt) addIothreadMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
402+
func addIothreadMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
403403
var iothreadTotalFields = make(map[string]interface{})
404404
var iothreadData = make(map[string]map[string]interface{})
405405

@@ -446,7 +446,7 @@ func (l *Libvirt) addIothreadMetrics(metrics map[string]golibvirt.TypedParamValu
446446
}
447447
}
448448

449-
func (l *Libvirt) addMemoryMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
449+
func addMemoryMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
450450
var memoryBandwidthMonitorTotalFields = make(map[string]interface{})
451451

452452
var memoryBandwidthMonitorData = make(map[string]map[string]interface{})
@@ -528,7 +528,7 @@ func (l *Libvirt) addMemoryMetrics(metrics map[string]golibvirt.TypedParamValue,
528528
}
529529
}
530530

531-
func (l *Libvirt) addDirtyrateMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
531+
func addDirtyrateMetrics(metrics map[string]golibvirt.TypedParamValue, domainName string, acc telegraf.Accumulator) {
532532
var dirtyrateFields = make(map[string]interface{})
533533
var dirtyrateVcpuData = make(map[string]map[string]interface{})
534534

‎plugins/inputs/linux_cpu/linux_cpu.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ type prop struct {
4747
optional bool
4848
}
4949

50-
func (g *LinuxCPU) SampleConfig() string {
50+
func (*LinuxCPU) SampleConfig() string {
5151
return sampleConfig
5252
}
5353

‎plugins/inputs/logstash/logstash.go

+10-15
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,7 @@ func (logstash *Logstash) gatherProcessStats(address string, accumulator telegra
283283
}
284284

285285
// gatherPluginsStats go through a list of plugins and add their metrics to the accumulator
286-
func (logstash *Logstash) gatherPluginsStats(
287-
plugins []plugin,
288-
pluginType string,
289-
tags map[string]string,
290-
accumulator telegraf.Accumulator,
291-
) error {
286+
func gatherPluginsStats(plugins []plugin, pluginType string, tags map[string]string, accumulator telegraf.Accumulator) error {
292287
for _, plugin := range plugins {
293288
pluginTags := map[string]string{
294289
"plugin_name": plugin.Name,
@@ -370,7 +365,7 @@ func (logstash *Logstash) gatherPluginsStats(
370365
return nil
371366
}
372367

373-
func (logstash *Logstash) gatherQueueStats(queue pipelineQueue, tags map[string]string, acc telegraf.Accumulator) error {
368+
func gatherQueueStats(queue pipelineQueue, tags map[string]string, acc telegraf.Accumulator) error {
374369
queueTags := map[string]string{
375370
"queue_type": queue.Type,
376371
}
@@ -438,20 +433,20 @@ func (logstash *Logstash) gatherPipelineStats(address string, accumulator telegr
438433
}
439434
accumulator.AddFields("logstash_events", flattener.Fields, tags)
440435

441-
err = logstash.gatherPluginsStats(pipelineStats.Pipeline.Plugins.Inputs, "input", tags, accumulator)
436+
err = gatherPluginsStats(pipelineStats.Pipeline.Plugins.Inputs, "input", tags, accumulator)
442437
if err != nil {
443438
return err
444439
}
445-
err = logstash.gatherPluginsStats(pipelineStats.Pipeline.Plugins.Filters, "filter", tags, accumulator)
440+
err = gatherPluginsStats(pipelineStats.Pipeline.Plugins.Filters, "filter", tags, accumulator)
446441
if err != nil {
447442
return err
448443
}
449-
err = logstash.gatherPluginsStats(pipelineStats.Pipeline.Plugins.Outputs, "output", tags, accumulator)
444+
err = gatherPluginsStats(pipelineStats.Pipeline.Plugins.Outputs, "output", tags, accumulator)
450445
if err != nil {
451446
return err
452447
}
453448

454-
err = logstash.gatherQueueStats(pipelineStats.Pipeline.Queue, tags, accumulator)
449+
err = gatherQueueStats(pipelineStats.Pipeline.Queue, tags, accumulator)
455450
if err != nil {
456451
return err
457452
}
@@ -484,20 +479,20 @@ func (logstash *Logstash) gatherPipelinesStats(address string, accumulator teleg
484479
}
485480
accumulator.AddFields("logstash_events", flattener.Fields, tags)
486481

487-
err = logstash.gatherPluginsStats(pipeline.Plugins.Inputs, "input", tags, accumulator)
482+
err = gatherPluginsStats(pipeline.Plugins.Inputs, "input", tags, accumulator)
488483
if err != nil {
489484
return err
490485
}
491-
err = logstash.gatherPluginsStats(pipeline.Plugins.Filters, "filter", tags, accumulator)
486+
err = gatherPluginsStats(pipeline.Plugins.Filters, "filter", tags, accumulator)
492487
if err != nil {
493488
return err
494489
}
495-
err = logstash.gatherPluginsStats(pipeline.Plugins.Outputs, "output", tags, accumulator)
490+
err = gatherPluginsStats(pipeline.Plugins.Outputs, "output", tags, accumulator)
496491
if err != nil {
497492
return err
498493
}
499494

500-
err = logstash.gatherQueueStats(pipeline.Queue, tags, accumulator)
495+
err = gatherQueueStats(pipeline.Queue, tags, accumulator)
501496
if err != nil {
502497
return err
503498
}

‎plugins/inputs/lvm/lvm.go

-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ func (*LVM) SampleConfig() string {
3333
return sampleConfig
3434
}
3535

36-
func (lvm *LVM) Init() error {
37-
return nil
38-
}
39-
4036
func (lvm *LVM) Gather(acc telegraf.Accumulator) error {
4137
if err := lvm.gatherPhysicalVolumes(acc); err != nil {
4238
return err

‎plugins/inputs/mcrouter/mcrouter.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ func (m *Mcrouter) Gather(acc telegraf.Accumulator) error {
128128
}
129129

130130
for _, serverAddress := range m.Servers {
131-
acc.AddError(m.gatherServer(ctx, serverAddress, acc))
131+
acc.AddError(gatherServer(ctx, serverAddress, acc))
132132
}
133133

134134
return nil
135135
}
136136

137137
// parseAddress parses an address string into 'host:port' and 'protocol' parts
138-
func (m *Mcrouter) parseAddress(address string) (parsedAddress, protocol string, err error) {
138+
func parseAddress(address string) (parsedAddress, protocol string, err error) {
139139
var host string
140140
var port string
141141

@@ -181,13 +181,13 @@ func (m *Mcrouter) parseAddress(address string) (parsedAddress, protocol string,
181181
return parsedAddress, protocol, nil
182182
}
183183

184-
func (m *Mcrouter) gatherServer(ctx context.Context, address string, acc telegraf.Accumulator) error {
184+
func gatherServer(ctx context.Context, address string, acc telegraf.Accumulator) error {
185185
var conn net.Conn
186186
var err error
187187
var protocol string
188188
var dialer net.Dialer
189189

190-
address, protocol, err = m.parseAddress(address)
190+
address, protocol, err = parseAddress(address)
191191
if err != nil {
192192
return err
193193
}

‎plugins/inputs/mcrouter/mcrouter_test.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ import (
1515
)
1616

1717
func TestAddressParsing(t *testing.T) {
18-
m := &Mcrouter{
19-
Servers: []string{"tcp://" + testutil.GetLocalHost()},
20-
}
21-
2218
var acceptTests = [][3]string{
2319
{"tcp://localhost:8086", "localhost:8086", "tcp"},
2420
{"tcp://localhost", "localhost:" + defaultServerURL.Port(), "tcp"},
@@ -32,15 +28,15 @@ func TestAddressParsing(t *testing.T) {
3228
}
3329

3430
for _, args := range acceptTests {
35-
address, protocol, err := m.parseAddress(args[0])
31+
address, protocol, err := parseAddress(args[0])
3632

3733
require.NoError(t, err, args[0])
3834
require.Equal(t, args[1], address, args[0])
3935
require.Equal(t, args[2], protocol, args[0])
4036
}
4137

4238
for _, addr := range rejectTests {
43-
address, protocol, err := m.parseAddress(addr)
39+
address, protocol, err := parseAddress(addr)
4440

4541
require.Error(t, err, addr)
4642
require.Empty(t, address, addr)

‎plugins/inputs/modbus/configuration_metric.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type configurationPerMetric struct {
4242
logger telegraf.Logger
4343
}
4444

45-
func (c *configurationPerMetric) sampleConfigPart() string {
45+
func (*configurationPerMetric) sampleConfigPart() string {
4646
return sampleConfigPartPerMetric
4747
}
4848

@@ -366,7 +366,7 @@ func (c *configurationPerMetric) fieldID(seed maphash.Seed, def metricDefinition
366366
return mh.Sum64()
367367
}
368368

369-
func (c *configurationPerMetric) determineOutputDatatype(input string) (string, error) {
369+
func (*configurationPerMetric) determineOutputDatatype(input string) (string, error) {
370370
// Handle our special types
371371
switch input {
372372
case "INT8L", "INT8H", "INT16", "INT32", "INT64":
@@ -381,7 +381,7 @@ func (c *configurationPerMetric) determineOutputDatatype(input string) (string,
381381
return "unknown", fmt.Errorf("invalid input datatype %q for determining output", input)
382382
}
383383

384-
func (c *configurationPerMetric) determineFieldLength(input string, length uint16) (uint16, error) {
384+
func (*configurationPerMetric) determineFieldLength(input string, length uint16) (uint16, error) {
385385
// Handle our special types
386386
switch input {
387387
case "BIT", "INT8L", "INT8H", "UINT8L", "UINT8H":

0 commit comments

Comments
 (0)