test(linters): Enable testifylint: blank-import, float-compare, negative-positive, nil-compare and useless-assert

.golangci.yml

@@ -296,17 +296,22 @@ linters-settings:
     #   len, negative-positive, nil-compare, require-error, suite-dont-use-pkg, suite-extra-assert-call, useless-assert
     # ).
     enable:
+      - blank-import
       - bool-compare
       - compares
       - empty
       - error-is-as
       - error-nil
       - expected-actual
+      - float-compare
       - len
+      - negative-positive
+      - nil-compare
       - require-error
       - suite-dont-use-pkg
       - suite-extra-assert-call
       - suite-thelper
+      - useless-assert
 
 run:
   # Timeout for analysis, e.g. 30s, 5m.

agent/accumulator_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/logger"
+	"github.com/influxdata/telegraf/testutil"
 )
 
 func TestAddFields(t *testing.T) {
@@ -32,7 +33,7 @@ func TestAddFields(t *testing.T) {
 	actual, ok := testm.GetField("usage")
 
 	require.True(t, ok)
-	require.Equal(t, float64(99), actual)
+	require.InDelta(t, float64(99), actual, testutil.DefaultDelta)
 
 	actual, ok = testm.GetTag("foo")
 	require.True(t, ok)

metric/metric_test.go

@@ -112,7 +112,7 @@ func TestAddFieldOverwrites(t *testing.T) {
 
 	value, ok := m.GetField("value")
 	require.True(t, ok)
-	require.Equal(t, 42.0, value)
+	require.InDelta(t, 42.0, value, 0.001)
 }
 
 func TestAddFieldChangesType(t *testing.T) {

plugins/inputs/ceph/ceph_test.go

@@ -42,23 +42,23 @@ func TestParseOsdDump(t *testing.T) {
 	dump, err := c.parseDump(osdPerfDump)
 	require.NoError(t, err)
 	require.InEpsilon(t, 552132.109360000, dump["filestore"]["commitcycle_interval.sum"], epsilon)
-	require.Equal(t, float64(0), dump["mutex-FileJournal::finisher_lock"]["wait.avgcount"])
+	require.InDelta(t, float64(0), dump["mutex-FileJournal::finisher_lock"]["wait.avgcount"], testutil.DefaultDelta)
 }
 
 func TestParseMdsDump(t *testing.T) {
 	c := &Ceph{Log: testutil.Logger{}}
 	dump, err := c.parseDump(mdsPerfDump)
 	require.NoError(t, err)
 	require.InEpsilon(t, 2408386.600934982, dump["mds"]["reply_latency.sum"], epsilon)
-	require.Equal(t, float64(0), dump["throttle-write_buf_throttle"]["wait.avgcount"])
+	require.InDelta(t, float64(0), dump["throttle-write_buf_throttle"]["wait.avgcount"], testutil.DefaultDelta)
 }
 
 func TestParseRgwDump(t *testing.T) {
 	c := &Ceph{Log: testutil.Logger{}}
 	dump, err := c.parseDump(rgwPerfDump)
 	require.NoError(t, err)
 	require.InEpsilon(t, 0.002219876, dump["rgw"]["get_initial_lat.sum"], epsilon)
-	require.Equal(t, float64(0), dump["rgw"]["put_initial_lat.avgcount"])
+	require.InDelta(t, float64(0), dump["rgw"]["put_initial_lat.avgcount"], testutil.DefaultDelta)
 }
 
 func TestDecodeStatus(t *testing.T) {

plugins/inputs/cloud_pubsub/cloud_pubsub_test.go

@@ -293,6 +293,6 @@ func TestRunErrorInSubscriber(t *testing.T) {
 func validateTestInfluxMetric(t *testing.T, m *testutil.Metric) {
 	require.Equal(t, "cpu_load_short", m.Measurement)
 	require.Equal(t, "server01", m.Tags["host"])
-	require.Equal(t, 23422.0, m.Fields["value"])
+	require.InDelta(t, 23422.0, m.Fields["value"], testutil.DefaultDelta)
 	require.Equal(t, int64(1422568543702900257), m.Time.UnixNano())
 }

plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_test.go

@@ -206,7 +206,7 @@ func TestCtrlXMetricsField(t *testing.T) {
 	require.NoError(t, acc.GatherError(s.Start))
 	require.Eventually(t, func() bool {
 		if v, found := acc.FloatField(measurement, fieldName); found {
-			require.Equal(t, 43.0, v)
+			require.InDelta(t, 43.0, v, testutil.DefaultDelta)
 			return true
 		}
 		return false
@@ -226,7 +226,7 @@ func TestCtrlXMetricsMulti(t *testing.T) {
 	require.NoError(t, acc.GatherError(s.Start))
 	require.Eventually(t, func() bool {
 		if v, found := acc.FloatField(measurement, fieldName); found {
-			require.Equal(t, 44.0, v)
+			require.InDelta(t, 44.0, v, testutil.DefaultDelta)
 			return true
 		}
 		return false

plugins/inputs/fluentd/fluentd_test.go

@@ -200,41 +200,41 @@ func Test_Gather(t *testing.T) {
 	require.Equal(t, expectedOutput[0].PluginID, acc.Metrics[0].Tags["plugin_id"])
 	require.Equal(t, expectedOutput[0].PluginType, acc.Metrics[0].Tags["plugin_type"])
 	require.Equal(t, expectedOutput[0].PluginCategory, acc.Metrics[0].Tags["plugin_category"])
-	require.Equal(t, *expectedOutput[0].RetryCount, acc.Metrics[0].Fields["retry_count"])
+	require.InDelta(t, *expectedOutput[0].RetryCount, acc.Metrics[0].Fields["retry_count"], testutil.DefaultDelta)
 
 	require.Equal(t, expectedOutput[1].PluginID, acc.Metrics[1].Tags["plugin_id"])
 	require.Equal(t, expectedOutput[1].PluginType, acc.Metrics[1].Tags["plugin_type"])
 	require.Equal(t, expectedOutput[1].PluginCategory, acc.Metrics[1].Tags["plugin_category"])
-	require.Equal(t, *expectedOutput[1].RetryCount, acc.Metrics[1].Fields["retry_count"])
-	require.Equal(t, *expectedOutput[1].BufferQueueLength, acc.Metrics[1].Fields["buffer_queue_length"])
-	require.Equal(t, *expectedOutput[1].BufferTotalQueuedSize, acc.Metrics[1].Fields["buffer_total_queued_size"])
+	require.InDelta(t, *expectedOutput[1].RetryCount, acc.Metrics[1].Fields["retry_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[1].BufferQueueLength, acc.Metrics[1].Fields["buffer_queue_length"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[1].BufferTotalQueuedSize, acc.Metrics[1].Fields["buffer_total_queued_size"], testutil.DefaultDelta)
 
 	require.Equal(t, expectedOutput[2].PluginID, acc.Metrics[2].Tags["plugin_id"])
 	require.Equal(t, expectedOutput[2].PluginType, acc.Metrics[2].Tags["plugin_type"])
 	require.Equal(t, expectedOutput[2].PluginCategory, acc.Metrics[2].Tags["plugin_category"])
-	require.Equal(t, *expectedOutput[2].RetryCount, acc.Metrics[2].Fields["retry_count"])
-	require.Equal(t, *expectedOutput[2].BufferQueueLength, acc.Metrics[2].Fields["buffer_queue_length"])
-	require.Equal(t, *expectedOutput[2].BufferTotalQueuedSize, acc.Metrics[2].Fields["buffer_total_queued_size"])
-	require.Equal(t, *expectedOutput[2].EmitRecords, acc.Metrics[2].Fields["emit_records"])
-	require.Equal(t, *expectedOutput[2].EmitSize, acc.Metrics[2].Fields["emit_size"])
-	require.Equal(t, *expectedOutput[2].EmitCount, acc.Metrics[2].Fields["emit_count"])
-	require.Equal(t, *expectedOutput[2].RollbackCount, acc.Metrics[2].Fields["rollback_count"])
-	require.Equal(t, *expectedOutput[2].SlowFlushCount, acc.Metrics[2].Fields["slow_flush_count"])
-	require.Equal(t, *expectedOutput[2].WriteCount, acc.Metrics[2].Fields["write_count"])
-	require.Equal(t, *expectedOutput[2].FlushTimeCount, acc.Metrics[2].Fields["flush_time_count"])
-	require.Equal(t, *expectedOutput[2].BufferStageLength, acc.Metrics[2].Fields["buffer_stage_length"])
-	require.Equal(t, *expectedOutput[2].BufferStageByteSize, acc.Metrics[2].Fields["buffer_stage_byte_size"])
-	require.Equal(t, *expectedOutput[2].BufferQueueByteSize, acc.Metrics[2].Fields["buffer_queue_byte_size"])
-	require.Equal(t, *expectedOutput[2].AvailBufferSpaceRatios, acc.Metrics[2].Fields["buffer_available_buffer_space_ratios"])
+	require.InDelta(t, *expectedOutput[2].RetryCount, acc.Metrics[2].Fields["retry_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].BufferQueueLength, acc.Metrics[2].Fields["buffer_queue_length"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].BufferTotalQueuedSize, acc.Metrics[2].Fields["buffer_total_queued_size"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].EmitRecords, acc.Metrics[2].Fields["emit_records"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].EmitSize, acc.Metrics[2].Fields["emit_size"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].EmitCount, acc.Metrics[2].Fields["emit_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].RollbackCount, acc.Metrics[2].Fields["rollback_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].SlowFlushCount, acc.Metrics[2].Fields["slow_flush_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].WriteCount, acc.Metrics[2].Fields["write_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].FlushTimeCount, acc.Metrics[2].Fields["flush_time_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].BufferStageLength, acc.Metrics[2].Fields["buffer_stage_length"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].BufferStageByteSize, acc.Metrics[2].Fields["buffer_stage_byte_size"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].BufferQueueByteSize, acc.Metrics[2].Fields["buffer_queue_byte_size"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[2].AvailBufferSpaceRatios, acc.Metrics[2].Fields["buffer_available_buffer_space_ratios"], testutil.DefaultDelta)
 
 	require.Equal(t, expectedOutput[3].PluginID, acc.Metrics[3].Tags["plugin_id"])
 	require.Equal(t, expectedOutput[3].PluginType, acc.Metrics[3].Tags["plugin_type"])
 	require.Equal(t, expectedOutput[3].PluginCategory, acc.Metrics[3].Tags["plugin_category"])
-	require.Equal(t, *expectedOutput[3].RetryCount, acc.Metrics[3].Fields["retry_count"])
-	require.Equal(t, *expectedOutput[3].BufferQueueLength, acc.Metrics[3].Fields["buffer_queue_length"])
-	require.Equal(t, *expectedOutput[3].BufferTotalQueuedSize, acc.Metrics[3].Fields["buffer_total_queued_size"])
-	require.Equal(t, *expectedOutput[3].EmitRecords, acc.Metrics[3].Fields["emit_records"])
-	require.Equal(t, *expectedOutput[3].RollbackCount, acc.Metrics[3].Fields["rollback_count"])
-	require.Equal(t, *expectedOutput[3].SlowFlushCount, acc.Metrics[3].Fields["slow_flush_count"])
-	require.Equal(t, *expectedOutput[3].AvailBufferSpaceRatios, acc.Metrics[3].Fields["buffer_available_buffer_space_ratios"])
+	require.InDelta(t, *expectedOutput[3].RetryCount, acc.Metrics[3].Fields["retry_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[3].BufferQueueLength, acc.Metrics[3].Fields["buffer_queue_length"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[3].BufferTotalQueuedSize, acc.Metrics[3].Fields["buffer_total_queued_size"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[3].EmitRecords, acc.Metrics[3].Fields["emit_records"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[3].RollbackCount, acc.Metrics[3].Fields["rollback_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[3].SlowFlushCount, acc.Metrics[3].Fields["slow_flush_count"], testutil.DefaultDelta)
+	require.InDelta(t, *expectedOutput[3].AvailBufferSpaceRatios, acc.Metrics[3].Fields["buffer_available_buffer_space_ratios"], testutil.DefaultDelta)
 }

plugins/inputs/google_cloud_storage/google_cloud_storage_test.go

@@ -92,8 +92,8 @@ func TestRunGatherOneItem(t *testing.T) {
 	require.Equal(t, "cpu", metric.Measurement)
 	require.Equal(t, "us-east-1", metric.Tags["tags_datacenter"])
 	require.Equal(t, "localhost", metric.Tags["tags_host"])
-	require.Equal(t, 10.0, metric.Fields["fields_cosine"])
-	require.Equal(t, -1.0975806427415925e-12, metric.Fields["fields_sine"])
+	require.InDelta(t, 10.0, metric.Fields["fields_cosine"], testutil.DefaultDelta)
+	require.InEpsilon(t, -1.0975806427415925e-12, metric.Fields["fields_sine"], testutil.DefaultEpsilon)
 }
 
 func TestRunGatherOneIteration(t *testing.T) {

plugins/inputs/http/http_test.go

@@ -3,7 +3,6 @@ package http_test
 import (
 	"compress/gzip"
 	"fmt"
-	"github.com/influxdata/telegraf/config"
 	"io"
 	"math/rand"
 	"net"
@@ -19,6 +18,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/config"
 	httpconfig "github.com/influxdata/telegraf/plugins/common/http"
 	"github.com/influxdata/telegraf/plugins/common/oauth"
 	httpplugin "github.com/influxdata/telegraf/plugins/inputs/http"
@@ -62,7 +62,7 @@ func TestHTTPWithJSONFormat(t *testing.T) {
 	var metric = acc.Metrics[0]
 	require.Equal(t, metric.Measurement, metricName)
 	require.Len(t, acc.Metrics[0].Fields, 1)
-	require.Equal(t, 1.2, acc.Metrics[0].Fields["a"])
+	require.InDelta(t, 1.2, acc.Metrics[0].Fields["a"], testutil.DefaultDelta)
 	require.Equal(t, acc.Metrics[0].Tags["url"], address)
 }
 

plugins/inputs/http_response/http_response_test.go

@@ -49,7 +49,7 @@ func checkFields(t *testing.T, fields map[string]interface{}, acc *testutil.Accu
 		case float64:
 			value, ok := acc.FloatField("http_response", key)
 			require.True(t, ok)
-			require.Equal(t, field, value)
+			require.InDelta(t, field, value, testutil.DefaultDelta)
 		case string:
 			value, ok := acc.StringField("http_response", key)
 			require.True(t, ok)

plugins/inputs/intel_dlb/intel_dlb_test.go

@@ -421,7 +421,7 @@ func TestDLB_gatherSecondDeviceIndex(t *testing.T) {
 		mockConn.On("Close").Return(nil).Once()
 
 		_, err := dlb.gatherSecondDeviceIndex(0, dlb.EventdevCommands[0])
-		require.Equal(t, nil, dlb.connection)
+		require.Nil(t, dlb.connection)
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "failed to parse json")
 		dlb.SocketPath = pathToSocket

plugins/inputs/intel_powerstat/intel_powerstat_test.go

@@ -4948,8 +4948,8 @@ func TestGetUncoreFreqInitialLimits(t *testing.T) {
 		initMin, initMax, err := getUncoreFreqInitialLimits(mFetcher, packageID, dieID)
 
 		require.NoError(t, err)
-		require.Equal(t, initMinExp, initMin)
-		require.Equal(t, initMaxExp, initMax)
+		require.InDelta(t, initMinExp, initMin, testutil.DefaultDelta)
+		require.InDelta(t, initMaxExp, initMax, testutil.DefaultDelta)
 		mFetcher.AssertExpectations(t)
 	})
 }

plugins/inputs/intel_rdt/publisher_test.go

@@ -44,12 +44,12 @@ func TestParseCoresMeasurement(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, expectedCores, result.cores)
 		require.Equal(t, expectedTimestamp, result.time)
-		require.Equal(t, result.values[0], metricsValues["IPC"])
-		require.Equal(t, result.values[1], metricsValues["LLC_Misses"])
-		require.Equal(t, result.values[2], metricsValues["LLC"])
-		require.Equal(t, result.values[3], metricsValues["MBL"])
-		require.Equal(t, result.values[4], metricsValues["MBR"])
-		require.Equal(t, result.values[5], metricsValues["MBT"])
+		require.InDelta(t, result.values[0], metricsValues["IPC"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[1], metricsValues["LLC_Misses"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[2], metricsValues["LLC"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[3], metricsValues["MBL"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[4], metricsValues["MBR"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[5], metricsValues["MBT"], testutil.DefaultDelta)
 	})
 	t.Run("not valid measurement string", func(t *testing.T) {
 		measurement := "not, valid, measurement"
@@ -131,12 +131,12 @@ func TestParseProcessesMeasurement(t *testing.T) {
 		require.Equal(t, processName, result.process)
 		require.Equal(t, expectedCores, result.cores)
 		require.Equal(t, expectedTimestamp, result.time)
-		require.Equal(t, result.values[0], metricsValues["IPC"])
-		require.Equal(t, result.values[1], metricsValues["LLC_Misses"])
-		require.Equal(t, result.values[2], metricsValues["LLC"])
-		require.Equal(t, result.values[3], metricsValues["MBL"])
-		require.Equal(t, result.values[4], metricsValues["MBR"])
-		require.Equal(t, result.values[5], metricsValues["MBT"])
+		require.InDelta(t, result.values[0], metricsValues["IPC"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[1], metricsValues["LLC_Misses"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[2], metricsValues["LLC"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[3], metricsValues["MBL"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[4], metricsValues["MBR"], testutil.DefaultDelta)
+		require.InDelta(t, result.values[5], metricsValues["MBT"], testutil.DefaultDelta)
 	})
 
 	invalidTimestamp := "2020-20-20-31"

plugins/inputs/mock/mock_test.go

@@ -75,7 +75,7 @@ func TestGather(t *testing.T) {
 	for k, v := range metric.Fields {
 		switch k {
 		case "abc":
-			require.Equal(t, 50.0, v)
+			require.InDelta(t, 50.0, v, testutil.DefaultDelta)
 		case "constant_string":
 			require.Equal(t, testConstantString.Value, v)
 		case "constant_float":
@@ -88,9 +88,9 @@ func TestGather(t *testing.T) {
 			require.GreaterOrEqual(t, 6.0, v)
 			require.LessOrEqual(t, 1.0, v)
 		case "sine":
-			require.Equal(t, 2.0, v)
+			require.InDelta(t, 2.0, v, testutil.DefaultDelta)
 		case "step":
-			require.Equal(t, 0.0, v)
+			require.InDelta(t, 0.0, v, testutil.DefaultDelta)
 		default:
 			require.Failf(t, "unexpected field %q", k)
 		}

plugins/inputs/netflow/type_conversion_test.go

@@ -5,6 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
+	"github.com/influxdata/telegraf/testutil"
 )
 
 func TestDecodeInt32(t *testing.T) {
@@ -66,7 +68,7 @@ func TestDecodeFloat64(t *testing.T) {
 	require.NoError(t, err)
 	out, ok := v.(float64)
 	require.True(t, ok)
-	require.Equal(t, float64(3.14159265359), out)
+	require.InDelta(t, float64(3.14159265359), out, testutil.DefaultDelta)
 }
 
 func TestDecodeBool(t *testing.T) {

plugins/inputs/pgbouncer/pgbouncer_test.go

@@ -98,7 +98,7 @@ func TestPgBouncerGeneratesMetricsIntegration(t *testing.T) {
 		metricsCounted++
 	}
 
-	require.Greater(t, metricsCounted, 0)
+	require.Positive(t, metricsCounted)
 	require.Equal(t, len(intMetricsPgBouncer)+len(intMetricsPgBouncerPools), metricsCounted)
 }
 
@@ -210,6 +210,6 @@ func TestPgBouncerGeneratesMetricsIntegrationShowCommands(t *testing.T) {
 		metricsCounted++
 	}
 
-	require.Greater(t, metricsCounted, 0)
+	require.Positive(t, metricsCounted)
 	require.Equal(t, len(intMetricsPgBouncerPools)+len(intMetricsPgBouncerLists)+len(intMetricsPgBouncerDatabases), metricsCounted)
 }