From 26bcf6011bdd4d6d37febac1431940a2daa8d8c5 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Thu, 12 Sep 2024 21:39:09 +0000 Subject: [PATCH] [chore]: enable float-compare rule from testifylint Signed-off-by: Matthieu MOREL --- .golangci.yml | 1 - Makefile.Common | 2 +- internal/aws/containerinsight/utils_test.go | 2 +- .../internal/stores/podstore_test.go | 14 +++++++------- .../loadscraper/load_scraper_windows_test.go | 6 +++--- .../metrics_receiver_helper_test.go | 6 +++--- receiver/redisreceiver/latencystats_test.go | 8 ++++---- 7 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index ec43cda68833..7318835b2a1b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -134,7 +134,6 @@ linters-settings: testifylint: disable: - - float-compare - formatter - go-require - require-error diff --git a/Makefile.Common b/Makefile.Common index 2e9b53cfe422..b98746a959de 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -77,7 +77,7 @@ GOTESTSUM := $(TOOLS_BIN_DIR)/gotestsum TESTIFYLINT := $(TOOLS_BIN_DIR)/testifylint GOTESTSUM_OPT?= --rerun-fails=1 -TESTIFYLINT_OPT?= --enable-all --disable=float-compare,formatter,go-require,require-error,suite-subtest-run,useless-assert +TESTIFYLINT_OPT?= --enable-all --disable=formatter,go-require,require-error,suite-subtest-run,useless-assert # BUILD_TYPE should be one of (dev, release). BUILD_TYPE?=release diff --git a/internal/aws/containerinsight/utils_test.go b/internal/aws/containerinsight/utils_test.go index 87458895ac70..f34aaedc575a 100644 --- a/internal/aws/containerinsight/utils_test.go +++ b/internal/aws/containerinsight/utils_test.go @@ -170,7 +170,7 @@ func checkMetricsAreExpected(t *testing.T, md pmetric.Metrics, fields map[string dp := dps.At(0) switch dp.ValueType() { case pmetric.NumberDataPointValueTypeDouble: - assert.Equal(t, convertToFloat64(fields[metricName]), dp.DoubleValue()) + assert.InDelta(t, convertToFloat64(fields[metricName]), dp.DoubleValue(), 0.01) case pmetric.NumberDataPointValueTypeInt: assert.Equal(t, convertToInt64(fields[metricName]), dp.IntValue()) } diff --git a/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go b/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go index cefbe4f56c8a..51787c1c6a4d 100644 --- a/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go +++ b/receiver/awscontainerinsightreceiver/internal/stores/podstore_test.go @@ -220,9 +220,9 @@ func TestPodStore_decorateCpu(t *testing.T) { assert.Equal(t, uint64(10), metric.GetField("pod_cpu_request").(uint64)) assert.Equal(t, uint64(10), metric.GetField("pod_cpu_limit").(uint64)) - assert.Equal(t, float64(0.25), metric.GetField("pod_cpu_reserved_capacity").(float64)) - assert.Equal(t, float64(10), metric.GetField("pod_cpu_utilization_over_pod_limit").(float64)) - assert.Equal(t, float64(1), metric.GetField("pod_cpu_usage_total").(float64)) + assert.InDelta(t, float64(0.25), metric.GetField("pod_cpu_reserved_capacity").(float64), 0.01) + assert.InDelta(t, float64(10), metric.GetField("pod_cpu_utilization_over_pod_limit").(float64), 0.01) + assert.InDelta(t, float64(1), metric.GetField("pod_cpu_usage_total").(float64), 0.01) // test container metrics tags = map[string]string{ci.MetricType: ci.TypeContainer, ci.ContainerNamekey: "ubuntu"} @@ -232,7 +232,7 @@ func TestPodStore_decorateCpu(t *testing.T) { assert.Equal(t, uint64(10), metric.GetField("container_cpu_request").(uint64)) assert.Equal(t, uint64(10), metric.GetField("container_cpu_limit").(uint64)) - assert.Equal(t, float64(1), metric.GetField("container_cpu_usage_total").(float64)) + assert.InDelta(t, float64(1), metric.GetField("container_cpu_usage_total").(float64), 0.01) } func TestPodStore_decorateMem(t *testing.T) { @@ -248,8 +248,8 @@ func TestPodStore_decorateMem(t *testing.T) { assert.Equal(t, uint64(52428800), metric.GetField("pod_memory_request").(uint64)) assert.Equal(t, uint64(52428800), metric.GetField("pod_memory_limit").(uint64)) - assert.Equal(t, float64(12.5), metric.GetField("pod_memory_reserved_capacity").(float64)) - assert.Equal(t, float64(20), metric.GetField("pod_memory_utilization_over_pod_limit").(float64)) + assert.InDelta(t, float64(12.5), metric.GetField("pod_memory_reserved_capacity").(float64), 0.01) + assert.InDelta(t, float64(20), metric.GetField("pod_memory_utilization_over_pod_limit").(float64), 0.01) assert.Equal(t, uint64(10*1024*1024), metric.GetField("pod_memory_working_set").(uint64)) tags = map[string]string{ci.MetricType: ci.TypeContainer, ci.ContainerNamekey: "ubuntu"} @@ -260,7 +260,7 @@ func TestPodStore_decorateMem(t *testing.T) { assert.Equal(t, uint64(52428800), metric.GetField("container_memory_request").(uint64)) assert.Equal(t, uint64(52428800), metric.GetField("container_memory_limit").(uint64)) - assert.Equal(t, float64(10*1024*1024), metric.GetField("container_memory_working_set").(float64)) + assert.InDelta(t, float64(10*1024*1024), metric.GetField("container_memory_working_set").(float64), 0.01) } func TestPodStore_addContainerCount(t *testing.T) { diff --git a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_windows_test.go b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_windows_test.go index 2eda3a9fa778..1db0f5603b86 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_windows_test.go +++ b/receiver/hostmetricsreceiver/internal/scraper/loadscraper/load_scraper_windows_test.go @@ -97,9 +97,9 @@ func TestSampleLoad(t *testing.T) { samplerInstance.sampleLoad() } - assert.Equal(t, calcExpectedLoad(counterReturnValues, loadAvgFactor1m), samplerInstance.loadAvg1m) - assert.Equal(t, calcExpectedLoad(counterReturnValues, loadAvgFactor5m), samplerInstance.loadAvg5m) - assert.Equal(t, calcExpectedLoad(counterReturnValues, loadAvgFactor15m), samplerInstance.loadAvg15m) + assert.InDelta(t, calcExpectedLoad(counterReturnValues, loadAvgFactor1m), samplerInstance.loadAvg1m, 0.01) + assert.InDelta(t, calcExpectedLoad(counterReturnValues, loadAvgFactor5m), samplerInstance.loadAvg5m, 0.01) + assert.InDelta(t, calcExpectedLoad(counterReturnValues, loadAvgFactor15m), samplerInstance.loadAvg15m, 0.01) } func calcExpectedLoad(scrapedValues []int64, loadAvgFactor float64) float64 { diff --git a/receiver/prometheusreceiver/metrics_receiver_helper_test.go b/receiver/prometheusreceiver/metrics_receiver_helper_test.go index 0ab15d8c885b..eedcf7c527aa 100644 --- a/receiver/prometheusreceiver/metrics_receiver_helper_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_helper_test.go @@ -340,7 +340,7 @@ func isFirstFailedScrape(metrics []pmetric.Metric, normalizedNames bool) bool { func assertUp(t *testing.T, expected float64, metrics []pmetric.Metric) { for _, m := range metrics { if m.Name() == "up" { - assert.Equal(t, expected, m.Gauge().DataPoints().At(0).DoubleValue()) // (assumed up will not have multiple datapoints) + assert.InDelta(t, expected, m.Gauge().DataPoints().At(0).DoubleValue(), 0.01) // (assumed up will not have multiple datapoints) return } } @@ -620,7 +620,7 @@ func compareSummaryStartTimestamp(timeStamp pcommon.Timestamp) summaryPointCompa func compareDoubleValue(doubleVal float64) numberPointComparator { return func(t *testing.T, numberDataPoint pmetric.NumberDataPoint) { - assert.Equal(t, doubleVal, numberDataPoint.DoubleValue(), "Metric double value does not match") + assert.InDelta(t, doubleVal, numberDataPoint.DoubleValue(), 0.01, "Metric double value does not match") } } @@ -634,7 +634,7 @@ func assertNormalNan() numberPointComparator { func compareHistogram(count uint64, sum float64, upperBounds []float64, buckets []uint64) histogramPointComparator { return func(t *testing.T, histogramDataPoint pmetric.HistogramDataPoint) { assert.Equal(t, count, histogramDataPoint.Count(), "Histogram count value does not match") - assert.Equal(t, sum, histogramDataPoint.Sum(), "Histogram sum value does not match") + assert.InDelta(t, sum, histogramDataPoint.Sum(), 0.01, "Histogram sum value does not match") assert.Equal(t, upperBounds, histogramDataPoint.ExplicitBounds().AsRaw(), "Histogram upper bounds values do not match") assert.Equal(t, buckets, histogramDataPoint.BucketCounts().AsRaw(), "Histogram bucket count values do not match") } diff --git a/receiver/redisreceiver/latencystats_test.go b/receiver/redisreceiver/latencystats_test.go index 06cf32a672ec..8424e876e034 100644 --- a/receiver/redisreceiver/latencystats_test.go +++ b/receiver/redisreceiver/latencystats_test.go @@ -12,10 +12,10 @@ import ( func TestParseLatencyStats(t *testing.T) { ls, err := parseLatencyStats("p50=181.247,p55=182.271,p99=309.247,p99.9=1023.999") require.NoError(t, err) - require.Equal(t, 181.247, ls["p50"]) - require.Equal(t, 182.271, ls["p55"]) - require.Equal(t, 309.247, ls["p99"]) - require.Equal(t, 1023.999, ls["p99.9"]) + require.InDelta(t, 181.247, ls["p50"], 0.01) + require.InDelta(t, 182.271, ls["p55"], 0.01) + require.InDelta(t, 309.247, ls["p99"], 0.01) + require.InDelta(t, 1023.999, ls["p99.9"], 0.01) } func TestParseMalformedLatencyStats(t *testing.T) {