Merge remote-tracking branch 'upstream/master' into revive_import-ali…

…as-naming_redundant-import-alias

# Conflicts:
#	plugins/inputs/aerospike/aerospike.go
#	plugins/inputs/gnmi/gnmi.go

plugins/inputs/aerospike/aerospike.go

@@ -326,14 +326,7 @@ func (a *Aerospike) parseSetInfo(acc telegraf.Accumulator, stats map[string]stri
 	acc.AddFields("aerospike_set", nFields, nTags, time.Now())
 }
 
-func (a *Aerospike) getTTLHistogram(
-	acc telegraf.Accumulator,
-	hostPort string,
-	namespace string,
-	set string,
-	n *as.Node,
-	infoPolicy *as.InfoPolicy,
-) error {
+func (a *Aerospike) getTTLHistogram(acc telegraf.Accumulator, hostPort, namespace, set string, n *as.Node, infoPolicy *as.InfoPolicy) error {
 	stats, err := a.getHistogram(namespace, set, "ttl", n, infoPolicy)
 	if err != nil {
 		return err
@@ -357,13 +350,7 @@ func (a *Aerospike) getObjectSizeLinearHistogram(acc telegraf.Accumulator, hostP
 	return nil
 }
 
-func (a *Aerospike) getHistogram(
-	namespace string,
-	set string,
-	histogramType string,
-	n *as.Node,
-	infoPolicy *as.InfoPolicy,
-) (map[string]string, error) {
+func (a *Aerospike) getHistogram(namespace, set, histogramType string, n *as.Node, infoPolicy *as.InfoPolicy) (map[string]string, error) {
 	var queryArg string
 	if len(set) > 0 {
 		queryArg = fmt.Sprintf("histogram:type=%s;namespace=%v;set=%v", histogramType, namespace, set)

plugins/inputs/gnmi/gnmi.go

@@ -377,7 +377,7 @@ func (c *GNMI) newSubscribeRequest() (*gnmi.SubscribeRequest, error) {
 }
 
 // ParsePath from XPath-like string to gNMI path structure
-func parsePath(origin string, pathToParse string, target string) (*gnmi.Path, error) {
+func parsePath(origin, pathToParse, target string) (*gnmi.Path, error) {
 	gnmiPath, err := xpath.ToGNMIPath(pathToParse)
 	if err != nil {
 		return nil, err