lint fixes

Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>

Author: Alok Kumar Singh

bill-of-materials.json

@@ -17,15 +17,6 @@
 			}
 		]
 	},
-	{
-		"project": "github.com/antithesishq/antithesis-sdk-go",
-		"licenses": [
-			{
-				"type": "MIT License",
-				"confidence": 1
-			}
-		]
-	},
 	{
 		"project": "github.com/beorn7/perks/quantile",
 		"licenses": [

cache/go.mod

@@ -21,6 +21,7 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
+	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
@@ -29,8 +30,8 @@ require (
 	go.etcd.io/etcd/client/pkg/v3 v3.6.0-alpha.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.1 // indirect
-	golang.org/x/net v0.51.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	golang.org/x/net v0.51.0 // indirect
 	golang.org/x/sys v0.41.0 // indirect
 	golang.org/x/text v0.34.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260209200024-4cfbd4190f57 // indirect

cache/metrics_test.go

@@ -17,7 +17,6 @@ package cache
 import (
 	"net/http"
 	"net/http/httptest"
-	"strings"
 	"testing"
 	"time"
 
@@ -84,7 +83,7 @@ func TestDemuxMetricsRegisterUnregister(t *testing.T) {
 
 	d.Register(w1, 0)
 	require.InEpsilon(t, 1, testutil.ToFloat64(demuxActiveWatchers), 0.01)
-	require.Equal(t, float64(0), testutil.ToFloat64(demuxLaggingWatchers))
+	require.InDelta(t, 0, testutil.ToFloat64(demuxLaggingWatchers), 0)
 
 	d.Register(w2, 0)
 	require.InEpsilon(t, 2, testutil.ToFloat64(demuxActiveWatchers), 0.01)
@@ -93,7 +92,7 @@ func TestDemuxMetricsRegisterUnregister(t *testing.T) {
 	require.InEpsilon(t, 1, testutil.ToFloat64(demuxActiveWatchers), 0.01)
 
 	d.Unregister(w2)
-	require.Equal(t, float64(0), testutil.ToFloat64(demuxActiveWatchers))
+	require.InDelta(t, 0, testutil.ToFloat64(demuxActiveWatchers), 0)
 }
 
 func TestDemuxMetricsLaggingWatcher(t *testing.T) {
@@ -104,11 +103,11 @@ func TestDemuxMetricsLaggingWatcher(t *testing.T) {
 	w := newWatcher(4, nil)
 	d.Register(w, 5)
 
-	require.Equal(t, float64(0), testutil.ToFloat64(demuxActiveWatchers))
+	require.InDelta(t, 0, testutil.ToFloat64(demuxActiveWatchers), 0)
 	require.InEpsilon(t, 1, testutil.ToFloat64(demuxLaggingWatchers), 0.01)
 
 	d.Unregister(w)
-	require.Equal(t, float64(0), testutil.ToFloat64(demuxLaggingWatchers))
+	require.InDelta(t, 0, testutil.ToFloat64(demuxLaggingWatchers), 0)
 }
 
 func TestDemuxMetricsBroadcastUpdatesHistorySize(t *testing.T) {
@@ -155,7 +154,7 @@ func TestDemuxMetricsBroadcastOverflowPromotesToLagging(t *testing.T) {
 		Events: []*clientv3.Event{makePutEvent("/b", "2", 6)},
 	})
 	require.NoError(t, err)
-	require.Equal(t, float64(0), testutil.ToFloat64(demuxActiveWatchers))
+	require.InDelta(t, 0, testutil.ToFloat64(demuxActiveWatchers), 0)
 	require.InEpsilon(t, 1, testutil.ToFloat64(demuxLaggingWatchers), 0.01)
 
 	d.Unregister(w)
@@ -177,9 +176,9 @@ func TestDemuxMetricsPurge(t *testing.T) {
 
 	d.Purge()
 
-	require.Equal(t, float64(0), testutil.ToFloat64(demuxActiveWatchers))
-	require.Equal(t, float64(0), testutil.ToFloat64(demuxLaggingWatchers))
-	require.Equal(t, float64(0), testutil.ToFloat64(demuxHistorySize))
+	require.InDelta(t, 0, testutil.ToFloat64(demuxActiveWatchers), 0)
+	require.InDelta(t, 0, testutil.ToFloat64(demuxLaggingWatchers), 0)
+	require.InDelta(t, 0, testutil.ToFloat64(demuxHistorySize), 0)
 }
 
 func TestHandleMetricsEndpoint(t *testing.T) {
@@ -203,7 +202,7 @@ func TestHandleMetricsEndpoint(t *testing.T) {
 		"etcd_cache_demux_lagging_watchers",
 		"etcd_cache_demux_history_size",
 	} {
-		require.True(t, strings.Contains(body, want), "expected %q in metrics output", want)
+		require.Containsf(t, body, want, "expected %q in metrics output", want)
 	}
 }
 
@@ -216,7 +215,7 @@ func TestHandleMetricsCustomPath(t *testing.T) {
 	mux.ServeHTTP(rec, req)
 
 	require.Equal(t, http.StatusOK, rec.Code)
-	require.True(t, strings.Contains(rec.Body.String(), "etcd_cache_store_keys_total"))
+	require.Contains(t, rec.Body.String(), "etcd_cache_store_keys_total")
 }
 
 func progressNotify(rev int64) clientv3.WatchResponse {

tests/integration/cache_metrics_test.go

@@ -74,17 +74,17 @@ func TestCacheMetricsStoreAfterPutsAndGets(t *testing.T) {
 		"etcd_cache_demux_active_watchers",
 		"etcd_cache_demux_history_size",
 	} {
-		require.Contains(t, families, name, "expected metric family %q", name)
+		require.Containsf(t, families, name, "expected metric family %q", name)
 	}
 
 	keysTotal := gaugeValue(t, families, "etcd_cache_store_keys_total")
-	require.Equal(t, keysTotal, 5.0, "expected store_keys_total to be 5")
+	require.InEpsilonf(t, 5.0, keysTotal, 0.01, "expected store_keys_total to be 5")
 
 	latestRev := gaugeValue(t, families, "etcd_cache_store_latest_revision")
-	require.Equal(t, latestRev, float64(lastRev), "expected store_latest_revision to be %d", lastRev)
+	require.InEpsilonf(t, float64(lastRev), latestRev, 0.01, "expected store_latest_revision to be %d", lastRev)
 
 	getSuccessCount := counterValue(t, families, "etcd_cache_get_total", "result", "success")
-	require.Equal(t, getSuccessCount, 2.0, "expected get_total{success} to be 2")
+	require.InEpsilonf(t, 2.0, getSuccessCount, 0.01, "expected get_total{success} to be 2")
 }
 
 func TestCacheMetricsWatchRegistration(t *testing.T) {
@@ -118,8 +118,8 @@ func TestCacheMetricsWatchRegistration(t *testing.T) {
 	families := scrapeHTTPMetrics(t, mux, cache.DefaultMetricsPath)
 
 	watchSuccess := counterValue(t, families, "etcd_cache_watch_total", "result", "success")
-	require.Equal(t, watchSuccess, 2.0, "expected watch_total{success} to be 2")
-	require.Contains(t, families, "etcd_cache_watch_register_duration_seconds",
+	require.InEpsilonf(t, 2.0, watchSuccess, 0.01, "expected watch_total{success} to be 2")
+	require.Containsf(t, families, "etcd_cache_watch_register_duration_seconds",
 		"expected watch_register_duration_seconds metric")
 
 	cancel1()
@@ -152,7 +152,7 @@ func TestCacheMetricsDeleteUpdatesKeyCount(t *testing.T) {
 
 	families := scrapeHTTPMetrics(t, mux, cache.DefaultMetricsPath)
 	keysAfterPuts := gaugeValue(t, families, "etcd_cache_store_keys_total")
-	require.Equal(t, keysAfterPuts, 3.0)
+	require.InEpsilon(t, 3.0, keysAfterPuts, 0.01)
 
 	// Update operation should not increase key count
 	resp, putErr := client.Put(ctx, "/d/x", "newVal")
@@ -161,15 +161,15 @@ func TestCacheMetricsDeleteUpdatesKeyCount(t *testing.T) {
 
 	families = scrapeHTTPMetrics(t, mux, cache.DefaultMetricsPath)
 	keysAfterPuts = gaugeValue(t, families, "etcd_cache_store_keys_total")
-	require.Equal(t, keysAfterPuts, 3.0)
+	require.InEpsilon(t, 3.0, keysAfterPuts, 0.01)
 
 	delResp, err := client.Delete(ctx, "/d/z")
 	require.NoError(t, err)
 	require.NoError(t, c.WaitForRevision(ctx, delResp.Header.Revision))
 
 	families = scrapeHTTPMetrics(t, mux, cache.DefaultMetricsPath)
 	keysAfterDelete := gaugeValue(t, families, "etcd_cache_store_keys_total")
-	require.Equal(t, keysAfterDelete, 2.0)
+	require.InEpsilon(t, 2.0, keysAfterDelete, 0.01)
 }
 
 func TestCacheMetricsGetErrors(t *testing.T) {
@@ -193,7 +193,7 @@ func TestCacheMetricsGetErrors(t *testing.T) {
 
 	families := scrapeHTTPMetrics(t, mux, cache.DefaultMetricsPath)
 	errorCount := counterValue(t, families, "etcd_cache_get_total", "result", "error")
-	require.Equal(t, errorCount, 1.0, "expected get_total{error} >= 1 after out-of-scope Get")
+	require.InEpsilonf(t, 1.0, errorCount, 0.01, "expected get_total{error} >= 1 after out-of-scope Get")
 }
 
 func TestCacheMetricsDefaultPath(t *testing.T) {
@@ -211,7 +211,7 @@ func TestCacheMetricsDefaultPath(t *testing.T) {
 	t.Cleanup(c.Close)
 
 	families := scrapeHTTPMetrics(t, mux, cache.DefaultMetricsPath)
-	require.Contains(t, families, "etcd_cache_store_keys_total",
+	require.Containsf(t, families, "etcd_cache_store_keys_total",
 		"expected metrics served on default path %s", cache.DefaultMetricsPath)
 }
 
@@ -250,7 +250,7 @@ func gaugeValue(t *testing.T, families map[string]*dto.MetricFamily, name string
 	t.Helper()
 	fam, ok := families[name]
 	require.Truef(t, ok, "metric family %q not found", name)
-	require.NotEmpty(t, fam.GetMetric(), "metric family %q has no samples", name)
+	require.NotEmptyf(t, fam.GetMetric(), "metric family %q has no samples", name)
 	return fam.GetMetric()[0].GetGauge().GetValue()
 }