From a4051812f1a1ed31bd3c6cb9f7a540c6ef7d9e4e Mon Sep 17 00:00:00 2001
From: Mihail Stoykov <M.Stoikov@gmail.com>
Date: Mon, 20 Jan 2025 18:19:57 +0200
Subject: [PATCH 1/2] do not use testutils

---
 pkg/remotewrite/remotewrite_test.go | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkg/remotewrite/remotewrite_test.go b/pkg/remotewrite/remotewrite_test.go
index 0a51234..7bd3a5e 100644
--- a/pkg/remotewrite/remotewrite_test.go
+++ b/pkg/remotewrite/remotewrite_test.go
@@ -1,8 +1,8 @@
 package remotewrite
 
 import (
+	"bytes"
 	"fmt"
-	"io"
 	"math"
 	"testing"
 	"time"
@@ -11,7 +11,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.k6.io/k6/lib/testutils"
 	"go.k6.io/k6/lib/types"
 	"go.k6.io/k6/metrics"
 	"gopkg.in/guregu/null.v3"
@@ -352,11 +351,10 @@ func TestOutputStopWithStaleMarkers(t *testing.T) {
 	t.Parallel()
 
 	for _, tc := range []bool{true, false} {
-		logHook := &testutils.SimpleLogrusHook{HookedLevels: []logrus.Level{logrus.DebugLevel}}
+		buf := bytes.NewBuffer(nil)
 		logger := logrus.New()
 		logger.SetLevel(logrus.DebugLevel)
-		logger.AddHook(logHook)
-		logger.SetOutput(io.Discard)
+		logger.SetOutput(buf)
 
 		o := Output{
 			logger: logger,
@@ -380,17 +378,7 @@ func TestOutputStopWithStaleMarkers(t *testing.T) {
 		// then this test will break
 		// A mock of the client and check if Store is invoked
 		// should be a more stable method.
-		entries := logHook.Drain()
-		require.NotEmpty(t, entries)
-
-		messages := func() []string {
-			s := make([]string, 0, len(entries))
-			for _, e := range entries {
-				s = append(s, e.Message)
-			}
-			return s
-		}()
-
+		messages := buf.String()
 		msg := "No time series to mark as stale"
 		assertfn := assert.Contains
 		if !tc {

From fb11afa4d128a9a61936ac013d4940efb3ab2a10 Mon Sep 17 00:00:00 2001
From: Mihail Stoykov <M.Stoikov@gmail.com>
Date: Mon, 20 Jan 2025 18:37:04 +0200
Subject: [PATCH 2/2] Appease the linter

---
 pkg/remotewrite/trend.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/remotewrite/trend.go b/pkg/remotewrite/trend.go
index b35b92d..49b2ae2 100644
--- a/pkg/remotewrite/trend.go
+++ b/pkg/remotewrite/trend.go
@@ -114,7 +114,7 @@ func (tg *trendAsGauges) CacheNameIndex() {
 	})
 
 	if i < len(tg.labels) && tg.labels[i].Name == namelbl {
-		tg.ixname = uint16(i)
+		tg.ixname = uint16(i) //nolint:gosec
 	}
 }