Simple lint fixes to help support newer version of github.com/golangci/golangci-lint in /internal/tools

internal/signalfx-agent/pkg/core/common/httpclient/http_test.go

@@ -3,7 +3,6 @@ package httpclient
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"errors"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -152,7 +151,7 @@ func TestHttpTimeout(t *testing.T) {
 		}
 		req.Error(err)
 		var uerr *url.Error
-		req.True(errors.As(err, &uerr))
+		req.ErrorAs(err, &uerr)
 		req.True(uerr.Timeout())
 	})
 }

internal/signalfx-agent/pkg/core/config/config_test.go

@@ -20,10 +20,10 @@ func TestWriterOutputValidation(t *testing.T) {
 				{ProcPath: "/proc"},
 			},
 		}
-		require.Nil(t, defaults.Set(c))
+		require.NoError(t, defaults.Set(c))
 
 		err := c.validate()
-		require.NotNil(t, err)
+		require.Error(t, err)
 		require.Contains(t, err.Error(), "output are disabled")
 	})
 
@@ -37,9 +37,9 @@ func TestWriterOutputValidation(t *testing.T) {
 				{ProcPath: "/proc"},
 			},
 		}
-		require.Nil(t, defaults.Set(c))
+		require.NoError(t, defaults.Set(c))
 
 		err := c.validate()
-		require.Nil(t, err)
+		require.NoError(t, err)
 	})
 }

internal/signalfx-agent/pkg/core/config/filters_test.go

