fix: lint issues

log/with.go

@@ -70,7 +70,7 @@ func WithHTTPScheme(l *zap.Logger, r *http.Request) *zap.Logger {
 }
 
 func WithHTTPSessionID(l *zap.Logger, r *http.Request) *zap.Logger {
-	if id := r.Header.Get("X-Session-ID"); id != "" {
+	if id := r.Header.Get("X-Session-Id"); id != "" {
 		return With(l, FHTTPSessionID(id))
 	} else if id, ok := keelhttpcontext.GetSessionID(r.Context()); ok && id != "" {
 		return With(l, FHTTPSessionID(id))
@@ -80,7 +80,7 @@ func WithHTTPSessionID(l *zap.Logger, r *http.Request) *zap.Logger {
 }
 
 func WithHTTPRequestID(l *zap.Logger, r *http.Request) *zap.Logger {
-	if id := r.Header.Get("X-Request-ID"); id != "" {
+	if id := r.Header.Get("X-Request-Id"); id != "" {
 		return With(l, FHTTPRequestID(id))
 	} else if id, ok := keelhttpcontext.GetRequestID(r.Context()); ok && id != "" {
 		return With(l, FHTTPRequestID(id))
@@ -110,7 +110,7 @@ func WithHTTPHost(l *zap.Logger, r *http.Request) *zap.Logger {
 }
 
 func WithHTTPTrackingID(l *zap.Logger, r *http.Request) *zap.Logger {
-	if id := r.Header.Get("X-Tracking-ID"); id != "" {
+	if id := r.Header.Get("X-Tracking-Id"); id != "" {
 		return With(l, FHTTPTrackingID(id))
 	} else if id, ok := keelhttpcontext.GetTrackingID(r.Context()); ok && id != "" {
 		return With(l, FHTTPTrackingID(id))

net/http/roundtripware/circuitbreaker_test.go

@@ -98,7 +98,7 @@ func TestCircuitBreaker(t *testing.T) {
 
 	// do requests to trigger the circuit breaker
 	for i := 0; i <= 3; i++ {
-		req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+		req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 		require.NoError(t, err)
 		resp, err := client.Do(req)
 		if resp != nil {
@@ -109,7 +109,7 @@ func TestCircuitBreaker(t *testing.T) {
 
 	// circuit breaker should now be triggered
 	// this should result in a circuit breaker error
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 	resp, err := client.Do(req)
 	if err == nil {
@@ -120,7 +120,7 @@ func TestCircuitBreaker(t *testing.T) {
 	// wait for the timeout to hit
 	time.Sleep(time.Millisecond * 100)
 
-	req, err = http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err = http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 	resp, err = client.Do(req)
 	if resp != nil {
@@ -170,7 +170,7 @@ func TestCircuitBreakerCopyBodies(t *testing.T) {
 	)
 
 	// do requests to trigger the circuit breaker
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, strings.NewReader(requestData))
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, strings.NewReader(requestData))
 	require.NoError(t, err)
 	resp, err := client.Do(req)
 	if resp != nil {
@@ -220,7 +220,7 @@ func TestCircuitBreakerReadFromNotCopiedBodies(t *testing.T) {
 	)
 
 	// do requests to trigger the circuit breaker
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, strings.NewReader(requestData))
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, strings.NewReader(requestData))
 	require.NoError(t, err)
 	resp, err := client.Do(req)
 	if resp != nil {
@@ -249,7 +249,7 @@ func TestCircuitBreakerReadFromNotCopiedBodies(t *testing.T) {
 	)
 
 	// do requests to trigger the circuit breaker
-	req, err = http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, strings.NewReader(requestData))
+	req, err = http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, strings.NewReader(requestData))
 	require.NoError(t, err)
 	resp, err = client.Do(req)
 	if resp != nil {
@@ -296,7 +296,7 @@ func TestCircuitBreakerInterval(t *testing.T) {
 
 	// send exactly 3 requests (lower than the maximum amount of allowed consecutive failures)
 	for range 3 {
-		req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+		req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 		require.NoError(t, err)
 		resp, err := client.Do(req)
 		if resp != nil {
@@ -311,7 +311,7 @@ func TestCircuitBreakerInterval(t *testing.T) {
 	// now we should be able to send 3 more requests without triggering the circuit breaker (last request should finally
 	// trigger the circuit breaker, but the error will not yet be a circuitbreaker error)
 	for range 4 {
-		req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+		req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 		require.NoError(t, err)
 		resp, err := client.Do(req)
 		if resp != nil {
@@ -321,7 +321,7 @@ func TestCircuitBreakerInterval(t *testing.T) {
 	}
 
 	// this request should now finally trigger the circuit breaker
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 	resp, err := client.Do(req)
 	if resp != nil {
@@ -363,7 +363,7 @@ func TestCircuitBreakerIgnore(t *testing.T) {
 	// send 4 requests (higher than the maximum amount of allowed consecutive failures), but they are ignored
 	// -> circuit breaker should remain open
 	for range 4 {
-		req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+		req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 		require.NoError(t, err)
 		resp, err := client.Do(req)
 		if resp != nil {
@@ -395,7 +395,7 @@ func TestCircuitBreakerTimeout(t *testing.T) {
 	// send 4 requests (more than the maximum amount of allowed consecutive failures)
 	// -> circuit breaker should change to open state
 	for range 4 {
-		ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond)
+		ctx, cancel := context.WithTimeout(t.Context(), 200*time.Millisecond)
 
 		req, err := http.NewRequestWithContext(ctx, http.MethodGet, svr.URL, nil)
 		require.NoError(t, err)
@@ -410,7 +410,7 @@ func TestCircuitBreakerTimeout(t *testing.T) {
 
 	// send another request with a bigger timeout
 	// this should be blocked by the circuit breaker though
-	ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
+	ctx, cancel := context.WithTimeout(t.Context(), 500*time.Millisecond)
 	defer cancel()
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)

net/http/roundtripware/gizp_test.go

@@ -3,7 +3,6 @@ package roundtripware_test
 import (
 	"bytes"
 	"compress/gzip"
-	"context"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -75,7 +74,7 @@ func TestGZip(t *testing.T) {
 		compressed = false
 
 		// create request
-		req, err := http.NewRequestWithContext(context.TODO(), http.MethodPost, svr.URL, strings.NewReader(payload))
+		req, err := http.NewRequestWithContext(t.Context(), http.MethodPost, svr.URL, strings.NewReader(payload))
 		req.Header.Set(stdhttp.HeaderAcceptEncoding.String(), stdhttp.EncodingGzip.String())
 		require.NoError(t, err)
 
@@ -98,7 +97,7 @@ func TestGZip(t *testing.T) {
 		compressed = true
 
 		// create request
-		req, err := http.NewRequestWithContext(context.TODO(), http.MethodPost, svr.URL, strings.NewReader(payload))
+		req, err := http.NewRequestWithContext(t.Context(), http.MethodPost, svr.URL, strings.NewReader(payload))
 		req.Header.Set(stdhttp.HeaderAcceptEncoding.String(), stdhttp.EncodingGzip.String())
 		require.NoError(t, err)
 

net/http/roundtripware/logger_test.go

@@ -1,7 +1,6 @@
 package roundtripware_test
 
 import (
-	"context"
 	"errors"
 	"net/http"
 	"net/http/httptest"
@@ -39,7 +38,7 @@ func TestLogger(t *testing.T) {
 	)
 
 	// create request
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 
 	// do request
@@ -73,7 +72,7 @@ func TestLogger_WithMessage(t *testing.T) {
 	)
 
 	// create request
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 
 	// do request
@@ -113,7 +112,7 @@ func TestLogger_WithErrorMessage(t *testing.T) {
 	)
 
 	// create request
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 
 	// do request
@@ -148,7 +147,7 @@ func TestLogger_WithMinWarnCode(t *testing.T) {
 	)
 
 	// create request
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 
 	// do request
@@ -180,7 +179,7 @@ func TestLogger_WithMinErrorCode(t *testing.T) {
 	)
 
 	// create request
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 
 	// do request

net/http/roundtripware/referer_test.go

@@ -1,7 +1,6 @@
 package roundtripware_test
 
 import (
-	"context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -37,7 +36,7 @@ func TestReferer(t *testing.T) {
 	)
 
 	// create request
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 
 	// do request
@@ -70,7 +69,7 @@ func TestReferer_Context(t *testing.T) {
 	)
 
 	// set request id on context
-	ctx := keelhttpcontext.SetReferer(context.Background(), testReferer)
+	ctx := keelhttpcontext.SetReferer(t.Context(), testReferer)
 
 	// create request
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, svr.URL, nil)
@@ -109,7 +108,7 @@ func TestReferer_WithHeader(t *testing.T) {
 	)
 
 	// set request id on context
-	ctx := keelhttpcontext.SetReferer(context.Background(), testReferer)
+	ctx := keelhttpcontext.SetReferer(t.Context(), testReferer)
 
 	// create request
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, svr.URL, nil)

net/http/roundtripware/requestid_test.go

@@ -1,7 +1,6 @@
 package roundtripware_test
 
 import (
-	"context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -37,7 +36,7 @@ func TestRequestID(t *testing.T) {
 	)
 
 	// create request
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 
 	// do request
@@ -70,7 +69,7 @@ func TestRequestID_Context(t *testing.T) {
 	)
 
 	// set request id on context
-	ctx := keelhttpcontext.SetRequestID(context.Background(), testRequestID)
+	ctx := keelhttpcontext.SetRequestID(t.Context(), testRequestID)
 
 	// create request
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, svr.URL, nil)
@@ -110,7 +109,7 @@ func TestRequestID_WithProvider(t *testing.T) {
 	)
 
 	// create request
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 
 	// do request
@@ -147,7 +146,7 @@ func TestRequestID_WithHeader(t *testing.T) {
 	)
 
 	// create request
-	req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, svr.URL, nil)
+	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet, svr.URL, nil)
 	require.NoError(t, err)
 
 	// do request

net/stream/jetstream/stream_test.go

@@ -22,7 +22,7 @@ func TestNew(t *testing.T) {
 	testingx.Tags(t, tagx.Skip)
 
 	l := zaptest.NewLogger(t)
-	ctx := context.Background()
+	ctx := t.Context()
 
 	natsContainer, err := natscontainer.Run(ctx, "nats:2.9.20-alpine")
 	require.NoError(t, err)

server_test.go

@@ -10,12 +10,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/foomo/keel"
 	"github.com/foomo/keel/service"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest"
-
-	"github.com/foomo/keel"
 )
 
 type KeelTestSuite struct {
@@ -58,7 +57,7 @@ func (s *KeelTestSuite) BeforeTest(suiteName, testName string) {
 		s.l.Error("logging error")
 	})
 
-	ctx, cancel := context.WithCancel(context.Background())
+	ctx, cancel := context.WithCancel(s.T().Context())
 	s.svr = keel.NewServer(
 		keel.WithContext(ctx),
 		keel.WithLogger(s.l),
@@ -208,7 +207,7 @@ func (s *KeelTestSuite) runServer() {
 
 // httpGet helper
 func (s *KeelTestSuite) httpGet(url string) (int, string, error) {
-	if req, err := http.NewRequestWithContext(context.Background(), http.MethodGet, url, nil); err != nil {
+	if req, err := http.NewRequestWithContext(s.T().Context(), http.MethodGet, url, nil); err != nil {
 		return 0, "", err
 	} else if resp, err := http.DefaultClient.Do(req); err != nil {
 		return 0, "", err
@@ -223,7 +222,7 @@ func (s *KeelTestSuite) httpGet(url string) (int, string, error) {
 
 // httpPut helper
 func (s *KeelTestSuite) httpPut(url, data string) (int, string, error) {
-	if req, err := http.NewRequestWithContext(context.Background(), http.MethodPut, url, strings.NewReader(data)); err != nil {
+	if req, err := http.NewRequestWithContext(s.T().Context(), http.MethodPut, url, strings.NewReader(data)); err != nil {
 		return 0, "", err
 	} else if resp, err := http.DefaultClient.Do(req); err != nil {
 		return 0, "", err