chore: eliminate unnecessary use of quoted strings in printf (influxd…

…ata#12722)

agent/agent.go

@@ -710,7 +710,7 @@ func (a *Agent) connectOutput(ctx context.Context, output *models.RunningOutput)
 	err := output.Output.Connect()
 	if err != nil {
 		log.Printf("E! [agent] Failed to connect to [%s], retrying in 15s, "+
-			"error was '%s'", output.LogName(), err)
+			"error was %q", output.LogName(), err)
 
 		err := internal.SleepContext(ctx, 15*time.Second)
 		if err != nil {

cmd/telegraf/printer.go

@@ -364,7 +364,7 @@ func printConfig(name string, p telegraf.PluginDescriber, op string, commented b
 		if di.RemovalIn != "" {
 			removalNote = " and will be removed in " + di.RemovalIn
 		}
-		outputBuffer.Write([]byte(fmt.Sprintf("\n%s ## DEPRECATED: The '%s' plugin is deprecated in version %s%s, %s.",
+		outputBuffer.Write([]byte(fmt.Sprintf("\n%s ## DEPRECATED: The %q plugin is deprecated in version %s%s, %s.",
 			comment, name, di.Since, removalNote, di.Notice)))
 	}
 

config/config.go

@@ -399,7 +399,7 @@ func getDefaultConfigPath() ([]string, error) {
 	if _, err := os.Stat(etcfolder); err == nil {
 		files, err := WalkDirectory(etcfolder)
 		if err != nil {
-			log.Printf("W! unable walk '%s': %s", etcfolder, err)
+			log.Printf("W! unable walk %q: %s", etcfolder, err)
 		}
 		for _, file := range files {
 			log.Printf("I! Using config file: %s", file)

internal/internal_test.go

@@ -37,9 +37,9 @@ var tests = []SnakeTest{
 
 func TestSnakeCase(t *testing.T) {
 	for _, test := range tests {
-		if SnakeCase(test.input) != test.output {
-			t.Errorf(`SnakeCase("%s"), wanted "%s", got \%s"`, test.input, test.output, SnakeCase(test.input))
-		}
+		t.Run(test.input, func(t *testing.T) {
+			require.Equal(t, test.output, SnakeCase(test.input))
+		})
 	}
 }
 

internal/rotate/file_writer.go

@@ -131,7 +131,7 @@ func (w *FileWriter) rotateIfNeeded() error {
 		(w.maxSizeInBytes > 0 && w.bytesWritten >= w.maxSizeInBytes) {
 		if err := w.rotate(); err != nil {
 			//Ignore rotation errors and keep the log open
-			fmt.Printf("unable to rotate the file '%s', %s", w.filename, err.Error())
+			fmt.Printf("unable to rotate the file %q, %s", w.filename, err.Error())
 		}
 		return w.openCurrent()
 	}

plugins/aggregators/histogram/histogram_test.go

@@ -526,5 +526,5 @@ func assertContainsTaggedField(t *testing.T, acc *testutil.Accumulator, metricNa
 		return
 	}
 
-	require.Fail(t, fmt.Sprintf("unknown measurement '%s' with tags: %v, fields: %v", metricName, tags, fields))
+	require.Fail(t, fmt.Sprintf("unknown measurement %q with tags: %v, fields: %v", metricName, tags, fields))
 }

plugins/common/jolokia2/client.go

@@ -134,7 +134,7 @@ func (c *Client) read(requests []ReadRequest) ([]ReadResponse, error) {
 	req, err := http.NewRequest("POST", requestURL, bytes.NewBuffer(requestBody))
 	if err != nil {
 		//err is not contained in returned error - it may contain sensitive data (password) which should not be logged
-		return nil, fmt.Errorf("unable to create new request for: '%s'", c.URL)
+		return nil, fmt.Errorf("unable to create new request for: %q", c.URL)
 	}
 
 	req.Header.Add("Content-type", "application/json")
@@ -149,7 +149,7 @@ func (c *Client) read(requests []ReadRequest) ([]ReadResponse, error) {
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("response from url \"%s\" has status code %d (%s), expected %d (%s)",
+		return nil, fmt.Errorf("response from url %q has status code %d (%s), expected %d (%s)",
 			c.URL, resp.StatusCode, http.StatusText(resp.StatusCode), http.StatusOK, http.StatusText(http.StatusOK))
 	}
 

plugins/common/opcua/client.go

@@ -50,13 +50,13 @@ func (o *OpcUAClientConfig) validateEndpoint() error {
 	switch o.SecurityPolicy {
 	case "None", "Basic128Rsa15", "Basic256", "Basic256Sha256", "auto":
 	default:
-		return fmt.Errorf("invalid security type '%s' in '%s'", o.SecurityPolicy, o.Endpoint)
+		return fmt.Errorf("invalid security type %q in %q", o.SecurityPolicy, o.Endpoint)
 	}
 
 	switch o.SecurityMode {
 	case "None", "Sign", "SignAndEncrypt", "auto":
 	default:
-		return fmt.Errorf("invalid security type '%s' in '%s'", o.SecurityMode, o.Endpoint)
+		return fmt.Errorf("invalid security type %q in %q", o.SecurityMode, o.Endpoint)
 	}
 
 	return nil

plugins/common/opcua/input/input_client.go

@@ -236,7 +236,7 @@ func tagsSliceToMap(tags [][]string) (map[string]string, error) {
 
 func validateNodeToAdd(existing map[metricParts]struct{}, nmm *NodeMetricMapping) error {
 	if nmm.Tag.FieldName == "" {
-		return fmt.Errorf("empty name in '%s'", nmm.Tag.FieldName)
+		return fmt.Errorf("empty name in %q", nmm.Tag.FieldName)
 	}
 
 	if len(nmm.Tag.Namespace) == 0 {
@@ -249,19 +249,19 @@ func validateNodeToAdd(existing map[metricParts]struct{}, nmm *NodeMetricMapping
 
 	mp := newMP(nmm)
 	if _, exists := existing[mp]; exists {
-		return fmt.Errorf("name '%s' is duplicated (metric name '%s', tags '%s')",
+		return fmt.Errorf("name %q is duplicated (metric name %q, tags %q)",
 			mp.fieldName, mp.metricName, mp.tags)
 	}
 
 	switch nmm.Tag.IdentifierType {
 	case "i":
 		if _, err := strconv.Atoi(nmm.Tag.Identifier); err != nil {
-			return fmt.Errorf("identifier type '%s' does not match the type of identifier '%s'", nmm.Tag.IdentifierType, nmm.Tag.Identifier)
+			return fmt.Errorf("identifier type %q does not match the type of identifier %q", nmm.Tag.IdentifierType, nmm.Tag.Identifier)
 		}
 	case "s", "g", "b":
 		// Valid identifier type - do nothing.
 	default:
-		return fmt.Errorf("invalid identifier type '%s' in '%s'", nmm.Tag.IdentifierType, nmm.Tag.FieldName)
+		return fmt.Errorf("invalid identifier type %q in %q", nmm.Tag.IdentifierType, nmm.Tag.FieldName)
 	}
 
 	existing[mp] = struct{}{}
@@ -382,7 +382,7 @@ func (o *OpcUAInputClient) MetricForNode(nodeIdx int) telegraf.Metric {
 	fields["Quality"] = strings.TrimSpace(fmt.Sprint(o.LastReceivedData[nodeIdx].Quality))
 	if !o.StatusCodeOK(o.LastReceivedData[nodeIdx].Quality) {
 		mp := newMP(nmm)
-		o.Log.Debugf("status not OK for node '%s'(metric name '%s', tags '%s')",
+		o.Log.Debugf("status not OK for node %q(metric name %q, tags %q)",
 			mp.fieldName, mp.metricName, mp.tags)
 	}
 

plugins/common/opcua/input/input_client_test.go

@@ -1,16 +1,18 @@
 package input
 
 import (
+	"errors"
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/gopcua/opcua/ua"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/common/opcua"
 	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
-	"testing"
-	"time"
 )
 
 func TestTagsSliceToMap(t *testing.T) {
@@ -74,7 +76,7 @@ func TestValidateOPCTags(t *testing.T) {
 					},
 				},
 			},
-			fmt.Errorf("name 'fn' is duplicated (metric name 'mn', tags 't1=v1, t2=v2')"),
+			errors.New(`name "fn" is duplicated (metric name "mn", tags "t1=v1, t2=v2")`),
 		},
 		{
 			"empty tag value not allowed",
@@ -352,7 +354,7 @@ func TestValidateNodeToAdd(t *testing.T) {
 				}, map[string]string{})
 				return nmm
 			}(),
-			err: fmt.Errorf("empty name in ''"),
+			err: errors.New(`empty name in ""`),
 		},
 		{
 			name:     "empty namespace not allowed",
@@ -382,7 +384,7 @@ func TestValidateNodeToAdd(t *testing.T) {
 				}, map[string]string{})
 				return nmm
 			}(),
-			err: fmt.Errorf("invalid identifier type '' in 'f'"),
+			err: errors.New(`invalid identifier type "" in "f"`),
 		},
 		{
 			name:     "invalid identifier type not allowed",
@@ -397,7 +399,7 @@ func TestValidateNodeToAdd(t *testing.T) {
 				}, map[string]string{})
 				return nmm
 			}(),
-			err: fmt.Errorf("invalid identifier type 'j' in 'f'"),
+			err: errors.New(`invalid identifier type "j" in "f"`),
 		},
 		{
 			name: "duplicate metric not allowed",
@@ -414,7 +416,7 @@ func TestValidateNodeToAdd(t *testing.T) {
 				}, map[string]string{})
 				return nmm
 			}(),
-			err: fmt.Errorf("name 'f' is duplicated (metric name 'testmetric', tags 't1=v1, t2=v2')"),
+			err: errors.New(`name "f" is duplicated (metric name "testmetric", tags "t1=v1, t2=v2")`),
 		},
 		{
 			name:     "identifier type mismatch",
@@ -429,7 +431,7 @@ func TestValidateNodeToAdd(t *testing.T) {
 				}, map[string]string{})
 				return nmm
 			}(),
-			err: fmt.Errorf("identifier type 'i' does not match the type of identifier 'hf'"),
+			err: errors.New(`identifier type "i" does not match the type of identifier "hf"`),
 		},
 	}
 

plugins/common/shim/input.go

@@ -56,7 +56,7 @@ func (s *Shim) RunInput(pollInterval time.Duration) error {
 	go func() {
 		err := s.writeProcessedMetrics()
 		if err != nil {
-			s.log.Warnf("%s", err)
+			s.log.Warn(err.Error())
 		}
 		wg.Done()
 	}()

plugins/common/shim/processor.go

@@ -47,7 +47,7 @@ func (s *Shim) RunProcessor() error {
 	go func() {
 		err := s.writeProcessedMetrics()
 		if err != nil {
-			s.log.Warnf("%s", err)
+			s.log.Warn(err.Error())
 		}
 		wg.Done()
 	}()

plugins/common/starlark/builtins.go

@@ -77,7 +77,7 @@ type builtinMethod func(b *starlark.Builtin, args starlark.Tuple, kwargs []starl
 func builtinAttr(recv starlark.Value, name string, methods map[string]builtinMethod) (starlark.Value, error) {
 	method := methods[name]
 	if method == nil {
-		return starlark.None, fmt.Errorf("no such method '%s'", name)
+		return starlark.None, fmt.Errorf("no such method %q", name)
 	}
 
 	// Allocate a closure over 'method'.

plugins/common/starlark/metric.go

@@ -104,7 +104,7 @@ func (m *Metric) SetField(name string, value starlark.Value) error {
 		return errors.New("cannot set fields")
 	default:
 		return starlark.NoSuchAttrError(
-			fmt.Sprintf("cannot assign to field '%s'", name))
+			fmt.Sprintf("cannot assign to field %q", name))
 	}
 }
 

plugins/common/tls/config.go

@@ -77,7 +77,7 @@ func (c *ClientConfig) TLSConfig() (*tls.Config, error) {
 	case "freely":
 		renegotiationMethod = tls.RenegotiateFreelyAsClient
 	default:
-		return nil, fmt.Errorf("unrecognized renegotation method '%s', choose from: 'never', 'once', 'freely'", c.RenegotiationMethod)
+		return nil, fmt.Errorf("unrecognized renegotation method %q, choose from: 'never', 'once', 'freely'", c.RenegotiationMethod)
 	}
 
 	tlsConfig := &tls.Config{

plugins/inputs/azure_storage_queue/azure_storage_queue.go

@@ -88,7 +88,7 @@ func (a *AzureStorageQueue) Gather(acc telegraf.Accumulator) error {
 	ctx := context.TODO()
 
 	for marker := (azqueue.Marker{}); marker.NotDone(); {
-		a.Log.Debugf("Listing queues of storage account '%s'", a.StorageAccountName)
+		a.Log.Debugf("Listing queues of storage account %q", a.StorageAccountName)
 		queuesSegment, err := serviceURL.ListQueuesSegment(ctx, marker,
 			azqueue.ListQueuesSegmentOptions{
 				Detail: azqueue.ListQueuesSegmentDetails{Metadata: false},
@@ -99,7 +99,7 @@ func (a *AzureStorageQueue) Gather(acc telegraf.Accumulator) error {
 		marker = queuesSegment.NextMarker
 
 		for _, queueItem := range queuesSegment.QueueItems {
-			a.Log.Debugf("Processing queue '%s' of storage account '%s'", queueItem.Name, a.StorageAccountName)
+			a.Log.Debugf("Processing queue %q of storage account %q", queueItem.Name, a.StorageAccountName)
 			queueURL := serviceURL.NewQueueURL(queueItem.Name)
 			properties, err := queueURL.GetProperties(ctx)
 			if err != nil {

plugins/inputs/bond/bond.go

@@ -137,7 +137,7 @@ func (bond *Bond) gatherBondPart(bondName string, rawFile string, acc telegraf.A
 	if err := scanner.Err(); err != nil {
 		return err
 	}
-	return fmt.Errorf("Couldn't find status info for '%s' ", bondName)
+	return fmt.Errorf("Couldn't find status info for %q", bondName)
 }
 
 func (bond *Bond) readSysFiles(bondDir string) (sysFiles, error) {

plugins/inputs/cassandra/cassandra.go

@@ -130,7 +130,7 @@ func (j javaMetric) addTagsFields(out map[string]interface{}) {
 		}
 		j.acc.AddFields(tokens["class"]+tokens["type"], fields, tags)
 	} else {
-		j.acc.AddError(fmt.Errorf("missing key 'value' in '%s' output response: %v", j.metric, out))
+		j.acc.AddError(fmt.Errorf("missing key 'value' in %q output response: %v", j.metric, out))
 	}
 }
 
@@ -154,7 +154,7 @@ func (c cassandraMetric) addTagsFields(out map[string]interface{}) {
 		tokens["scope"] == "*") {
 		valuesMap, ok := out["value"]
 		if !ok {
-			c.acc.AddError(fmt.Errorf("missing key 'value' in '%s' output response: %v", c.metric, out))
+			c.acc.AddError(fmt.Errorf("missing key 'value' in %q output response: %v", c.metric, out))
 			return
 		}
 		for k, v := range valuesMap.(map[string]interface{}) {
@@ -163,7 +163,7 @@ func (c cassandraMetric) addTagsFields(out map[string]interface{}) {
 	} else {
 		values, ok := out["value"]
 		if !ok {
-			c.acc.AddError(fmt.Errorf("missing key 'value' in '%s' output response: %v", c.metric, out))
+			c.acc.AddError(fmt.Errorf("missing key 'value' in %q output response: %v", c.metric, out))
 			return
 		}
 		addCassandraMetric(r.(map[string]interface{})["mbean"].(string), c, values.(map[string]interface{}))
@@ -185,7 +185,7 @@ func (c *Cassandra) getAttr(requestURL *url.URL) (map[string]interface{}, error)
 
 	// Process response
 	if resp.StatusCode != http.StatusOK {
-		err = fmt.Errorf("response from url \"%s\" has status code %d (%s), expected %d (%s)",
+		err = fmt.Errorf("response from url %q has status code %d (%s), expected %d (%s)",
 			requestURL,
 			resp.StatusCode,
 			http.StatusText(resp.StatusCode),

plugins/inputs/ceph/ceph_test.go

@@ -177,7 +177,7 @@ func assertFoundSocket(t *testing.T, dir, sockType string, i int, sockets []*soc
 		require.NoError(t, err)
 		if s.socket == expected {
 			found = true
-			require.Equal(t, s.sockType, sockType, "Unexpected socket type for '%s'", s)
+			require.Equal(t, s.sockType, sockType, "Unexpected socket type for %q", s)
 			require.Equal(t, s.sockID, strconv.Itoa(i))
 		}
 	}

plugins/inputs/conntrack/conntrack.go

@@ -97,7 +97,7 @@ func (c *Conntrack) Gather(acc telegraf.Accumulator) error {
 			fields[metricKey], err = strconv.ParseFloat(v, 64)
 			if err != nil {
 				acc.AddError(fmt.Errorf("failed to parse metric, expected number but "+
-					" found '%s': %v", v, err))
+					" found %q: %w", v, err))
 			}
 		}
 	}

plugins/inputs/cpu/cpu_test.go

@@ -132,14 +132,14 @@ func assertContainsTaggedFloat(
 							return
 						}
 					} else {
-						require.Fail(t, fmt.Sprintf("Measurement \"%s\" does not have type float64", measurement))
+						require.Fail(t, fmt.Sprintf("Measurement %q does not have type float64", measurement))
 					}
 				}
 			}
 		}
 	}
 	msg := fmt.Sprintf(
-		"Could not find measurement \"%s\" with requested tags within %f of %f, Actual: %f",
+		"Could not find measurement %q with requested tags within %f of %f, Actual: %f",
 		measurement, delta, expectedValue, actualValue)
 	require.Fail(t, msg)
 }

plugins/inputs/disque/disque.go

@@ -117,7 +117,7 @@ func (d *Disque) gatherServer(addr *url.URL, acc telegraf.Accumulator) error {
 					return err
 				}
 				if line[0] != '+' {
-					return fmt.Errorf("%s", strings.TrimSpace(line)[1:])
+					return errors.New(strings.TrimSpace(line)[1:])
 				}
 			}
 		}

plugins/inputs/elasticsearch_query/aggregation_parser.go

@@ -67,12 +67,12 @@ func recurseResponse(acc telegraf.Accumulator, aggNameFunction map[string]string
 	for _, aggName := range aggNames {
 		aggFunction, found := aggNameFunction[aggName]
 		if !found {
-			return m, fmt.Errorf("child aggregation function '%s' not found %v", aggName, aggNameFunction)
+			return m, fmt.Errorf("child aggregation function %q not found %v", aggName, aggNameFunction)
 		}
 
 		resp := getResponseAggregation(aggFunction, aggName, bucketResponse)
 		if resp == nil {
-			return m, fmt.Errorf("child aggregation '%s' not found", aggName)
+			return m, fmt.Errorf("child aggregation %q not found", aggName)
 		}
 
 		switch resp := resp.(type) {

plugins/inputs/elasticsearch_query/aggregation_query.go

@@ -210,7 +210,7 @@ func getFunctionAggregation(function string, aggfield string) (elastic5.Aggregat
 	case "max":
 		agg = elastic5.NewMaxAggregation().Field(aggfield)
 	default:
-		return nil, fmt.Errorf("aggregation function '%s' not supported", function)
+		return nil, fmt.Errorf("aggregation function %q not supported", function)
 	}
 
 	return agg, nil

plugins/inputs/elasticsearch_query/elasticsearch_query.go

@@ -84,7 +84,7 @@ func (e *ElasticsearchQuery) Init() error {
 		}
 		err = e.initAggregation(ctx, agg, i)
 		if err != nil {
-			e.Log.Errorf("%s", err)
+			e.Log.Error(err.Error())
 			return nil
 		}
 	}
@@ -100,7 +100,7 @@ func (e *ElasticsearchQuery) initAggregation(ctx context.Context, agg esAggregat
 
 	for _, metricField := range agg.MetricFields {
 		if _, ok := agg.mapMetricFields[metricField]; !ok {
-			return fmt.Errorf("metric field '%s' not found on index '%s'", metricField, agg.Index)
+			return fmt.Errorf("metric field %q not found on index %q", metricField, agg.Index)
 		}
 	}