chore: Enable revive:enforce-repeated-arg-type-style rule (influxda…

…ta#16182)

.golangci.yml

@@ -265,6 +265,8 @@ linters-settings:
       - name: enforce-map-style
         arguments: ["make"]
         exclude: [ "TEST" ]
+      - name: enforce-repeated-arg-type-style
+        arguments: ["short"]
       - name: enforce-slice-style
         arguments: ["make"]
       - name: error-naming

agent/agent.go

@@ -672,11 +672,7 @@ func (a *Agent) runProcessors(
 }
 
 // startAggregators sets up the aggregator unit and returns the source channel.
-func (a *Agent) startAggregators(
-	aggC chan<- telegraf.Metric,
-	outputC chan<- telegraf.Metric,
-	aggregators []*models.RunningAggregator,
-) (chan<- telegraf.Metric, *aggregatorUnit) {
+func (a *Agent) startAggregators(aggC, outputC chan<- telegraf.Metric, aggregators []*models.RunningAggregator) (chan<- telegraf.Metric, *aggregatorUnit) {
 	src := make(chan telegraf.Metric, 100)
 	unit := &aggregatorUnit{
 		src:         src,

config/config.go

@@ -951,10 +951,10 @@ func (c *Config) LinkSecrets() error {
 	return nil
 }
 
-func (c *Config) probeParser(parentcategory string, parentname string, table *ast.Table) bool {
+func (c *Config) probeParser(parentCategory, parentName string, table *ast.Table) bool {
 	dataFormat := c.getFieldString(table, "data_format")
 	if dataFormat == "" {
-		dataFormat = setDefaultParser(parentcategory, parentname)
+		dataFormat = setDefaultParser(parentCategory, parentName)
 	}
 
 	creator, ok := parsers.Parsers[dataFormat]
@@ -1812,7 +1812,7 @@ func keys(m map[string]bool) []string {
 	return result
 }
 
-func setDefaultParser(category string, name string) string {
+func setDefaultParser(category, name string) string {
 	// Legacy support, exec plugin originally parsed JSON by default.
 	if category == "inputs" && name == "exec" {
 		return "json"

config/secret.go

@@ -308,7 +308,7 @@ func resolve(secret []byte, resolvers map[string]telegraf.ResolveFunc) ([]byte,
 	return newsecret, remaining, replaceErrs
 }
 
-func splitLink(s string) (storeid string, key string) {
+func splitLink(s string) (storeID, key string) {
 	// There should _ALWAYS_ be two parts due to the regular expression match
 	parts := strings.SplitN(s[2:len(s)-1], ":", 2)
 	return parts[0], parts[1]

filter/filter.go

@@ -101,19 +101,11 @@ type IncludeExcludeFilter struct {
 	excludeDefault bool
 }
 
-func NewIncludeExcludeFilter(
-	include []string,
-	exclude []string,
-) (Filter, error) {
+func NewIncludeExcludeFilter(include, exclude []string) (Filter, error) {
 	return NewIncludeExcludeFilterDefaults(include, exclude, true, false)
 }
 
-func NewIncludeExcludeFilterDefaults(
-	include []string,
-	exclude []string,
-	includeDefault bool,
-	excludeDefault bool,
-) (Filter, error) {
+func NewIncludeExcludeFilterDefaults(include, exclude []string, includeDefault, excludeDefault bool) (Filter, error) {
 	in, err := Compile(include)
 	if err != nil {
 		return nil, err

internal/docker/docker.go

@@ -4,7 +4,7 @@ import "strings"
 
 // ParseImage Adapts some of the logic from the actual Docker library's image parsing routines:
 // https://github.com/docker/distribution/blob/release/2.7/reference/normalize.go
-func ParseImage(image string) (imageName string, imageVersion string) {
+func ParseImage(image string) (imageName, imageVersion string) {
 	domain := ""
 	remainder := ""
 

internal/internal.go

@@ -359,7 +359,7 @@ func sanitizeTimestamp(timestamp string, decimalSeparator []string) string {
 }
 
 // parseTime parses a string timestamp according to the format string.
-func parseTime(format string, timestamp string, location *time.Location) (time.Time, error) {
+func parseTime(format, timestamp string, location *time.Location) (time.Time, error) {
 	loc := location
 	if loc == nil {
 		loc = time.UTC

internal/process/process.go

@@ -37,7 +37,7 @@ type Process struct {
 }
 
 // New creates a new process wrapper
-func New(command []string, envs []string) (*Process, error) {
+func New(command, envs []string) (*Process, error) {
 	if len(command) == 0 {
 		return nil, errors.New("no command")
 	}

internal/templating/template.go

@@ -81,9 +81,8 @@ func NewDefaultTemplateWithPattern(pattern string) (*Template, error) {
 	return NewTemplate(DefaultSeparator, pattern, nil)
 }
 
-// NewTemplate returns a new template ensuring it has a measurement
-// specified.
-func NewTemplate(separator string, pattern string, defaultTags map[string]string) (*Template, error) {
+// NewTemplate returns a new template ensuring it has a measurement specified.
+func NewTemplate(separator, pattern string, defaultTags map[string]string) (*Template, error) {
 	parts := strings.Split(pattern, separator)
 	hasMeasurement := false
 	template := &Template{

models/buffer.go

@@ -67,7 +67,7 @@ func NewBuffer(name, id, alias string, capacity int, strategy, path string) (Buf
 	return nil, fmt.Errorf("invalid buffer strategy %q", strategy)
 }
 
-func NewBufferStats(name string, alias string, capacity int) BufferStats {
+func NewBufferStats(name, alias string, capacity int) BufferStats {
 	tags := map[string]string{"output": name}
 	if alias != "" {
 		tags["alias"] = alias

models/filter.go

@@ -284,7 +284,7 @@ func (f *Filter) compileMetricFilter() error {
 	return err
 }
 
-func ShouldPassFilters(include filter.Filter, exclude filter.Filter, key string) bool {
+func ShouldPassFilters(include, exclude filter.Filter, key string) bool {
 	if include != nil && exclude != nil {
 		return include.Match(key) && !exclude.Match(key)
 	} else if include != nil {
@@ -295,7 +295,7 @@ func ShouldPassFilters(include filter.Filter, exclude filter.Filter, key string)
 	return true
 }
 
-func ShouldTagsPass(passFilters []TagFilter, dropFilters []TagFilter, tags []*telegraf.Tag) bool {
+func ShouldTagsPass(passFilters, dropFilters []TagFilter, tags []*telegraf.Tag) bool {
 	pass := func(tpf []TagFilter) bool {
 		for _, pat := range tpf {
 			if pat.filter == nil {

models/makemetric.go

@@ -4,16 +4,8 @@ import (
 	"github.com/influxdata/telegraf"
 )
 
-// makemetric applies new metric plugin and agent measurement and tag
-// settings.
-func makemetric(
-	metric telegraf.Metric,
-	nameOverride string,
-	namePrefix string,
-	nameSuffix string,
-	tags map[string]string,
-	globalTags map[string]string,
-) telegraf.Metric {
+// makeMetric applies new metric plugin and agent measurement and tag settings.
+func makeMetric(metric telegraf.Metric, nameOverride, namePrefix, nameSuffix string, tags, globalTags map[string]string) telegraf.Metric {
 	if len(nameOverride) != 0 {
 		metric.SetName(nameOverride)
 	}

models/running_aggregator.go

@@ -121,7 +121,7 @@ func (r *RunningAggregator) UpdateWindow(start, until time.Time) {
 }
 
 func (r *RunningAggregator) MakeMetric(telegrafMetric telegraf.Metric) telegraf.Metric {
-	m := makemetric(
+	m := makeMetric(
 		telegrafMetric,
 		r.Config.NameOverride,
 		r.Config.MeasurementPrefix,

models/running_input.go

@@ -192,7 +192,7 @@ func (r *RunningInput) MakeMetric(metric telegraf.Metric) telegraf.Metric {
 		return nil
 	}
 
-	makemetric(
+	makeMetric(
 		metric,
 		r.Config.NameOverride,
 		r.Config.MeasurementPrefix,
@@ -214,7 +214,7 @@ func (r *RunningInput) MakeMetric(metric telegraf.Metric) telegraf.Metric {
 		if r.Config.AlwaysIncludeGlobalTags {
 			global = r.defaultTags
 		}
-		makemetric(metric, "", "", "", local, global)
+		makeMetric(metric, "", "", "", local, global)
 	}
 
 	switch r.Config.TimeSource {

models/running_output.go

@@ -70,12 +70,7 @@ type RunningOutput struct {
 	aggMutex sync.Mutex
 }
 
-func NewRunningOutput(
-	output telegraf.Output,
-	config *OutputConfig,
-	batchSize int,
-	bufferLimit int,
-) *RunningOutput {
+func NewRunningOutput(output telegraf.Output, config *OutputConfig, batchSize, bufferLimit int) *RunningOutput {
 	tags := map[string]string{"output": config.Name}
 	if config.Alias != "" {
 		tags["alias"] = config.Alias

plugins/aggregators/histogram/histogram.go

@@ -163,11 +163,7 @@ func (h *HistogramAggregator) Push(acc telegraf.Accumulator) {
 
 // groupFieldsByBuckets groups fields by metric buckets which are represented as tags
 func (h *HistogramAggregator) groupFieldsByBuckets(
-	metricsWithGroupedFields *[]groupedByCountFields,
-	name string,
-	field string,
-	tags map[string]string,
-	counts []int64,
+	metricsWithGroupedFields *[]groupedByCountFields, name, field string, tags map[string]string, counts []int64,
 ) {
 	sum := int64(0)
 	buckets := h.getBuckets(name, field) // note that len(buckets) + 1 == len(counts)
@@ -193,13 +189,7 @@ func (h *HistogramAggregator) groupFieldsByBuckets(
 }
 
 // groupField groups field by count value
-func (h *HistogramAggregator) groupField(
-	metricsWithGroupedFields *[]groupedByCountFields,
-	name string,
-	field string,
-	count int64,
-	tags map[string]string,
-) {
+func (h *HistogramAggregator) groupField(metricsWithGroupedFields *[]groupedByCountFields, name, field string, count int64, tags map[string]string) {
 	for key, metric := range *metricsWithGroupedFields {
 		if name == metric.name && isTagsIdentical(tags, metric.tags) {
 			(*metricsWithGroupedFields)[key].fieldsWithCount[field] = count
@@ -233,7 +223,7 @@ func (h *HistogramAggregator) resetCache() {
 }
 
 // getBuckets finds buckets and returns them
-func (h *HistogramAggregator) getBuckets(metric string, field string) []float64 {
+func (h *HistogramAggregator) getBuckets(metric, field string) []float64 {
 	if buckets, ok := h.buckets[metric][field]; ok {
 		return buckets
 	}

plugins/aggregators/histogram/histogram_test.go

@@ -17,16 +17,12 @@ type fields map[string]interface{}
 type tags map[string]string
 
 // NewTestHistogram creates new test histogram aggregation with specified config
-func NewTestHistogram(cfg []bucketConfig, reset bool, cumulative bool, pushOnlyOnUpdate bool) telegraf.Aggregator {
+func NewTestHistogram(cfg []bucketConfig, reset, cumulative, pushOnlyOnUpdate bool) telegraf.Aggregator {
 	return NewTestHistogramWithExpirationInterval(cfg, reset, cumulative, pushOnlyOnUpdate, 0)
 }
 
 func NewTestHistogramWithExpirationInterval(
-	cfg []bucketConfig,
-	reset bool,
-	cumulative bool,
-	pushOnlyOnUpdate bool,
-	expirationInterval config.Duration,
+	cfg []bucketConfig, reset, cumulative, pushOnlyOnUpdate bool, expirationInterval config.Duration,
 ) telegraf.Aggregator {
 	htm := NewHistogramAggregator()
 	htm.Configs = cfg

plugins/all_test.go

@@ -46,7 +46,7 @@ func testPluginDirectory(t *testing.T, directory string) {
 	require.NoError(t, err)
 }
 
-func parseSourceFile(t *testing.T, goPluginFile string, pluginCategory string) {
+func parseSourceFile(t *testing.T, goPluginFile, pluginCategory string) {
 	fset := token.NewFileSet()
 	node, err := parser.ParseFile(fset, goPluginFile, nil, parser.ParseComments)
 	require.NoError(t, err)
@@ -80,7 +80,7 @@ func resolvePluginFromImports(t *testing.T, imports []*ast.ImportSpec) string {
 	return filepath.Base(importPath)
 }
 
-func testBuildTags(t *testing.T, buildComment string, pluginCategory string, plugin string) {
+func testBuildTags(t *testing.T, buildComment, pluginCategory, plugin string) {
 	tags := strings.Split(buildComment, "||")
 	// tags might contain spaces and hence trim
 	tags = stringMap(tags, strings.TrimSpace)

plugins/common/opcua/opcua_util.go

@@ -31,7 +31,7 @@ func newTempDir() (string, error) {
 	return dir, err
 }
 
-func generateCert(host string, rsaBits int, certFile, keyFile string, dur time.Duration) (cert string, key string, err error) {
+func generateCert(host string, rsaBits int, certFile, keyFile string, dur time.Duration) (cert, key string, err error) {
 	dir, err := newTempDir()
 	if err != nil {
 		return "", "", fmt.Errorf("failed to create certificate: %w", err)

plugins/common/parallel/ordered.go

@@ -17,12 +17,7 @@ type Ordered struct {
 	queue chan futureMetric
 }
 
-func NewOrdered(
-	acc telegraf.Accumulator,
-	fn func(telegraf.Metric) []telegraf.Metric,
-	orderedQueueSize int,
-	workerCount int,
-) *Ordered {
+func NewOrdered(acc telegraf.Accumulator, fn func(telegraf.Metric) []telegraf.Metric, orderedQueueSize, workerCount int) *Ordered {
 	p := &Ordered{
 		fn:          fn,
 		workerQueue: make(chan job, workerCount),

plugins/common/shim/processor_test.go

@@ -30,7 +30,7 @@ func TestProcessorShimWithLargerThanDefaultScannerBufferSize(t *testing.T) {
 	testSendAndReceive(t, "f1", string(b))
 }
 
-func testSendAndReceive(t *testing.T, fieldKey string, fieldValue string) {
+func testSendAndReceive(t *testing.T, fieldKey, fieldValue string) {
 	p := &testProcessor{"hi", "mom"}
 
 	stdinReader, stdinWriter := io.Pipe()

plugins/inputs/kinesis_consumer/kinesis_consumer.go

@@ -355,8 +355,8 @@ func (t *telegrafLoggerWrapper) Logf(classification logging.Classification, form
 // noopStore implements the storage interface with discard
 type noopStore struct{}
 
-func (n noopStore) SetCheckpoint(string, string, string) error   { return nil }
-func (n noopStore) GetCheckpoint(string, string) (string, error) { return "", nil }
+func (n noopStore) SetCheckpoint(_, _, _ string) error        { return nil }
+func (n noopStore) GetCheckpoint(_, _ string) (string, error) { return "", nil }
 
 func init() {
 	negOne, _ = new(big.Int).SetString("-1", 10)

plugins/inputs/win_eventlog/win_eventlog.go

@@ -294,7 +294,7 @@ func (w *WinEventLog) shouldProcessField(field string) (should bool, list string
 	return false, "excluded"
 }
 
-func (w *WinEventLog) shouldExcludeEmptyField(field string, fieldType string, fieldValue interface{}) (should bool) {
+func (w *WinEventLog) shouldExcludeEmptyField(field, fieldType string, fieldValue interface{}) (should bool) {
 	if w.fieldEmptyFilter == nil || !w.fieldEmptyFilter.Match(field) {
 		return false
 	}
@@ -496,11 +496,7 @@ func (w *WinEventLog) renderRemoteMessage(event Event) (Event, error) {
 	return event, nil
 }
 
-func formatEventString(
-	messageFlag EvtFormatMessageFlag,
-	eventHandle EvtHandle,
-	publisherHandle EvtHandle,
-) (string, error) {
+func formatEventString(messageFlag EvtFormatMessageFlag, eventHandle, publisherHandle EvtHandle) (string, error) {
 	var bufferUsed uint32
 	err := _EvtFormatMessage(publisherHandle, eventHandle, 0, 0, 0, messageFlag,
 		0, nil, &bufferUsed)

plugins/inputs/win_eventlog/zsyscall_windows.go

@@ -156,7 +156,7 @@ func _EvtClose(object EvtHandle) error {
 	return err
 }
 
-func _EvtNext(resultSet EvtHandle, eventArraySize uint32, eventArray *EvtHandle, timeout uint32, flags uint32, numReturned *uint32) error {
+func _EvtNext(resultSet EvtHandle, eventArraySize uint32, eventArray *EvtHandle, timeout, flags uint32, numReturned *uint32) error {
 	r1, _, e1 := syscall.SyscallN(
 		procEvtNext.Addr(),
 		uintptr(resultSet),
@@ -214,7 +214,7 @@ func _EvtFormatMessage(
 	return err
 }
 
-func _EvtOpenPublisherMetadata(session EvtHandle, publisherIdentity *uint16, logFilePath *uint16, locale uint32, flags uint32) (EvtHandle, error) {
+func _EvtOpenPublisherMetadata(session EvtHandle, publisherIdentity, logFilePath *uint16, locale, flags uint32) (EvtHandle, error) {
 	r0, _, e1 := syscall.SyscallN(
 		procEvtOpenPublisherMetadata.Addr(),
 		uintptr(session),

plugins/inputs/win_perf_counters/pdh.go

@@ -482,7 +482,7 @@ func PdhGetFormattedCounterValueDouble(hCounter pdhCounterHandle, lpdwType *uint
 //			time.Sleep(2000 * time.Millisecond)
 //		}
 //	}
-func PdhGetFormattedCounterArrayDouble(hCounter pdhCounterHandle, lpdwBufferSize *uint32, lpdwBufferCount *uint32, itemBuffer *byte) uint32 {
+func PdhGetFormattedCounterArrayDouble(hCounter pdhCounterHandle, lpdwBufferSize, lpdwBufferCount *uint32, itemBuffer *byte) uint32 {
 	ret, _, _ := pdhGetFormattedCounterArrayW.Call(
 		uintptr(hCounter),
 		uintptr(PdhFmtDouble|PdhFmtNocap100),
@@ -500,7 +500,7 @@ func PdhGetFormattedCounterArrayDouble(hCounter pdhCounterHandle, lpdwBufferSize
 // call PdhGetCounterInfo and access dwQueryUserData of the pdhCounterInfo structure. phQuery is
 // the handle to the query, and must be used in subsequent calls. This function returns a PDH_
 // constant error code, or ErrorSuccess if the call succeeded.
-func PdhOpenQuery(szDataSource uintptr, dwUserData uintptr, phQuery *pdhQueryHandle) uint32 {
+func PdhOpenQuery(szDataSource, dwUserData uintptr, phQuery *pdhQueryHandle) uint32 {
 	ret, _, _ := pdhOpenQuery.Call(
 		szDataSource,
 		dwUserData,
@@ -638,7 +638,7 @@ func PdhGetRawCounterValue(hCounter pdhCounterHandle, lpdwType *uint32, pValue *
 // ItemBuffer
 // Caller-allocated buffer that receives the array of pdhRawCounterItem structures; the structures contain the raw instance counter values.
 // Set to NULL if lpdwBufferSize is zero.
-func PdhGetRawCounterArray(hCounter pdhCounterHandle, lpdwBufferSize *uint32, lpdwBufferCount *uint32, itemBuffer *byte) uint32 {
+func PdhGetRawCounterArray(hCounter pdhCounterHandle, lpdwBufferSize, lpdwBufferCount *uint32, itemBuffer *byte) uint32 {
 	ret, _, _ := pdhGetRawCounterArrayW.Call(
 		uintptr(hCounter),
 		uintptr(unsafe.Pointer(lpdwBufferSize)),  //nolint:gosec // G103: Valid use of unsafe call to pass lpdwBufferSize

plugins/outputs/influxdb/udp_test.go

@@ -62,7 +62,7 @@ type MockDialer struct {
 	DialContextF func() (influxdb.Conn, error)
 }
 
-func (d *MockDialer) DialContext(context.Context, string, string) (influxdb.Conn, error) {
+func (d *MockDialer) DialContext(_ context.Context, _, _ string) (influxdb.Conn, error) {
 	return d.DialContextF()
 }