From 10ccebad41baf871c184e72fc97c22a99e3087ec Mon Sep 17 00:00:00 2001
From: Vadim Stepanov <vstpme@gmail.com>
Date: Thu, 28 Aug 2025 13:10:26 +0100
Subject: [PATCH] golangci-lint

---
 pkg/components/loki/logproto/types_test.go    | 26 +++++++++----------
 .../loki/historian_store_test.go              |  2 +-
 .../ngalert/state/historian/loki_test.go      |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkg/components/loki/logproto/types_test.go b/pkg/components/loki/logproto/types_test.go
index bd528a951c1..d275346f7d3 100644
--- a/pkg/components/loki/logproto/types_test.go
+++ b/pkg/components/loki/logproto/types_test.go
@@ -37,11 +37,11 @@ func TestStream(t *testing.T) {
 		b, err := stream.Marshal()
 		require.NoError(t, err)
 
-		var new Stream
-		err = new.Unmarshal(b)
+		var newStream Stream
+		err = newStream.Unmarshal(b)
 		require.NoError(t, err)
 
-		require.Equal(t, stream, new)
+		require.Equal(t, stream, newStream)
 	})
 	t.Log("avg allocs per run:", avg)
 }
@@ -51,11 +51,11 @@ func TestStreamAdapter(t *testing.T) {
 		b, err := streamAdapter.Marshal()
 		require.NoError(t, err)
 
-		var new StreamAdapter
-		err = new.Unmarshal(b)
+		var newStream StreamAdapter
+		err = newStream.Unmarshal(b)
 		require.NoError(t, err)
 
-		require.Equal(t, streamAdapter, new)
+		require.Equal(t, streamAdapter, newStream)
 	})
 	t.Log("avg allocs per run:", avg)
 }
@@ -73,11 +73,11 @@ func TestCompatibility(t *testing.T) {
 	require.NoError(t, err)
 	require.Equal(t, b, ba)
 
-	var new Stream
-	err = new.Unmarshal(ba)
+	var newStream Stream
+	err = newStream.Unmarshal(ba)
 	require.NoError(t, err)
 
-	require.Equal(t, stream, new)
+	require.Equal(t, stream, newStream)
 }
 
 func BenchmarkStream(b *testing.B) {
@@ -87,8 +87,8 @@ func BenchmarkStream(b *testing.B) {
 		if err != nil {
 			b.Fatal(err)
 		}
-		var new Stream
-		err = new.Unmarshal(by)
+		var newStream Stream
+		err = newStream.Unmarshal(by)
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -102,8 +102,8 @@ func BenchmarkStreamAdapter(b *testing.B) {
 		if err != nil {
 			b.Fatal(err)
 		}
-		var new StreamAdapter
-		err = new.Unmarshal(by)
+		var newStream StreamAdapter
+		err = newStream.Unmarshal(by)
 		if err != nil {
 			b.Fatal(err)
 		}
diff --git a/pkg/services/annotations/annotationsimpl/loki/historian_store_test.go b/pkg/services/annotations/annotationsimpl/loki/historian_store_test.go
index acf8168fb3f..1a96d419ced 100644
--- a/pkg/services/annotations/annotationsimpl/loki/historian_store_test.go
+++ b/pkg/services/annotations/annotationsimpl/loki/historian_store_test.go
@@ -828,7 +828,7 @@ func NewFakeLokiClient() *FakeLokiClient {
 		cfg: lokiclient.LokiConfig{
 			WritePathURL:   url,
 			ReadPathURL:    url,
-			Encoder:        lokiclient.JsonEncoder{},
+			Encoder:        lokiclient.JSONEncoder{},
 			MaxQueryLength: 721 * time.Hour,
 			MaxQuerySize:   65536,
 		},
diff --git a/pkg/services/ngalert/state/historian/loki_test.go b/pkg/services/ngalert/state/historian/loki_test.go
index fd9fe343f86..3c55956ce3f 100644
--- a/pkg/services/ngalert/state/historian/loki_test.go
+++ b/pkg/services/ngalert/state/historian/loki_test.go
@@ -885,7 +885,7 @@ func createTestLokiBackend(t *testing.T, req client.Requester, met *metrics.Hist
 	cfg := lokiclient.LokiConfig{
 		WritePathURL:   url,
 		ReadPathURL:    url,
-		Encoder:        lokiclient.JsonEncoder{},
+		Encoder:        lokiclient.JSONEncoder{},
 		ExternalLabels: map[string]string{"externalLabelKey": "externalLabelValue"},
 	}
 	lokiBackendLogger := log.New("ngalert.state.historian", "backend", "loki")