@@ -184,7 +184,7 @@ func TestNewFilters(t *testing.T) {
 				},
 			},
 		})
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 
 		assert.True(t, f.Matches(&datapoint.Datapoint{Metric: "disk.utilization"}))
 		assert.True(t, f.Matches(&datapoint.Datapoint{

internal/signalfx-agent/pkg/core/config/sources/vault/auth/gcp.go

@@ -1,7 +1,7 @@
 package auth
 
 import (
-	"fmt"
+	"strconv"
 
 	gcpauth "github.com/hashicorp/vault-plugin-auth-gcp/plugin"
 	"github.com/hashicorp/vault/api"
@@ -61,7 +61,7 @@ func (ic *GCPConfig) GetToken(client *api.Client) (*api.Secret, error) {
 		data["credentials"] = *ic.Credentials
 	}
 	if ic.JWTExp != nil {
-		data["jwt_exp"] = fmt.Sprintf("%d", *ic.JWTExp)
+		data["jwt_exp"] = strconv.Itoa(*ic.JWTExp)
 	}
 	if ic.ServiceAccount != nil {
 		data["service_account"] = *ic.ServiceAccount

internal/signalfx-agent/pkg/core/dpfilters/filter.go

@@ -13,7 +13,7 @@ import (
 type DatapointFilter interface {
 	// Matches takes a datapoint and returns whether it is matched by the
 	// filter
-	Matches(*datapoint.Datapoint) bool
+	Matches(dp *datapoint.Datapoint) bool
 }
 
 // BasicDatapointFilter is designed to filter SignalFx datapoint objects.  It

internal/signalfx-agent/pkg/core/propfilters/filter_test.go

@@ -16,7 +16,7 @@ func TestFilters(t *testing.T) {
 		filteredProperties := f.FilterProperties(properties)
 
 		expectedProperties := map[string]string{"replicaSet": "abc"}
-		assert.Equal(t, filteredProperties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredProperties)
 	})
 
 	t.Run("Filter a regex property name", func(t *testing.T) {
@@ -27,7 +27,7 @@ func TestFilters(t *testing.T) {
 		filteredProperties := f.FilterProperties(properties)
 
 		expectedProperties := map[string]string{"replicaSet": "abc"}
-		assert.Equal(t, filteredProperties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredProperties)
 	})
 
 	t.Run("Filter a globbed property name", func(t *testing.T) {
@@ -38,7 +38,7 @@ func TestFilters(t *testing.T) {
 		filteredProperties := f.FilterProperties(properties)
 
 		expectedProperties := map[string]string{"replicaSet": "abc"}
-		assert.Equal(t, filteredProperties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredProperties)
 	})
 
 	t.Run("Filter a single property value", func(t *testing.T) {
@@ -49,7 +49,7 @@ func TestFilters(t *testing.T) {
 		filteredProperties := f.FilterProperties(properties)
 
 		expectedProperties := map[string]string{"replicaSet": "abc"}
-		assert.Equal(t, filteredProperties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredProperties)
 	})
 
 	t.Run("Filter a regex property value", func(t *testing.T) {
@@ -60,7 +60,7 @@ func TestFilters(t *testing.T) {
 		filteredProperties := f.FilterProperties(properties)
 
 		expectedProperties := map[string]string{"replicaSet": "abc"}
-		assert.Equal(t, filteredProperties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredProperties)
 	})
 
 	t.Run("Filter a globbed property value", func(t *testing.T) {
@@ -71,7 +71,7 @@ func TestFilters(t *testing.T) {
 		filteredProperties := f.FilterProperties(properties)
 
 		expectedProperties := map[string]string{"replicaSet": "abc"}
-		assert.Equal(t, filteredProperties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredProperties)
 	})
 
 	t.Run("Filter a property name and value", func(t *testing.T) {
@@ -82,7 +82,7 @@ func TestFilters(t *testing.T) {
 		filteredProperties := f.FilterProperties(properties)
 
 		expectedProperties := map[string]string{"replicaSet": "abc"}
-		assert.Equal(t, filteredProperties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredProperties)
 	})
 
 	t.Run("Filter a single dimension name", func(t *testing.T) {
@@ -171,7 +171,7 @@ func TestFilters(t *testing.T) {
 		filteredDimension := f.FilterDimension(dim)
 
 		expectedProperties := map[string]string{"replicaSet": "abc"}
-		assert.Equal(t, filteredDimension.Properties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredDimension.Properties)
 	})
 
 	t.Run("Filter a dimension object given property value", func(t *testing.T) {
@@ -189,7 +189,7 @@ func TestFilters(t *testing.T) {
 		filteredDimension := f.FilterDimension(dim)
 
 		expectedProperties := map[string]string{"replicaSet": "abc"}
-		assert.Equal(t, filteredDimension.Properties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredDimension.Properties)
 	})
 
 	t.Run("Filter a dimension object given property name and value", func(t *testing.T) {
@@ -205,7 +205,7 @@ func TestFilters(t *testing.T) {
 		}
 		filteredDimension := f.FilterDimension(dim)
 		expectedProperties := map[string]string{"replicaSet": "abc", "service_uid": "123"}
-		assert.Equal(t, filteredDimension.Properties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredDimension.Properties)
 	})
 
 	t.Run("Filter a dimension object given dimension value", func(t *testing.T) {
@@ -245,8 +245,8 @@ func TestFilters(t *testing.T) {
 		filteredDimension := f.FilterDimension(dim)
 		nodeFilteredDimension := f.FilterDimension(dimNode)
 		expectedProperties := map[string]string{"replicaSet": "abc", "service_uid": "123"}
-		assert.Equal(t, filteredDimension.Properties, expectedProperties)
-		assert.Equal(t, nodeFilteredDimension.Properties, properties)
+		assert.Equal(t, expectedProperties, filteredDimension.Properties)
+		assert.Equal(t, properties, nodeFilteredDimension.Properties)
 	})
 
 	// negation tests
@@ -258,7 +258,7 @@ func TestFilters(t *testing.T) {
 		filteredProperties := f.FilterProperties(properties)
 
 		expectedProperties := map[string]string{"pod-template-hash": "123"}
-		assert.Equal(t, filteredProperties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredProperties)
 	})
 
 	t.Run("Filter a single negated property value", func(t *testing.T) {
@@ -269,7 +269,7 @@ func TestFilters(t *testing.T) {
 		filteredProperties := f.FilterProperties(properties)
 
 		expectedProperties := map[string]string{"pod-template-hash": "123"}
-		assert.Equal(t, filteredProperties, expectedProperties)
+		assert.Equal(t, expectedProperties, filteredProperties)
 	})
 
 	t.Run("Match a negated dimension name", func(t *testing.T) {

internal/signalfx-agent/pkg/monitors/cloudfoundry/conversion.go

@@ -17,36 +17,36 @@ func envelopeToDatapoints(env *loggregator_v2.Envelope) ([]*datapoint.Datapoint,
 	// We intentionally modify the Tags map on the envelope, assuming that the
 	// loggregator code that generated it is not going to reuse envelope
 	// instances or tag maps.
-	dims := env.Tags
+	dims := env.GetTags()
 
 	prefix := ""
 
-	if env.SourceId != "" {
-		dims["source_id"] = env.SourceId
-		if hexIDRegexp.MatchString(env.SourceId) {
-			prefix = env.Tags["origin"] + "."
+	if env.GetSourceId() != "" {
+		dims["source_id"] = env.GetSourceId()
+		if hexIDRegexp.MatchString(env.GetSourceId()) {
+			prefix = env.GetTags()["origin"] + "."
 		} else {
-			prefix = env.SourceId + "."
+			prefix = env.GetSourceId() + "."
 		}
 	}
 
-	if env.InstanceId != "" {
-		dims["instance_id"] = env.InstanceId
+	if env.GetInstanceId() != "" {
+		dims["instance_id"] = env.GetInstanceId()
 	}
 
 	var metricType datapoint.MetricType
 
 	namesToValues := make(map[string]float64)
 
-	switch m := env.Message.(type) {
+	switch m := env.GetMessage().(type) {
 	case *loggregator_v2.Envelope_Log:
 	case *loggregator_v2.Envelope_Counter:
 		metricType = datapoint.Counter
 		namesToValues[m.Counter.GetName()] = float64(m.Counter.GetTotal())
 	case *loggregator_v2.Envelope_Gauge:
 		metricType = datapoint.Gauge
 		for name, gauge := range m.Gauge.GetMetrics() {
-			namesToValues[name] = gauge.Value
+			namesToValues[name] = gauge.GetValue()
 		}
 	case *loggregator_v2.Envelope_Timer:
 	case *loggregator_v2.Envelope_Event:
@@ -56,7 +56,7 @@ func envelopeToDatapoints(env *loggregator_v2.Envelope) ([]*datapoint.Datapoint,
 
 	var dps []*datapoint.Datapoint
 	for name, val := range namesToValues {
-		dps = append(dps, datapoint.New(prefix+cleanupName(name), dims, datapoint.NewFloatValue(val), metricType, time.Unix(0, env.Timestamp)))
+		dps = append(dps, datapoint.New(prefix+cleanupName(name), dims, datapoint.NewFloatValue(val), metricType, time.Unix(0, env.GetTimestamp())))
 	}
 
 	return dps, nil

internal/signalfx-agent/pkg/monitors/helpers_test.go

@@ -28,7 +28,7 @@ type DynamicConfig struct {
 }
 
 type MockMonitor interface {
-	SetConfigHook(func(types.MonitorID, MockMonitor))
+	SetConfigHook(configHook func(types.MonitorID, MockMonitor))
 	AddShutdownHook(fn func())
 	Type() string
 	MyVar() string

internal/signalfx-agent/pkg/monitors/postgresql/monitor.go

@@ -96,6 +96,8 @@ type Monitor struct {
 	logger logrus.FieldLogger
 }
 
+const dbNamePrefix = " dbname="
+
 // Configure the monitor and kick off metric collection
 func (m *Monitor) Configure(conf *Config) error {
 	m.conf = conf
@@ -118,7 +120,7 @@ func (m *Monitor) Configure(conf *Config) error {
 	m.connectionString = connStr
 	m.Output.AddExtraDimension("postgres_port", port)
 
-	connectionStringWithMasterDB := m.connectionString + " dbname=" + m.conf.MasterDBName
+	connectionStringWithMasterDB := m.connectionString + dbNamePrefix + m.conf.MasterDBName
 
 	var dbFilter filter.StringFilter
 	if len(conf.Databases) > 0 {
@@ -235,7 +237,7 @@ func (m *Monitor) startMonitoringDatabase(name string) (*sql.Monitor, error) {
 
 	return sqlMon, sqlMon.Configure(&sql.Config{
 		MonitorConfig:    m.conf.MonitorConfig,
-		ConnectionString: m.connectionString + " dbname=" + name,
+		ConnectionString: m.connectionString + dbNamePrefix + name,
 		DBDriver:         "postgres",
 		Queries:          makeDefaultDBQueries(name),
 		LogQueries:       m.conf.LogQueries,
@@ -338,7 +340,7 @@ func (m *Monitor) monitorReplication() (*sql.Monitor, error) {
 
 	return sqlMon, sqlMon.Configure(&sql.Config{
 		MonitorConfig:    m.conf.MonitorConfig,
-		ConnectionString: connStr + " dbname=" + m.conf.MasterDBName,
+		ConnectionString: connStr + dbNamePrefix + m.conf.MasterDBName,
 		DBDriver:         "postgres",
 		Queries:          defaultReplicationQueries,
 		LogQueries:       m.conf.LogQueries,

internal/signalfx-agent/pkg/monitors/processlist/processlist_linux_test.go

@@ -12,8 +12,8 @@ func TestProcessListLinux(t *testing.T) {
 	cache := initOSCache()
 
 	tps, err := ProcessList(&Config{}, cache, nil)
-	require.Nil(t, err)
-	require.Greater(t, len(tps), 0)
+	require.NoError(t, err)
+	require.NotEmpty(t, len(tps))
 
 	selfPID := os.Getpid()
 	for _, proc := range tps {

internal/signalfx-agent/pkg/monitors/prometheusexporter/conversion.go

@@ -30,17 +30,17 @@ func convertMetricFamily(mf *dto.MetricFamily) []*datapoint.Datapoint {
 	}
 	switch *mf.Type {
 	case dto.MetricType_GAUGE:
-		return makeSimpleDatapoints(*mf.Name, mf.Metric, sfxclient.GaugeF, gaugeExtractor)
+		return makeSimpleDatapoints(mf.GetName(), mf.GetMetric(), sfxclient.GaugeF, gaugeExtractor)
 	case dto.MetricType_COUNTER:
-		return makeSimpleDatapoints(*mf.Name, mf.Metric, sfxclient.CumulativeF, counterExtractor)
+		return makeSimpleDatapoints(mf.GetName(), mf.GetMetric(), sfxclient.CumulativeF, counterExtractor)
 	case dto.MetricType_UNTYPED:
-		return makeSimpleDatapoints(*mf.Name, mf.Metric, sfxclient.GaugeF, untypedExtractor)
+		return makeSimpleDatapoints(mf.GetName(), mf.GetMetric(), sfxclient.GaugeF, untypedExtractor)
 	case dto.MetricType_SUMMARY:
-		return makeSummaryDatapoints(*mf.Name, mf.Metric)
+		return makeSummaryDatapoints(mf.GetName(), mf.GetMetric())
 	// TODO: figure out how to best convert histograms, in particular the
 	// upper bound value
 	case dto.MetricType_HISTOGRAM:
-		return makeHistogramDatapoints(*mf.Name, mf.Metric)
+		return makeHistogramDatapoints(mf.GetName(), mf.GetMetric())
 	default:
 		return nil
 	}
@@ -49,15 +49,15 @@ func convertMetricFamily(mf *dto.MetricFamily) []*datapoint.Datapoint {
 func makeSimpleDatapoints(name string, ms []*dto.Metric, dpf dpFactory, e extractor) []*datapoint.Datapoint {
 	dps := make([]*datapoint.Datapoint, len(ms))
 	for i, m := range ms {
-		dps[i] = dpf(name, labelsToDims(m.Label), e(m))
+		dps[i] = dpf(name, labelsToDims(m.GetLabel()), e(m))
 	}
 	return dps
 }
 
 func makeSummaryDatapoints(name string, ms []*dto.Metric) []*datapoint.Datapoint {
 	var dps []*datapoint.Datapoint
 	for _, m := range ms {
-		dims := labelsToDims(m.Label)
+		dims := labelsToDims(m.GetLabel())
 		s := m.GetSummary()
 		if s == nil {
 			continue
@@ -85,7 +85,7 @@ func makeSummaryDatapoints(name string, ms []*dto.Metric) []*datapoint.Datapoint
 func makeHistogramDatapoints(name string, ms []*dto.Metric) []*datapoint.Datapoint {
 	var dps []*datapoint.Datapoint
 	for _, m := range ms {
-		dims := labelsToDims(m.Label)
+		dims := labelsToDims(m.GetLabel())
 		h := m.GetHistogram()
 		if h == nil {
 			continue

internal/signalfx-agent/pkg/monitors/subproc/core.go

@@ -192,8 +192,8 @@ func makePipes() (*messageReadWriter, io.ReadCloser, io.WriteCloser, error) {
 // subprocess.  MontiorCore.ConfigureInSubproc handles configuring the
 // subprocess monitor and collecting the result.
 type MessageHandler interface {
-	ProcessMessages(context.Context, MessageReceiver)
-	HandleLogMessage(io.Reader) error
+	ProcessMessages(ctx context.Context, messageReceiver MessageReceiver)
+	HandleLogMessage(r io.Reader) error
 }
 
 // ConfigureInSubproc sends the given config to the subproc and returns whether

internal/signalfx-agent/pkg/monitors/telegraf/common/emitter/emitter.go

@@ -9,11 +9,11 @@ import (
 // Emitter interface to telegraf accumulator for processing metrics from
 // telegraf
 type Emitter interface {
-	// Add is a function used by the telegraf accumulator to emit events
-	// through the agent.  Pleaes note that if the emitter is a BatchEmitter
+	// AddMetric Add is a function used by the telegraf accumulator to emit events
+	// through the agent.  Please note that if the emitter is a BatchEmitter
 	// you will have to invoke the Send() function to send the batch of
 	// datapoints and events collected by the Emit function
-	AddMetric(telegraf.Metric)
+	AddMetric(m telegraf.Metric)
 	// AddTag adds a key/value pair to all measurement tags.  If a key conflicts
 	// the key value pair in AddTag will override the original key on the
 	// measurement