Fix Linting Errors

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
jaegertracing · Nov 11, 2024 · 8c53039 · 8c53039
1 parent e6d8849
commit 8c53039
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 19 deletions.
diff --git a/cmd/es-rollover/app/rollover/flags_test.go b/cmd/es-rollover/app/rollover/flags_test.go
@@ -28,5 +28,5 @@ func TestBindFlags(t *testing.T) {
 	require.NoError(t, err)
 
 	c.InitFromViper(v)
-	assert.Equal(t, "{\"max_age\": \"20000d\"}", c.Conditions)
+	assert.JSONEq(t, `{"max_age": "20000d"}`, c.Conditions)
 }
diff --git a/cmd/ingester/app/consumer/offset/concurrent_list_test.go b/cmd/ingester/app/consumer/offset/concurrent_list_test.go
@@ -19,8 +19,8 @@ func insert(list *ConcurrentList, offsets ...int64) {
 
 func TestInsert(t *testing.T) {
 	for _, testCase := range generatePermutations([]int64{1, 2, 3}) {
-		min, toInsert := extractMin(testCase)
-		s := newConcurrentList(min)
+		m, toInsert := extractMin(testCase)
+		s := newConcurrentList(m)
 		insert(s, toInsert...)
 		assert.ElementsMatch(t, testCase, s.offsets)
 	}
@@ -62,8 +62,8 @@ func TestGetHighestAndReset(t *testing.T) {
 	for _, testCase := range testCases {
 		for _, input := range generatePermutations(testCase.input) {
 			t.Run(fmt.Sprintf("%v", input), func(t *testing.T) {
-				min, input := extractMin(input)
-				s := newConcurrentList(min)
+				m, input := extractMin(input)
+				s := newConcurrentList(m)
 				insert(s, input...)
 				actualOffset := s.setToHighestContiguous()
 				assert.ElementsMatch(t, testCase.expectedList, s.offsets)

diff --git a/model/spanref_test.go b/model/spanref_test.go
@@ -27,7 +27,7 @@ func TestSpanRefTypeToFromJSON(t *testing.T) {
 	out := new(bytes.Buffer)
 	err := new(jsonpb.Marshaler).Marshal(out, &sr)
 	require.NoError(t, err)
-	assert.Equal(t, `{"traceId":"AAAAAAAAAAAAAAAAAAAAQg==","spanId":"AAAAAAAAAEM=","refType":"FOLLOWS_FROM"}`, out.String())
+	assert.JSONEq(t, `{"traceId":"AAAAAAAAAAAAAAAAAAAAQg==","spanId":"AAAAAAAAAEM=","refType":"FOLLOWS_FROM"}`, out.String())
 	var sr2 model.SpanRef
 	require.NoError(t, jsonpb.Unmarshal(out, &sr2))
 	assert.Equal(t, sr, sr2)

diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
@@ -26,7 +26,7 @@ type Cache interface {
 
 	// CompareAndSwap adds an element to the cache if the existing entry matches the old value.
 	// It returns the element in cache after function is executed and true if the element was replaced, false otherwise.
-	CompareAndSwap(key string, old, new any) (any, bool)
+	CompareAndSwap(key string, oldEntry, newEntry any) (any, bool)
 }
 
 // Options control the behavior of the cache

diff --git a/pkg/discovery/grpcresolver/grpc_resolver.go b/pkg/discovery/grpcresolver/grpc_resolver.go
@@ -133,13 +133,6 @@ func (r *Resolver) rendezvousHash(addresses []string) []string {
 	return topN
 }
 
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
 func hashAddr(hasher hash.Hash32, node, saltKey []byte) uint32 {
 	hasher.Reset()
 	hasher.Write(saltKey)

diff --git a/pkg/testutils/logger_test.go b/pkg/testutils/logger_test.go
@@ -17,7 +17,7 @@ func TestNewLogger(t *testing.T) {
 	logger, log := NewLogger()
 	logger.Warn("hello", zap.String("x", "y"))
 
-	assert.Equal(t, `{"level":"warn","msg":"hello","x":"y"}`, log.Lines()[0])
+	assert.JSONEq(t, `{"level":"warn","msg":"hello","x":"y"}`, log.Lines()[0])
 	assert.Equal(t, map[string]string{
 		"level": "warn",
 		"msg":   "hello",

diff --git a/pkg/version/handler_test.go b/pkg/version/handler_test.go
@@ -18,7 +18,7 @@ func TestRegisterHandler(t *testing.T) {
 	commitSHA = "foobar"
 	latestVersion = "v1.2.3"
 	date = "2024-01-04"
-	expectedJSON := []byte(`{"gitCommit":"foobar","gitVersion":"v1.2.3","buildDate":"2024-01-04"}`)
+	expectedJSON := `{"gitCommit":"foobar","gitVersion":"v1.2.3","buildDate":"2024-01-04"}`
 
 	mockLogger := zap.NewNop()
 	mux := http.NewServeMux()
@@ -33,5 +33,5 @@ func TestRegisterHandler(t *testing.T) {
 	body, err := io.ReadAll(resp.Body)
 	require.NoError(t, err)
 	resp.Body.Close()
-	assert.Equal(t, expectedJSON, body)
+	assert.JSONEq(t, expectedJSON, string(body))
 }
diff --git a/plugin/sampling/strategyprovider/static/provider_test.go b/plugin/sampling/strategyprovider/static/provider_test.go
@@ -495,7 +495,7 @@ func TestServiceNoPerOperationStrategies(t *testing.T) {
 			expectedServiceResponse, err := os.ReadFile(snapshotFile)
 			require.NoError(t, err)
 
-			assert.Equal(t, string(expectedServiceResponse), string(strategyJson),
+			assert.JSONEq(t, string(expectedServiceResponse), string(strategyJson),
 				"comparing against stored snapshot. Use REGENERATE_SNAPSHOTS=true to rebuild snapshots.")
 
 			if regenerateSnapshots {
@@ -527,7 +527,7 @@ func TestServiceNoPerOperationStrategiesDeprecatedBehavior(t *testing.T) {
 			expectedServiceResponse, err := os.ReadFile(snapshotFile)
 			require.NoError(t, err)
 
-			assert.Equal(t, string(expectedServiceResponse), string(strategyJson),
+			assert.JSONEq(t, string(expectedServiceResponse), string(strategyJson),
 				"comparing against stored snapshot. Use REGENERATE_SNAPSHOTS=true to rebuild snapshots.")
 
 			if regenerateSnapshots {